Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

applications/dee-mes/src/privateComponents/components/DeploymentCardInfoSelect/index.vue

@@ -79,7 +79,8 @@ export default {
         AssignCardItem: 'ShellacCardLacquer',
         AssignCardAlodine: 'ShellacCardAlodine'
       },
-      subTypeName: ''
+      subTypeName: '',
+      shellacDeployLists: []
     }
   },
   computed: {
@@ -394,15 +395,29 @@ export default {
           }
         ]
       }
-      await post(`/ShellacDeploy/queryModel?param=${key}`, params)
+      const requestUrl = key === 'baseModelNo' ? '/ShellacDeploy/search' : `/ShellacDeploy/queryModel?param=${key}`
+      await post(requestUrl, params)
         .then(res => {
-          if (res.code === 0) {
-            this.requestOp = res.items.map(item => {
-              return {
-                label: item,
-                value: item
-              }
-            })
+          if (key === 'baseModelNo') {
+            if (res.items && res.items.content) {
+              this.shellacDeployLists = res.items.content
+              this.requestOp = res.items.content.map(item => {
+                return {
+                  label: item.modelNo,
+                  value: item.modelNo
+                }
+              })
+              this.form.baseModelNo && this.setDiluentModelNoOption(this.form.baseModelNo)
+            }
+          } else {
+            if (res.code === 0) {
+              this.requestOp = res.items.map(item => {
+                return {
+                  label: item,
+                  value: item
+                }
+              })
+            }
           }
         })
     },
@@ -422,6 +437,10 @@ export default {
       } else if (this.itemObj.attrKey === 'baseModelNo') {
         this.$set(this.form, 'certificateNo', '')
         this.$set(this.form, 'lotNo', '')
+        this.setDiluentModelNoOption(value)
+        this.$set(this.form, 'diluentModelNo', '')
+        this.$set(this.form, 'certificateNum', '')
+        this.$set(this.form, 'diluentLotNo', '')
       } else {
         this.$set(this.form, this.itemObj.attrKey, value)
         this.changeRequest()
@@ -590,7 +609,7 @@ export default {
                 this.$set(this.form, 'storeUpTo', res.items.content[0].storeUpTo)
                 if (this.form.validityStart && this.form.freeTemperature) {
                   const date = new Date(this.form.validityStart)
-                  const data = this.form.freeTemperature === '-24' ? (this.form.storeUp ? Number(this.form.storeUp) : 21) : (this.form.storeUp ? Number(this.form.storeUpTo) : 30)
+                  const data = Number(this.form.freeTemperature) === -24 ? (!isNaN(this.form.storeUp) ? Number(this.form.storeUp) : 21) : (!isNaN(this.form.storeUpTo) ? Number(this.form.storeUpTo) : 30)
                   date.setDate(date.getDate() + data)
                   this.$set(this.form, 'validityEnd', this.$utils.dateFormat(date.toISOString()))
                 }
@@ -756,6 +775,21 @@ export default {
           this.setFormDataAttr(attrKey, 'options', this.requestOp)
         }
       })
+    },
+    setDiluentModelNoOption(value) {
+      const targetObj = this.shellacDeployLists.find(item => item.modelNo === value)
+      if (targetObj && targetObj.component) {
+        const diluentModelNoOption = this.splitByVerticalBar(targetObj.component).map(el => { return { value: el, label: el } })
+        this.setFormDataAttr('diluentModelNo', 'options', diluentModelNoOption || [])
+      }
+    },
+    splitByVerticalBar(str) {
+      // 正则表达式匹配中文竖线或英文竖线
+      const regex = /[\u3000\u007C\|]+/g
+      return str.split(regex).filter(function(item) {
+        // 去除空字符串
+        return item !== ''
+      })
     }
   }
 }

applications/dee-mes/src/views/assemblyPlanManagement/instructionIdentification/components/left/form.vue

@@ -127,7 +127,7 @@ export default {
      */
     getAddRecursion() {
       this.sortiesLoading = true
-      const params = { searchItems: { items: [{ fieldName: 'aircraftTypeId', operator: 'EQ', value: this.form.model }] }, sortItem: [{ fieldName: 'modifyTime', sortOrder: 'asc' }] }
+      const params = { searchItems: { items: [{ fieldName: 'aircraftTypeId', operator: 'EQ', value: this.form.model }] }, sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }] }
       params.openProps = [{ name: 'aircraftType' }]
       this.$api
         .searchApi('AircraftSorties', params)

applications/dee-mes/src/views/assemblyPlanManagement/stationPlanMaintenance/materialSupporting.vue

@@ -204,7 +204,7 @@ export default {
         this.sortiesData = []
         this.sorties = null
       }
-      const params = { searchItems: { items: [{ fieldName: 'aircraftTypeId', operator: 'EQ', value: this.form.model }] }, sortItem: [{ fieldName: 'modifyTime', sortOrder: 'asc' }] }
+      const params = { searchItems: { items: [{ fieldName: 'aircraftTypeId', operator: 'EQ', value: this.form.model }] }, sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }] }
       params.openProps = [{ name: 'aircraftType' }]
       this.$api
         .searchApi('AircraftSorties', params)

applications/dee-mes/src/views/taskExecution/components/ConfirmMaterial/header.vue

@@ -195,7 +195,7 @@
           sortable
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.weigthObj"> {{ scope.row.weigthObj.outsideAmount }}</span>
+            <span> {{ scope.row.actualAmount }}</span>
           </template>
         </el-table-column>
         <el-table-column

applications/dee-task-center/src/views/workflow/task-center/myPlanTask/instructionIdentificationBatch/components/left/form.vue

@@ -111,7 +111,7 @@ export default {
      */
     getAddRecursion() {
       this.sortiesLoading = true
-      const params = { searchItems: { items: [{ fieldName: 'aircraftTypeId', operator: 'EQ', value: this.form.model }] }, sortItem: [{ fieldName: 'modifyTime', sortOrder: 'asc' }] }
+      const params = { searchItems: { items: [{ fieldName: 'aircraftTypeId', operator: 'EQ', value: this.form.model }] }, sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }] }
       params.openProps = [{ name: 'aircraftType' }]
       this.$api
         .searchApi('AircraftSorties', params)