三期出库单明细参数调整

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

@@ -7,14 +7,14 @@
 <template>
   <div class="Chemical-test-process">
     <dee-as-com
-      v-if="data"
+      v-if="JobResponseInExpermentData"
       refs="outerCasing"
       model-name="InStorageRequestItem"
       :lay-config="{
         typeName: 'InStorageRequestItem',
         layKey: 'test'
       }"
-      :edit-id="data.id"
+      :basic-data="JobResponseInExpermentData"
     />
   </div>
 </template>
@@ -33,15 +33,14 @@ export default {
   },
   data() {
     return {
-      // data: { 'reportNo': bindForm.reportNo, 'isPass': bindForm.isPass, 'isDestroy': bindForm.isDestroy, 'experimentAmount':bindForm.experimentAmount, 'jobOrder': { 'purchaseUnit': { 'unitName': bindForm.jobOrder.purchaseUnit.purchaseUnit } }, 'dxType': 'JobResponseInStorage', 'operator': 'ADD' }
-      data: null
+      // data: { 'reportNo': bindForm.reportNo, 'experimentAmount':bindForm.experimentAmount}, 'dxType': 'JobResponseInStorage', 'operator': 'ADD' }
+      JobResponseInExpermentData: null
     }
   },
   computed: {},
   created() {
     // 初始化数据
     console.log('理化检验流程', this.basicData)
-    console.log('理化检验流程1', this.form)
     this.getFrom(this.basicData.id)
   },
   methods: {
@@ -92,8 +91,8 @@ export default {
         ]
       }
       post('JobResponseInStorage/search', param).then(res => {
-        this.data = res.items.content[0]
-        this.$refs['outerCasing'].$refs.asCom.$refs.deeForm.form = this.data
+        // this.data = res.items.content[0]
+        this.JobResponseInExpermentData = res.items.content[0]
       }).catch((err) => {
         console.log(err)
       })

applications/dee-mes/src/privateComponents/components/JobResponseInTestProcess/component/UploadFiles.vue

 <template>
   <div class="upload-files">
-    <dee-form app-name="tf-mom" label-position="top" :form="form" :form-data="formData1" />
+    <dee-form app-name="tf-mom" label-position="top" :form="form" :form-data="formData" />
   </div>
 </template>
 <script>
