完善配件销售提成

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

@@ -31,9 +31,10 @@
           <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" />
+            <el-table-column prop="state" label="是否曾备案状态" align="center" width="160">
               <template slot-scope="scope">
-                <span>{{ scope.row.state == '1' ? '未备案' : scope.row.state == '2' ? '备案中' :  scope.row.state == '3' ? '已备案' : '' }}</span>
+                <span>{{ scope.row.isBa == '1' ? '是' : scope.row.isBa == '0' ? '否' : '' }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="postName" label="岗位名称" align="center" width="150" />
@@ -58,7 +59,7 @@
           <el-col :span="24">
             <div class="span-sty"><span class="icon">*</span>岗位名称</div>
             <el-form-item prop="postSid">
-              <el-select class="addinputInfo" style="width: 50%" v-model="formobj.postSid" placeholder="请选择" @change="postNameChange" clearable filterable>
+              <el-select class="addinputInfo" style="width: 50%" :disabled="formobj.sid !== ''" v-model="formobj.postSid" placeholder="请选择" @change="postNameChange" clearable filterable>
                 <el-option v-for="item in post_list" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
               </el-select>
             </el-form-item>
@@ -67,7 +68,7 @@
         <el-row>
           <el-col :span="24">
             <div class="span-sty"><span class="icon">*</span>提成比例(%)</div>
-            <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-form-item prop="commRatio"><el-input class="addinputInfo addinputw" :disabled="formobj.sid !== ''" @keyup.native="formobj.commRatio = getNumber(formobj.commRatio, 0)" v-model="formobj.commRatio" clearable placeholder="请填写零以上数字" /></el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -114,6 +115,7 @@ export default {
       dialogVisible: false,
       post_list: [],
       formobj: {
+        sid: '',
         createBySid: '',
         remarks: '',
         postName: '',
@@ -355,6 +357,7 @@ export default {
       this.dialogVisible = false
       this.$refs['form_obj'].resetFields()
       this.formobj = {
+        sid: '',
         createBySid: '',
         remarks: '',
         postName: '',
@@ -379,8 +382,15 @@ export default {
     // 删除
     doDel() {
       if (this.sids.length === 0) {
-        this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
+        this.$message({showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作'})
         return
+      } else {
+        for (var i = 0; i < this.multipleSelection.length; i++) {
+          if (this.multipleSelection[i].state === '2') {
+            this.$message({ showClose: true, type: 'error', message: '备案中的数据无法删除' })
+            return
+          }
+        }
       }
       const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
       this.$confirm(tip, '提示', {

yxt-as-ui/src/views/basicinformation/sparePartsCommissionFiling/sparePartsCommissionFilingAdd.vue

@@ -48,7 +48,11 @@
               </template>
             </el-table-column>
             <el-table-column prop="postName" label="岗位名称" align="center" />
-            <el-table-column prop="commRatio" label="提成比例(%)" align="center"/>
+            <el-table-column label="提成比例(%)" align="center">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.commRatio" @keyup.native="scope.row.commRatio = getNumber(scope.row.commRatio, 0)" placeholder="请填写零以上的数字" clearable />
+              </template>
+            </el-table-column>
             <el-table-column prop="remarks" label="备注" align="center"/>
           </el-table>
         </el-form>
@@ -98,6 +102,24 @@ export default {
     }
   },
   methods: {
+    getNumber(val, limit) {
+      val = val.replace(/[^0-9.]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
+      }
+      return val
+    },
     showAdd(row) {
       this.viewTitle = '【新增】配件销售提成备案申请'
       this.$nextTick(() => {
@@ -130,6 +152,7 @@ export default {
         this.formobj.asServiceAccommDetailList.push({
           sid: '',
           mainSid: '',
+          accommSid: e.sid,
           postSid: e.postSid,
           postName: e.postName,
           commRatio: e.commRatio,

yxt-as-ui/src/views/workFlow/peijianbeianFlow/sparePartsCommissionFilingEdit.vue

@@ -47,7 +47,11 @@
               </template>
             </el-table-column>
             <el-table-column prop="postName" label="岗位名称" align="center" />
-            <el-table-column prop="commRatio" label="提成比例(%)" align="center"/>
+            <el-table-column label="提成比例(%)" align="center">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.commRatio" @keyup.native="scope.row.commRatio = getNumber(scope.row.commRatio, 0)" placeholder="请填写零以上的数字" clearable />
+              </template>
+            </el-table-column>
             <el-table-column prop="remarks" label="备注" align="center"/>
           </el-table>
         </el-form>
@@ -113,6 +117,24 @@ export default {
     }, '*')
   },
   methods: {
+    getNumber(val, limit) {
+      val = val.replace(/[^0-9.]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
+      }
+      return val
+    },
     showInfo(sid) {
       this.viewTitle = '【编辑】配件销售提成备案申请'
       this.$nextTick(() => {