Merge branch 'main' of http://192.168.30.2:3000/bonus/nw-cqdevicemgt-ui

src/views/cost/csotSettlement/component/finishAndDetails.vue

@@ -157,6 +157,7 @@ export default {
                 { t_prop: 'realDays', t_label: '实际结算天数' },
                 { t_prop: 'realCosts', t_label: '实际结算金额（元）' },
                 { t_prop: 'remark', t_label: '领料备注' },
+                { t_prop: 'ckRemark', t_label: '领料出库备注' },
                 { t_prop: 'outRemark', t_label: '退料备注' },
                 // { t_prop: '', t_label: '已入账金额（元）' },
                 // { t_prop: '', t_label: '本次结算金额（元）' },

src/views/system/config/index.vue

@@ -147,7 +147,7 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改参数配置对话框 -->
+    <!-- 添加参数配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="参数名称" prop="configName">
@@ -177,6 +177,37 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 修改参数配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open1" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="参数名称" prop="configName">
+          <el-input v-model="form.configName" placeholder="请输入参数名称" />
+        </el-form-item>
+        <el-form-item label="参数键名" prop="configKey">
+          <el-input v-model="form.configKey" placeholder="请输入参数键名" :disabled="!!form.configKey"/>
+        </el-form-item>
+        <el-form-item label="参数键值" prop="configValue">
+          <el-input v-model="form.configValue" placeholder="请输入参数键值" />
+        </el-form-item>
+        <el-form-item label="系统内置" prop="configType">
+          <el-radio-group v-model="form.configType">
+            <el-radio
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -207,6 +238,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 是否显示弹出层
+      open1: false,
       // 日期范围
       dateRange: [],
       // 查询参数
@@ -255,6 +288,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.open1 = false;
       this.reset();
     },
     // 表单重置
@@ -298,7 +332,7 @@ export default {
       const configId = row.configId || this.ids
       getConfig(configId).then(response => {
         this.form = response.data;
-        this.open = true;
+        this.open1 = true;
         this.title = "修改参数";
       });
     },
@@ -309,7 +343,7 @@ export default {
           if (this.form.configId != undefined) {
             updateConfig(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
-              this.open = false;
+              this.open1 = false;
               this.getList();
             });
           } else {
@@ -366,4 +400,4 @@ export default {
     }
   }
 };
-</script>
+</script>