@@ -11,6 +11,10 @@ export default {
     value: {
       type: Array,
       default: () => []
+    },
+    viewOrEdit: {
+      type: String,
+      default: () => 'edit'
     }
   },
   data() {
@@ -18,26 +22,7 @@ export default {
       form: {
         objFileLinks: []
       },
-      'formData': [
-        {
-          'title': '',
-          'split': 3,
-          'data': [
-            {
-              'name': '上传附件',
-              'key': 'objFileLinks',
-              'parentKey': 'objFileLinks',
-              'component': {
-                'name': 'DeeUploadTable',
-                'url': '/dfs/fileManager/feign/uploadFile'
-              },
-              'width': 3
-            }
-          ],
-          'labelPosition': 'right'
-        }
-      ],
-      formData1: [
+      formData: [
         {
           'title': '',
           'split': 3,
@@ -51,7 +36,6 @@ export default {
               'hidden': false,
               'component': {
                 'name': 'DeeUploadTable',
-                'appName': 'tf-mom',
                 'taleType': 'single',
                 'showFileList': true,
                 'filterKey': 'contentType',
@@ -59,7 +43,8 @@ export default {
                 'alimit': 1,
                 'limit': 5,
                 'mrequired': true,
-                'state': 'edit',
+                // 'state': 'edit',
+                'state': this.viewOrEdit,
                 'masterTitle': '主内容',
                 'appendTitle': '附件',
                 'masterFilter': ['MASTER_FILE', 'PRIMARY'],
@@ -77,13 +62,17 @@ export default {
     }
   },
   watch: {
+    value: function(newForm, oldForm) {
+      if (newForm) {
+        this.$set(this.form, 'objFileLinks', newForm)
+      }
+    },
     'form.objFileLinks': function(newForm, oldForm) {
       this.$emit('input', newForm)
     }
   },
   mounted() {
-    const data = this.value
-    this.form.objFileLinks = data
+    // this.$set(this.form, 'objFileLinks', this.value)
   },
   methods: {
   }
@@ -98,7 +87,7 @@ export default {
         width: 100% !important;
 
         .el-form-item__content {
-          padding-left: 3.75rem;
+          // padding-left: 3.75rem;
         }
       }
     }

applications/dee-mes/src/privateComponents/components/JobResponseInTestProcess/component/equipmenCheckNo.vue

@@ -7,14 +7,16 @@
 <template>
   <div class="equipmen-checkNo">
     <dee-tools :tools="tools" mode="normal" style="flex-direction: row-reverse;margin-bottom: 12px;" />
-    <el-form
-      ref="form"
-      :model="form"
-      :rules="formRules"
-    >
+    <el-form ref="form" :model="form" :rules="formRules">
       <el-col :span="8">
         <el-form-item label-width="100px" label="验收单号" prop="testNo">
-          <el-input v-model="form.testNo" placeholder="请输入验收单号" :disabled="subTypeNameDisabled" clearable onchange="this.value=this.value.toUpperCase()" />
+          <el-input
+            v-model="form.testNo"
+            placeholder="请输入验收单号"
+            :disabled="subTypeNameDisabled"
+            clearable
+            onchange="this.value=this.value.toUpperCase()"
+          />
         </el-form-item>
       </el-col>
       <el-col :span="8">
@@ -41,29 +43,17 @@
       </el-col>
       <el-col :span="8">
         <el-form-item label-width="100px" label=" 保证期">
-          <el-input
-            v-model="form.guaranteePeriod"
-            clearable
-            placeholder="请输入保证期"
-          />
+          <el-input v-model="form.guaranteePeriod" clearable placeholder="请输入保证期" />
         </el-form-item>
       </el-col>
       <el-col :span="8">
         <el-form-item label-width="100px" label=" 首翻期">
-          <el-input
-            v-model="form.firstTurnPeriod"
-            clearable
-            placeholder="请输入首翻期"
-          />
+          <el-input v-model="form.firstTurnPeriod" clearable placeholder="请输入首翻期" />
         </el-form-item>
       </el-col>
       <el-col :span="8">
         <el-form-item label-width="100px" label=" 总寿命">
-          <el-input
-            v-model="form.totalLife"
-            clearable
-            placeholder="请输入总寿命"
-          />
+          <el-input v-model="form.totalLife" clearable placeholder="请输入总寿命" />
         </el-form-item>
       </el-col>
       <el-col :span="8">
@@ -74,7 +64,14 @@
       <el-col :span="8">
         <el-form-item label-width="100px" label="重量">
           <!-- <el-input v-model="form.weight" placeholder="请输入重量" /> -->
-          <el-input v-model="form.weight" clearable type="number" placeholder="请输入重量" onkeyup="this.value=this.value.replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3');" onafterpaste="this.value=this.value.replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3');">
+          <el-input
+            v-model="form.weight"
+            clearable
+            type="number"
+            placeholder="请输入重量"
+            onkeyup="this.value=this.value.replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3');"
+            onafterpaste="this.value=this.value.replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3');"
+          >
             <template slot="append">Kg</template>
           </el-input>
         </el-form-item>
@@ -126,7 +123,7 @@
             clearable
             :min="0"
             placeholder="不合格数"
-            :disabled="form.isPass!=='N'"
+            :disabled="form.isPass !== 'N'"
           />
         </el-form-item>
       </el-col>
@@ -347,14 +344,20 @@ export default {
         })
       })
     },
-    savePDF() {}
+    savePDF() {
+      this.$api.apiDownloadFile(`JobResponseInTest/download/pdf?id=${this.basicData.id}&billType=AirEquipment`)
+    }
   }
 }
 </script>
 <style lang='scss'>
-  .equipmen-checkNo{
-    .el-select{
-      width: 100%;
-    }
+.equipmen-checkNo {
+  .el-select {
+    width: 220px
+  }
+
+  .el-input {
+    width: 220px
   }
+}
 </style>

applications/dee-mes/src/privateComponents/components/JobResponseInTestProcess/component/outSourceCheckNo.vue

@@ -316,9 +316,19 @@ export default {
         })
       })
     },
-    savePDF() {}
+    savePDF() {
+      this.$api.apiDownloadFile(`JobResponseInTest/download/pdf?id=${this.basicData.id}&billType=OutSource`)
+    }
   }
 }
 </script>
 <style lang='scss'>
+.outSource-checkNo{
+  .el-select {
+    width: 220px
+  }
+  .el-input {
+    width: 220px
+  }
+}
 </style>

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

@@ -123,6 +123,7 @@ export default {
         ]
       }
       post('JobResponseInTest/search', param).then(res => {
+        console.log('data', res)
         const data = res.items.content[0]
         this.data = data
         this.type = type