Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/views/basicinformation/sparePartsCommission/sparePartsCommission.vue

@@ -31,9 +31,13 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50" />
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
-            <el-table-column prop="state" label="备案状态" align="center" width="150" />
+            <el-table-column prop="state" label="备案状态" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.state == '1' ? '未备案' : scope.row.state == '2' ? '备案中' :  scope.row.state == '3' ? '已备案' : '' }}</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="postName" label="岗位名称" align="center" width="150" />
-            <el-table-column prop="cormRatio" label="提成比例(%)" align="center" width="80" />
+            <el-table-column prop="commRatio" label="提成比例(%)" align="center" width="120" />
             <el-table-column prop="useOrgName" label="隶属服务站" align="center" width="150" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
             <el-table-column prop="sortNo" label="排序" align="center" width="80" />
@@ -48,7 +52,7 @@
         <!--End查询列表部分-->
       </div>
     </div>
-    <el-dialog :visible.sync="dialogVisible" width="30%">
+    <el-dialog :visible.sync="dialogVisible" width="50%">
       <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
         <el-row style="border-top: 1px solid #E0E3EB">
           <el-col :span="24">
@@ -63,7 +67,7 @@
         <el-row>
           <el-col :span="24">
             <div class="span-sty"><span class="icon">*</span>提成比例(%)</div>
-            <el-form-item prop="cormRatio"><el-input class="addinputInfo addinputw" @keyup.native="formobj.cormRatio = getNumber(formobj.cormRatio, 0)" v-model="formobj.cormRatio" clearable placeholder="请填写零以上数字" /></el-form-item>
+            <el-form-item prop="commRatio"><el-input class="addinputInfo addinputw" @keyup.native="formobj.commRatio = getNumber(formobj.commRatio, 0)" v-model="formobj.commRatio" clearable placeholder="请填写零以上数字" /></el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -114,7 +118,7 @@ export default {
         remarks: '',
         postName: '',
         postSid: '',
-        cormRatio: '',
+        commRatio: '',
         sortNo: '',
         useOrgSid: '',
         useOrgName: '',
@@ -122,8 +126,8 @@ export default {
         createOrgName: ''
       },
       rules: {
-        postSid: [{ required: true, message: '岗位名称不能为空', trigger: 'blur' }],
-        cormRatio: [{ required: true, message: '提成比例不能为空', trigger: 'blur' }],
+        postSid: [{ required: true, message: '岗位名称不能为空', trigger: 'change' }],
+        commRatio: [{ required: true, message: '提成比例不能为空', trigger: 'blur' }],
         sortNo: [{ required: true, message: '排序不能为空', trigger: 'blur' }]
       },
       btndisabled: false,
@@ -322,7 +326,7 @@ export default {
       }
     },
     postNameChange(value) {
-      const choose = this.post_list.filter((item) => item.dictKey === value)
+      const choose = this.post_list.filter((item) => item.sid === value)
       if (choose !== null && choose.length > 0) {
         this.formobj.postName = choose[0].name
       } else {
@@ -351,7 +355,7 @@ export default {
         remarks: '',
         postName: '',
         postSid: '',
-        cormRatio: '',
+        commRatio: '',
         sortNo: '',
         useOrgSid: '',
         useOrgName: '',
@@ -411,12 +415,12 @@ export default {
 </script>
 <style scoped>
 .span-sty {
-  width: 80px !important;
+  width: 100px !important;
 }
 .addinputInfo {
-  margin-left: 75px !important;
+  margin-left: 95px !important;
 }
 /deep/ .el-form-item__error {
-  margin-left: 75px !important;
+  margin-left: 95px !important;
 }
 </style>