From 38dff69b2c218ae53b4cc79257368139a2803ebc Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期二, 15 八月 2023 18:18:19 +0800
Subject: [PATCH] 08.15

---
 web_standard/src/components/business/OperaSalaryParamWindow.vue |   47 ++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/web_standard/src/components/business/OperaSalaryParamWindow.vue b/web_standard/src/components/business/OperaSalaryParamWindow.vue
index 19517f6..9d2c21a 100644
--- a/web_standard/src/components/business/OperaSalaryParamWindow.vue
+++ b/web_standard/src/components/business/OperaSalaryParamWindow.vue
@@ -18,7 +18,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="宸ュ巶" prop="departId">
-        <el-select v-model="form.departId" placeholder="璇烽�夋嫨宸ュ巶" clearable @change="selectFactoey">
+        <el-select v-model="form.departId" placeholder="璇烽�夋嫨宸ュ巶" :disabled="isEdit" clearable @change="selectFactoey">
           <el-option
             v-for="item in factories"
             :key="item.id"
@@ -29,18 +29,18 @@
         </el-select>
       </el-form-item>
       <el-form-item label="鐗╂枡" prop="materialId">
-        <el-select v-model="form.materialId" placeholder="璇烽�夋嫨鐗╂枡" clearable>
+        <el-select v-model="form.materialId" placeholder="璇烽�夋嫨鐗╂枡" :disabled="isEdit" clearable @change="selectMaterial">
           <el-option
             v-for="item in materials"
-            :key="item.materialId"
+            :key="item.realMaterialId"
             :label="item.mmodel.name"
-            :value="item.materialId"
+            :value="item.realMaterialId"
           >
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="宸ュ簭" prop="procedureId">
-        <el-select v-model="form.procedureId" placeholder="璇烽�夋嫨璁′环鏂瑰紡" clearable>
+        <el-select v-model="form.procedureId" placeholder="璇烽�夋嫨宸ュ簭" :disabled="isEdit" clearable>
           <el-option
             v-for="item in productes"
             :key="item.id"
@@ -51,7 +51,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="宸ヨ祫鍗曚环锛堝厓)" prop="salary">
-        <el-input v-model="form.salary" placeholder="璇疯緭鍏ュ伐璧勫崟浠凤紙鍏�)" v-trim/>
+        <el-input v-model="form.salary" placeholder="璇疯緭鍏ュ伐璧勫崟浠凤紙鍏�)" @input="inputZAction(form, 'salary')" v-trim/>
       </el-form-item>
       <el-form-item label="鏍囧噯鏁堢巼" prop="num">
         <div style="display: flex;">
@@ -76,6 +76,7 @@
 import { getDepartmentListByConditon } from '@/api/ext/departmentExt'
 import { getBomMaterialList } from '@/api/ext/bomExt'
 import { routeExt as proceList } from '@/api/ext/routeProcedureExt'
+import { numRule } from '@/utils/form'
 export default {
   name: 'OperaSalaryParamWindow',
   extends: BaseOpera,
@@ -104,6 +105,7 @@
         unqualified: 0,
         type: ''
       },
+      isEdit: false,
       type: [
         { label: '璁′欢', value: 0 },
         { label: '璁℃椂', value: 1 },
@@ -113,6 +115,18 @@
       productes: [],
       // 楠岃瘉瑙勫垯
       rules: {
+        departId: [
+          { required: true, validator: numRule, message: '璇烽�夋嫨宸ュ巶', tigger: 'change' }
+        ],
+        materialId: [
+          { required: true, validator: numRule, message: '璇烽�夋嫨鐗╂枡', tigger: 'change' }
+        ],
+        procedureId: [
+          { required: true, validator: numRule, message: '璇烽�夋嫨宸ュ簭', tigger: 'change' }
+        ],
+        salary: [
+          { required: true, validator: numRule, message: '璇疯緭鍏ュ伐璧勫崟浠�', tigger: 'blur' }
+        ],
       }
     }
   },
@@ -179,10 +193,10 @@
         .then(res => {
           // console.log(res)
           this.materials = res
-          if (!isEdit) {
-            this.form.materialId = res[0]?res[0].materialId:''
-          }
-          this.selectMaterial(this.form.materialId, isEdit)
+          // if (!isEdit) {
+          //   this.form.materialId = res[0]?res[0].materialId:''
+          // }
+          // this.selectMaterial(this.form.materialId)
         })
         .catch(err => {
           console.log(err)
@@ -192,7 +206,7 @@
      
       let routeId;
       for (const item of this.materials) {
-        if (item.materialId === id) {
+        if (item.realMaterialId === id) {
           routeId = item.routeId
         }
       }
@@ -201,12 +215,23 @@
           // console.log(res)
           this.productes = res.proceList
           if (!isEdit) {
+            // debugger
             this.form.procedureId = this.productes[0]?this.productes[0].id:''
           }
         }).catch(err => {
           console.log(err)
         })
     },
+    // 2浣嶆湁鏁堥攢鍞紙姝ｏ級
+    inputZAction(item, key) {
+      item[key] = item[key].replace(/[^\d.]/g, '')
+                      .replace(/\.{2,}/g, '.')
+                      .replace('.', '$#$')
+                      .replace(/\./g, '')
+                      .replace('$#$', '.')
+                      .replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3')
+                      .replace(/^\./g, '')
+    },
     confirm () {
       // console.log((+this.form.hours) * 3600);
       // console.log((+this.form.minute) * 60);

--
Gitblit v1.9.3