Merge remote-tracking branch 'origin/rubberPaint-dev' into dev

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

@@ -260,6 +260,7 @@ export default {
       }
     },
     'form.airModel': {
+      immediate: true,
       handler: function(val) {
         val && this.changeSorties()
       }

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

@@ -561,7 +561,11 @@ export default {
             'items': paramsItems,
             'operator': 'AND'
           },
-          'openProps': [],
+          'openProps': [
+            {
+              'name': 'shellacDeploy'
+            }
+          ],
           'sortItem': [
             {
               'fieldName': 'modifyTime',
@@ -581,6 +585,7 @@ export default {
                 this.$set(this.form, 'humidity', res.items.content[0].humidity)
                 this.$set(this.form, 'component', res.items.content[0].component)
                 this.$set(this.form, 'shellacDeployId', res.items.content[0].id)
+                this.$set(this.form, 'shellacDeploy', { constructionTime: res.items.content[0].constructionTime })
                 this.$set(this.form, 'storeUp', res.items.content[0].storeUp)
                 this.$set(this.form, 'storeUpTo', res.items.content[0].storeUpTo)
                 if (this.form.validityStart && this.form.freeTemperature) {

applications/dee-mes/src/views/taskExecution/index.vue

@@ -533,6 +533,42 @@
     <!-- 物料确认 -->
     <RecordMaintenance ref="RecordMaintenance" @refreshPage="refreshPage" />
     <!-- 物料确认 -->
+    <!-- 试验申请创建 -->
+    <el-drawer
+      v-if="drawerShowExperimentAdd"
+      title="试验申请"
+      size="50%"
+      append-to-body
+      :before-close="onClose"
+      :visible.sync="drawerShowExperimentAdd"
+    >
+      <dee-as-com
+        :lay-config="{
+          typeName: 'ExperimentRecord',
+          layKey: 'NotGeneral_Experiment_Create'
+        }"
+        :form="experimentApplyForm"
+        parent-show-mode="dialog"
+        @on-cancel="onClose"
+      />
+    </el-drawer>
+    <!-- 检验员 -->
+    <dee-dialog
+      width="40%"
+      title="选择检验员"
+      :before-close="closeDialog"
+      :dialog-visible="showDialog"
+      @handleClose="closeDialog"
+    >
+      <dee-as-com
+        :lay-config="{
+          typeName: 'ExperimentRecord',
+          layKey: 'checker'
+        }"
+        :form="checkerForm"
+        @on-cancel="closeDialog"
+      />
+    </dee-dialog>
   </div>
 </template>
 
@@ -598,7 +634,11 @@ export default {
       showHeader: true,
       sideShow: true,
       isOK: !this.$route.query.isOK || this.$route.query.isOK === 'false',
-      isRevoke: this.$route.query.isRevoke && this.$route.query.isRevoke === 'true'
+      isRevoke: this.$route.query.isRevoke && this.$route.query.isRevoke === 'true',
+      drawerShowExperimentAdd: false,
+      experimentApplyForm: {},
+      showDialog: false,
+      checkerForm: {}
     }
   },
   computed: {},
@@ -607,6 +647,7 @@ export default {
       handler(to, from) {
         if (to && to.name === 'assemblyPerform') {
           this.getWorkingProcedure()
+          this.refreshPage()
         }
       }
       // immediate: true
@@ -645,6 +686,23 @@ export default {
         }
       })
     })
+    this.$bus.$on('completeExperimentAdd', ({ items }) => {
+      this.$nextTick(() => {
+        this.onClose()
+        if (items.id) {
+          this.getProcessInfo(items.id)
+        }
+      })
+    })
+    this.$bus.$on('refreshAssemblyPerform', () => {
+      this.$nextTick(() => {
+        this.closeDialog()
+      })
+    })
+  },
+  beforeDestroy() {
+    this.$bus.$off('completeExperimentAdd')
+    this.$bus.$off('refreshAssemblyPerform')
   },
   methods: {
     getQRcode(info) {
@@ -1247,21 +1305,36 @@ export default {
       if (this.editor.countRecord) {
         this.$refs.RecordMaintenance.open()
       } else {
-        var that = this
-        this.$confirm('确定要试验申请吗', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        })
-          .then(() => {
-            that.testApplication()
-          })
-          .catch(() => {
-            this.$message({
-              type: 'info',
-              message: '已取消'
+        if (!this.headerData) return
+        this.drawerShowExperimentAdd = true
+        this.$set(this.experimentApplyForm, 'isGeneral', false)
+        this.$set(this.experimentApplyForm, 'aircraftType', this.headerData.resName)
+        this.$set(this.experimentApplyForm, 'sorties', this.headerData.serialNo)
+        this.$set(this.experimentApplyForm, 'extProcessPlan', {
+          serialNumber: this.headerData.serialNumber,
+          name: this.headerData.name,
+          id: this.headerData.aoId
         })
+        this.$set(this.experimentApplyForm, 'extProcessOperation', {
+          serialNumber: this.editor.serialNumber,
+          name: this.editor.title,
+          id: this.editor.tableId
         })
+        // var that = this
+        // this.$confirm('确定要试验申请吗11', '提示', {
+        //   confirmButtonText: '确定',
+        //   cancelButtonText: '取消',
+        //   type: 'warning'
+        // })
+        //   .then(() => {
+        //     that.testApplication()
+        //   })
+        //   .catch(() => {
+        //     this.$message({
+        //       type: 'info',
+        //       message: '已取消'
+        //     })
+        //   })
       }
     },
     getHandledValue(num) {
@@ -1410,7 +1483,50 @@ export default {
     },
     refreshPage() {
       this.getWorkingProcedure()
+    },
+    getProcessInfo(id) {
+      post(
+        `/workflow/task/?page=1&size=9999`,
+        {
+          'pbo': `com.yonde.tf.mom.common.vo.execute.ExperimentRecordVO_dex_wfc_${id}`
+        }
+      )
+        .then((res) => {
+          if (res && res.items && res.items.content) {
+            const info = res.items.content[0] || {}
+            this.showDialog = true
+            this.checkerForm = {
+              'operationName': 'completeTask',
+              'operator': localStorage.getItem('userId'),
+              'description': '',
+              'id': info.id,
+              'processDefinitionId': info.processDefinitionId,
+              'processInstId': info.processInstanceId,
+              'routerSelect': 'check',
+              'taskDefinitionKey': info.taskDefinitionKey,
+              'participants': {
+                'wf_act_TeamRole_checker_userList': [
+                ]
+              },
+              'variables': {},
+              'taskVariables': {}
+            }
+          }
+        })
+        .catch((err) => console.error(err))
+        .finally(() => {
+          // that.editShow = false
+        })
+    },
+    onClose() {
+      this.drawerShowExperimentAdd = false
+      this.experimentApplyForm = {}
+    },
+    closeDialog() {
+      this.showDialog = false
+      this.refreshPage()
     }
+
   }
 }
 </script>