质量模块联调及缺陷修复

index.html

@@ -46,6 +46,7 @@
   </div>
 </div>
 <script type='module' src='/src/main.js'></script>
+<script src="https://unpkg.com/mathjs@13.0.2/lib/browser/math.js"></script>
 </body>
 
 </html>

public/config.js

@@ -26,4 +26,4 @@ window.WARE_MATERIAL_STOCK_TAG = "http://192.168.169.172:9000/jmreport/view/1181
 window.PROCESS_INSPECTION_RECORD ="http://192.168.169.172:9000/jmreport/view/1188648621968805888" //检验记录地址
 
 //测厚打印
-window.THICKNESS_PRINT = "http://192.168.169.172:9000/jmreport/view/1192318619566641152?woId=&&&&&&&&"
+window.THICKNESS_PRINT = "http://192.168.169.172:9000/jmreport/view/1192318619566641152"

src/api/qualityManagement/inspectionArchiving/rbFilePreserve.js

@@ -39,9 +39,9 @@ export const deleteRecords = (params) =>{
 // 电子档案详情
 export const getWordDetail = (params) =>{
     return request({
-        url:'/api/blade-desk/QA/ProReTemplate/detail',
+        // url:'/api/blade-desk/QA/ProReTemplate/detail',
+        url:`/api/blade-desk/QA/InspectionTask/getByRfpId/${params.id}`,
         method:'get',
-        params
     })
 }
 
@@ -75,7 +75,8 @@ export const getProcessList = (params) =>{
 // 维护电子档案
 export const editTable = (data) =>{
     return request({
-        url:'/api/blade-desk/QA/ProReTemplate/updateDetail',
+        url:'/api/blade-desk/QA/InspectionTask/saveOrEdit',
+        // url:'/api/blade-desk/QA/ProReTemplate/updateDetail',
         method:'post',
         data
     })

src/api/storeManagement/warehouseMaintenance.js

@@ -131,4 +131,13 @@ export const getAllUser = (params) => {
       method: 'get',
       params,
     });
+  };
+
+// 获取物料下拉
+export const getMaterialSelect = (params) => {
+    return request({
+      url: '/api/blade-wms/stGoods/page',
+      method: 'get',
+      params,
+    });
   };

src/views/basicData/warehouseMaintenance.vue

@@ -48,10 +48,18 @@
           @size-change="sizeChange"
           @refresh-change="refreshChange"
           @on-load="onLoad"
+          :beforeOpen="beforeOpen"
         >
           <template #menu-left>
             <el-button type="primary" @click="handleAdd">新增</el-button>
           </template>
+          <template #goodsCode-form="{type}">
+            <el-select v-if="type == 'edit'" v-model="form.goodsCode" placeholder="请选择物料" 
+              @change="changeGoods" filterable remote  :remote-method="remoteMethodGoods"
+              :loading="goodsLoading" >
+              <el-option v-for="item in goodsList" :key="item.id" :label="item.goodsCode" :value="item.id"> </el-option>
+            </el-select>
+          </template>
           <!-- <template #menu="{ row }">
             <el-button type="text" v-if="tabPosition == 'warehouseSetup'">管理员设置</el-button>
           </template> -->
@@ -132,7 +140,7 @@ import addEditDialog from "./components/addEditDialog.vue"
 import {warehouseOption,storageOption} from "./js/warehouseMain";
 import {getWareList,addWare,editWare,deleteWare,getLocationList,delLocation,
 editLocation,getUserByRoleAlias,getWareByUser,getWareSelect,getUserByWare,saveUserWare,getAllUser,
-saveWareUser} from "@/api/storeManagement/warehouseMaintenance";
+saveWareUser,getMaterialSelect} from "@/api/storeManagement/warehouseMaintenance";
 export default {
   components: { addEditDialog,treeTransfer },
   data() {
@@ -144,6 +152,8 @@ export default {
       noChooseWare:[],  //未选库房
       noChooseUser:[],  //未选人员
       chooseUser:[],    //已选人员
+      goodsList:[],
+      goodsLoading:false,
       form: {},
       query:{},
       dialogTitle:'新增',
@@ -228,6 +238,46 @@ export default {
     })
   },
   methods: {
+    // getGoodsList(){
+    //   getMaterialSelect().then(res =>{
+
+    //   })
+    // },
+    beforeOpen(done, type){
+      if(type == 'edit'){
+        getMaterialSelect().then(res =>{
+          this.goodsList = res.data.data.records
+          done()
+        })
+      }else{
+        done()
+      }
+    },
+    remoteMethodGoods(query){
+      console.log("query",query)
+      if(query){
+        this.goodsLoading = true
+        getMaterialSelect({
+          goodsCode:query
+        }).then(res =>{
+          this.goodsList = res.data.data.records
+          this.goodsLoading = false
+        })
+      }else{
+        this.goodsLoading = true
+        getMaterialSelect().then(res =>{
+          this.goodsList = res.data.data.records
+          this.goodsLoading = false
+        })
+      }
+    },
+    changeGoods(val){
+      console.log("val",val)
+      let tmp = this.goodsList.find(item => item.id == val)
+      this.form.goodsName = tmp.goodsName
+      this.form.specifications = tmp.specifications
+      this.form.mtltmrk = tmp.mtltmrk
+    },
     searchChange(params, done){
       if(this.tabPosition == "warehouseSetup"){
         this.query = params

src/views/productionTesting/components/trialStandard.vue

@@ -9,7 +9,7 @@
                 <!-- <el-button type="primary"    @click="handleSet">批量设置分类</el-button> -->
             </template>
             <template #originalName="scope">
-                <span style="color:#284c89;cursor:pointer;" @click="downloadA(scope.row.attach.link,scope.row.attach.originalName)">{{scope.row.attach.originalName}}</span>
+                <span style="color:#284c89;cursor:pointer;" @click="downloadA(scope.row.attach.link,scope.row.attach.originalName)">{{scope.row.attach && scope.row.attach.originalName}}</span>
             </template>
             <template #originalName-form="{type}">
                 <el-upload

src/views/qualityManagement/inspectionArchiving/ERecord/index.vue

@@ -25,7 +25,7 @@
           <el-button v-if="row.yieldType == 1" type="text"  @click="rbPrint(row,2)">热表打印</el-button>
           <el-button v-else type="text"  @click="sjPrint(row)">烧结打印</el-button>
         </span>
-        <el-button type="text"  @click="handleDelete">测厚打印</el-button>
+        <el-button type="text"  @click="handleThickness(row)">测厚打印</el-button>
       </template>
       <!-- <template #category="{ row }">
         <el-tag>{{ row.categoryName }}</el-tag>
@@ -788,6 +788,9 @@ export default {
       //   this.showSjPrint = true
       // }
     },
+    handleThickness(row){
+      window.open(window.THICKNESS_PRINT+'?woId='+row.woId)
+    },
     rbPrint(row,type){
       this.dialogType = type
       this.planOpenSj = false

src/views/qualityManagement/inspectionArchiving/rbFilePreserve/addPreserve.vue

@@ -217,10 +217,10 @@ export default {
     },
     remoteMethod(query){
         console.log('query---------------',query)
-        if (!query.trim()) {
+        // if (!query.trim()) {
-            this.processList = [];
+        //     this.processList = [];
-            return;
+        //     return;
-        }
+        // }
         if (query) {
             this.loading = true
             getProcessList({
@@ -230,7 +230,15 @@ export default {
                 this.loading = false
             })
         } else {
-            this.processList = [];
+            // this.processList = [];
+            this.loading = true
+            getProcessList({
+                size:9999,
+                count:1
+            }).then(res =>{
+                this.processList = res.data.data.records;
+                this.loading = false
+            })
         }
     },
     // 删除选中行

src/views/qualityManagement/inspectionArchiving/rbFilePreserve/templatePreserve.vue

@@ -2311,12 +2311,12 @@ export default {
       const row = this.rightList[index];
       console.log('row----------------',row)
       if (row.id) {
-        // this.deleteIds.push(row.rfpsId);
+        this.deleteIds.push(row.rfpsId);
-        deleteTable({
+        // deleteTable({
-          tankId:row.id
+        //   tankId:row.id
-        }).then(res =>{
+        // }).then(res =>{
           
-        })
+        // })
       }
       this.rightList.splice(index, 1);
     },
@@ -2337,19 +2337,28 @@ export default {
       //       }
       //     }
       //   });
-      editTable({
+      let params = {
-        id:this.rfpId,
+        rfpId:this.rfpId,
-        preserveSlotList:this.rightList
+        submitList:this.rightList,
-      }).then(res =>{
+        deleteIds:this.deleteIds
-        if(res.data.code == 200){
+      }
-          this.$message.success('保存成功')
+      console.log('params----------------',params)
-          if (flag) {
+      // editTable({
-            this.cancel(true);
+      //   // id:this.rfpId,
-          } else {
+      //   // preserveSlotList:this.rightList
-            this.getDate();
+      //   rfpId:this.rfpId,
-          }
+      //   submitList:this.rightList,
-        }
+      //   deleteIds:this.deleteIds
-      })
+      // }).then(res =>{
+      //   if(res.data.code == 200){
+      //     this.$message.success('保存成功')
+      //     if (flag) {
+      //       this.cancel(true);
+      //     } else {
+      //       this.getDate();
+      //     }
+      //   }
+      // })
       console.log('this.rightList-----------',this.rightList)
     },
     cancel(isRefresh) {

src/views/qualityManagement/inspectionArchiving/rbFilePreserve/templatePreserve2.vue

@@ -1702,12 +1702,12 @@ export default {
       const row = this.rightList[index];
       console.log('row----------------',row)
       if (row.id) {
-        // this.deleteIds.push(row.rfpsId);
+        this.deleteIds.push(row.id);
-        deleteTable({
+        // deleteTable({
-          tankId:row.id
+        //   tankId:row.id
-        }).then(res =>{
+        // }).then(res =>{
           
-        })
+        // })
       }
       this.rightList.splice(index, 1);
     },
@@ -1756,10 +1756,21 @@ export default {
       //       }
       //     }
       //   });
-      editTable({
+
-        id:this.rfpId,
+      let params = {
-        preserveSlotList:processedList
+        rfpId:this.rfpId,
-      }).then(res =>{
+        submitList:this.rightList,
+        deleteIds:this.deleteIds
+      }
+      console.log('params----------------',params)
+
+      editTable(
+        params
+        // {
+        //   id:this.rfpId,
+        //   preserveSlotList:processedList
+        // }
+      ).then(res =>{
         if(res.data.code == 200){
           this.$message.success('保存成功')
           if (flag) {
@@ -1769,7 +1780,7 @@ export default {
           }
         }
       })
-      console.log('this.rightList-----------',processedList)
+      // console.log('this.rightList-----------',processedList)
     },
     cancel(isRefresh) {
       this.rightList = [];

src/views/qualityManagement/tankSolutionSystem/inspectionReport.vue

@@ -78,7 +78,7 @@
             <template #footer>
                 <span class="dialog-footer">
                     <el-button @click="lineBox = false">取 消</el-button>
-                    <el-button type="primary" @click="submit">保 存</el-button>
+                    <el-button type="primary" v-if="viewType != 'view'" @click="submit">保 存</el-button>
                 </span>
             </template>
         </el-dialog>

src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue

@@ -43,19 +43,19 @@
             </template>
             <!-- 测量值 -->
             <template #firstTestValue="scope">
-                {{scope.row.firstTestValue}}{{scope.row.firstTestValue != '' ? scope.row.liquidTank.testUnit : ''}}
+                {{scope.row.firstTestValue}}{{scope.row.firstTestValue != '' ? scope.row.liquidTank ? scope.row.liquidTank.testUnit : '' : ''}}
             </template>
             <!-- 需添加量 -->
             <template #needAddValue="scope">
-                {{scope.row.needAddValue}}{{scope.row.needAddValue != '' ? scope.row.liquidTank.addUnit : ''}}
+                {{scope.row.needAddValue}}{{scope.row.needAddValue != '' ? scope.row.liquidTank ? scope.row.liquidTank.addUnit : '' : ''}}
             </template>
             <!-- 实际添加量 -->
             <template #actualAddValue="scope">
-                {{scope.row.actualAddValue}}{{scope.row.actualAddValue != '' ? scope.row.liquidTank.addUnit : ''}}
+                {{scope.row.actualAddValue}}{{scope.row.actualAddValue != '' ? scope.row.liquidTank ? scope.row.liquidTank.addUnit  : '' : ''}}
             </template>
             <!-- 复测测量值 -->
             <template #repeatTestValue="scope">
-                {{scope.row.repeatTestValue}}{{scope.row.repeatTestValue != '' ? scope.row.liquidTank.testUnit : ''}}
+                {{scope.row.repeatTestValue}}{{scope.row.repeatTestValue != '' ? scope.row.liquidTank ? scope.row.liquidTank.testUnit : ''  : ''}}
             </template>
             <!-- <template #userId="{ row }">
                 {{ row.testMan.userName }}
@@ -743,7 +743,11 @@ export default {
                 workCenterId: params?.workCenterId || this.search.workCenterId,
                 id: params?.id || this.taskId, // 添加 id 参数
             }).then(res =>{
+                res.data.data.records.map(item =>{
+                    item.liquidTank = null
+                })
                 this.data = res.data.data.records
+
                 this.data.map(item =>{
                     if(item.status == 2 || item.status == 1){
                         item.firstTestValue = ''