linwenxin hace 1 año
padre
commit
c2b967540b

+ 7 - 7
src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/pandanxinxi.js

@@ -25,7 +25,7 @@ export default {
           render: (h, { row, column, index }) => {
             return (
               <div style="padding-left:10px">
-                {row.isMaster == '1' ? '主要工程师' : row.isMaster == '0' ? '辅助工程师' : ''}
+                {row.isMaster ? '主要工程师' : '辅助工程师'}
               </div>
             )
           }
@@ -50,7 +50,7 @@ export default {
                   label: '操作',
                 },
                 render: (h, { row, column, index }) => {
-                  return row.isMaster != 1 ? (
+                  return !row.isMaster? (
                     <div style="padding-left:10px">
                       <el-button type="text" onClick={() => {
                         this.orderInfo.orderWorkers.splice(index, 1)
@@ -126,7 +126,7 @@ export default {
           },
           events: {
             change: (val) => {
-              var index = this.orderInfo.orderWorkers.map(item => item.isMaster).indexOf(1)
+              var index = this.orderInfo.orderWorkers.map(item => item.isMaster).indexOf(true)
               if (!!~index) {
                 this.orderInfo.orderWorkers.splice(index, 1)
               }
@@ -135,11 +135,11 @@ export default {
                 this.orderInfo.workerName = data.workerName
                 this.orderInfo.workerIdcard = data.workerIdcard
                 this.orderInfo.workerMobile = data.workerMobile
-                this.orderInfo.orderWorkers.unshift({ ...data, isMaster: 1 })
+                this.orderInfo.orderWorkers.unshift({ ...data, isMaster: true })
                 if (this.orderInfo.orderWorkers.length > 1) {
                   this.orderInfo.orderWorkers.map((item, index) => {
                     if (index > 0) {
-                      item.isMaster = 0
+                      item.isMaster = false
                     }
                   })
                 }
@@ -170,7 +170,7 @@ export default {
             change: (val) => {
               if (val) {
                 var data = this.workerList.find(item => item.value == val).data
-                this.orderInfo.orderWorkers.push({ ...data, isMaster: 0 })
+                this.orderInfo.orderWorkers.push({ ...data, isMaster: false })
                 this.orderInfo.workerId_fz = ""
               }
             }
@@ -214,7 +214,7 @@ export default {
       if (this.orderInfo.websitId) {
         memberListPageV2({ "pageNum": 1, "pageSize": -1, "params": [{ "param": "b.examine_status", "compare": "=", "value": "OK" }, { "param": "b.websit_id", "compare": "=", "value": this.orderInfo.websitId }] }).then(res => {
           this.workerList = res.data.records.map(item => {
-            var { id,userId, ...data } = item
+            var { id, userId, ...data } = item
             return {
               value: userId,
               label: data.nickName,

+ 11 - 4
src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/productColumns.js

@@ -198,8 +198,8 @@ export default {
             <div>
               {this.formOptions.orderProducts.isEdit ? <div>
                 <el-button size="mini" type="primary" onClick={() => {
-                  this.appointVerify(this.getVfyKey(this.isEditIndex), (v) => {
-                    if (v || !this.orderInfo.orderProducts.length) {
+                  this.appointVerify(this.getVfyKey(this.isEditIndex, false), (v) => {
+                    if (v) {
                       this.isEditIndex = 0
                       this.orderInfo.orderProducts.unshift({
                         "brandId": "",
@@ -252,9 +252,16 @@ export default {
     })
   },
   methods: {
-    getVfyKey(index) {
+    getVfyKey(index, bool = true) {
       return [
-        "orderProducts",
+        ...(() => {
+          if (bool) {
+            return [
+              `orderProducts`,
+            ]
+          }
+          return []
+        })(),
         ...(() => {
           if (index > -1) {
             return [