Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt

src/api/classifyManage/index.js

@@ -91,7 +91,15 @@ export async function getOutInBySourceBizNo(id) {
 }
 // 质检
 export async function updateOutInRecord(data) {
-  const res = await request.post(`wms/outin/updateOutInRecord`,data);
+  const res = await request.post(`wms/outin/updateOutInRecord`, data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+// 质检wuliao
+export async function updateMaterialById(data) {
+  const res = await request.post(`wms/outin/updateMaterialById`, data);
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -99,7 +107,7 @@ export async function updateOutInRecord(data) {
 }
 // 质检员反馈
 export async function uploadQualityFile(data) {
-  const res = await request.post(`wms/outin/uploadQualityFile`,data);
+  const res = await request.post(`wms/outin/uploadQualityFile`, data);
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -107,7 +115,7 @@ export async function uploadQualityFile(data) {
 }
 // 根据code查询detail
 export async function getDetailByCode(data) {
-  const res = await request.post(`wms/outin/getDetailByCode`,data);
+  const res = await request.post(`wms/outin/getDetailByCode`, data);
   if (res.data.code == 0) {
     return res.data.data;
   }

src/views/bpm/handleTask/components/inoutBound/detailDialog.vue

@@ -49,7 +49,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="状态:">
-                  <span>{{ getAuditStatus(infoData.verifyStatus) }}</span>
+                  <span>{{ stepsTitle }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -493,7 +493,8 @@
             </el-table-column>
             <el-table-column width="100" label="重量" prop="weight">
               <template slot-scope="{ row }">
-                {{ row.weight }}
+                <el-input v-model="row.weight" v-if="!row.isMeta"></el-input>
+                <span v-else> {{ row.weight }}</span>
               </template>
             </el-table-column>
             <el-table-column label="重量单位" prop="weightUnit">
@@ -503,12 +504,17 @@
             </el-table-column>
             <el-table-column label="质检结果" prop="result" width="120">
               <template slot-scope="{ row }">
-                <span>
+                <DictSelection
+                  dictName="质检结果"
+                  clearable
+                  v-model="row.result"
+                />
+                <!-- <span v-else>
                   <span v-if="!row.result"></span>
                   <span v-if="row.result == 0">合格</span>
                   <span v-else-if="row.result == 1">不合格</span>
                   <span v-else>让步接收</span>
-                </span>
+                </span> -->
               </template>
             </el-table-column>
             <el-table-column label="质检状态" prop="status" width="120">
@@ -520,6 +526,16 @@
                 >
               </template>
             </el-table-column>
+            <el-table-column
+              label="操作"
+              width="80"
+              v-if="taskDefinitionKey == 'qualityInspection'"
+            >
+              <template slot-scope="{ row }">
+                <el-button type="text" @click="packMeta(row)"> 提交 </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
           </el-table>
         </div>
       </div>
@@ -537,7 +553,8 @@
   import {
     getTreeByPid,
     getOutInBySourceBizNo,
-    updateOutInRecord
+    updateOutInRecord,
+    updateMaterialById
   } from '@/api/classifyManage';
 
   import {
@@ -655,6 +672,16 @@
       this._getInfo();
     },
     methods: {
+      //质检物料提交
+      async packMeta(data) {
+        if (!data.result) {
+          return this.$message.error('请选择质检结果！');
+        }
+        data.status = 1;
+        data.result=Number(data.result)
+        await updateMaterialById(data);
+        this._getInfo();
+      },
       //质检提交
       async packCout(data) {
         if (!data.result) {
@@ -733,7 +760,10 @@
               iArr.push({ ...ele });
             });
           });
-          this.metailList = iArr;
+          
+          this.metailList = iArr.map(item=>{return {...item,result:item.result==0?'0':item.result!=null?item.result.toString():''}})
+
+          console.log('==',this.metailList)
         }
         const { data } = await getTreeByPid(0);
         this.codeList = data.map((item) => {

src/views/bpm/handleTask/components/materialPlan/detailDialog.vue

@@ -2,13 +2,7 @@
   <div>
 
     <headerTitle title="采购信息"></headerTitle>
-    <el-form
-      :model="formData"
-      ref="formRef"
-      label-width="120px"
-      class="ele-body"
-      :rules="rules"
-    >
+    <el-form :model="formData" ref="formRef" label-width="120px" class="ele-body" :rules="rules">
       <el-row :gutter="32">
         <el-col :span="12">
           <el-form-item label="配料计划名称" prop="name">
@@ -25,31 +19,16 @@
     </el-form>
 
     <el-form :model="formData" ref="tableForm">
-      <ele-pro-table
-        ref="table"
-        :needPage="false"
-        :columns="columns"
-        row-key="id"
-      >
+      <ele-pro-table ref="table" :needPage="false" :columns="columns" row-key="id">
         <!-- 展开内容 -->
         <template v-slot:expand="{ row }">
-          <div
-            style="
+          <div style="
               width: calc(100% - 95px);
               min-height: 60px;
               margin-left: 95px;
-            "
-            v-if="row.materialList.length > 0"
-          >
-            <ele-pro-table
-              :toolbar="false"
-              toolsTheme="none"
-              ref="table2"
-              :need-page="false"
-              :datasource="row.materialList"
-              :columns="columns2"
-              row-key="id"
-            >
+            " v-if="row.materialList.length > 0">
+            <ele-pro-table :toolbar="false" toolsTheme="none" ref="table2" :need-page="false"
+              :datasource="row.materialList" :columns="columns2" row-key="id">
               <template v-slot:sort="{ $index }">
                 {{ $index }}
               </template>
@@ -59,8 +38,8 @@
               </template>
 
               <template v-slot:requireDeliveryTime="{ row }">
-                <span v-if="row.deliveryMethod == 1">{{  row.requireDeliveryTime  }}</span>
-           
+                <span v-if="row.deliveryMethod == 1">{{ row.requireDeliveryTime }}</span>
+
 
                 <el-link type="primary" :underline="false" v-if="row.deliveryMethod == 2"
                   @click.native="handleMethod(row)">
@@ -68,23 +47,35 @@
                 </el-link>
               </template>
 
-            <!-- <template v-slot:imgUrl="{ row }">
-                {{ row }}
+
+              <template v-slot:imgUrl="{ row }">
+                <div v-if="row.imgUrl && row.imgUrl?.length">
+                  <el-link v-for="link in row.imgUrl" :key="link.id" type="primary" :underline="false"
+                    @click="downloadFile(link)">
+                    {{ link.name }}</el-link>
+                </div>
+              </template>
+
+              <template v-slot:files="{ row }">
+                <div v-if="row.files && row.files?.length">
+                  <el-link v-for="link in row.files" :key="link.id" type="primary" :underline="false"
+                    @click="downloadFile(link)">
+                    {{ link.name }}</el-link>
+                </div>
               </template>
-              -->
 
-           <!-- <template v-slot:files="{ row }" v-if='row.files != ""'>
-                {{ row.files }}
-              </template> -->
 
-        
+
+
+
+
             </ele-pro-table>
           </div>
         </template>
       </ele-pro-table>
     </el-form>
 
-    <timeDialog ref="timeDialogRef" ></timeDialog>
+    <timeDialog ref="timeDialogRef"></timeDialog>
   </div>
 </template>
   
@@ -128,7 +119,7 @@ export default {
         },
 
         {
-          prop: 'code',
+          prop: 'salesOrderCode',
           label: '销售订单号',
           showOverflowTooltip: true,
           align: 'center',
@@ -191,7 +182,7 @@ export default {
           align: 'center'
         },
 
-  
+
 
 
       ],
@@ -228,34 +219,35 @@ export default {
         },
 
         {
-          prop: 'packingCountBase',
-          label: '计量库存',
-          sortable: 'custom',
-          align: 'center'
+          prop: 'inventoryQuantity',
+          label: '库存',
+          showOverflowTooltip: true,
+
         },
 
         {
-          label: '计量单位',
           prop: 'unit',
-          align: 'center'
+          label: '计量单位',
+          showOverflowTooltip: true,
+          action: 'unit',
         },
 
         {
-          label: '需求数量', 
-          action: 'demandQuantity',
-          align: 'center'
+          label: '需求数量',
+          prop: 'demandQuantity',
+          align: 'center',
         },
 
         {
           label: '采购数量',
-          action: 'purchaseQuantity',
+          prop: 'purchaseQuantity',
           align: 'center'
         },
 
         {
           label: '到货方式',
           slot: 'deliveryMethod',
-          action: ' deliveryMethod',
+          action: 'deliveryMethod',
           align: 'center'
         },
 
@@ -266,7 +258,7 @@ export default {
           align: 'center'
         },
 
- 
+
 
         {
           label: '图纸',
@@ -279,12 +271,14 @@ export default {
         {
           label: '附件',
           slot: 'files',
-          action: 'files',
+          action: ' files',
           align: 'center',
+          minWidth: 140
         },
 
 
-   
+
+
       ],
 
       rules: {},
@@ -313,7 +307,10 @@ export default {
         this.$set(this.formData, 'remark', res.remark);
         this.formData['id'] = res.id;
         this.$refs.table.setData([...res.salesOrderList]);
-        this.$refs.table.toggleRowExpansionAll()
+        this.$nextTick(() => {
+          this.$refs.table.toggleRowExpansionAll()
+          this.$forceUpdate()
+        })
       }
     },
 

src/views/bpm/handleTask/components/materialPlan/timeDialog.vue

@@ -12,8 +12,8 @@
                 <el-table-column label="数量" prop="purchaseQuantity">
                     <template slot-scope="{ row, $index }">
                         <el-form-item :prop="'timeList.' + $index + '.purchaseQuantity'"
-                            :rules="tableFormRules.purchaseQuantity">
-                            <el-input placeholder="请输入" clearable v-model="row.purchaseQuantity"></el-input>
+                            >
+                            <el-input placeholder="请输入" disabled v-model="row.purchaseQuantity"></el-input>
                         </el-form-item>
 
                     </template>
@@ -25,8 +25,7 @@
                     <template slot-scope="{ row, $index }">
                         <el-form-item :prop="'timeList.' + $index + '.requireDeliveryTime'"
                             :rules="tableFormRules.requireDeliveryTime">
-                            <el-date-picker clearable v-model="row.requireDeliveryTime" type="date"
-                                value-format="yyyy-MM-dd" placeholder="请选择日期">
+                            <el-date-picker disabled v-model="row.requireDeliveryTime"  value-format="timestamp"   placeholder="请选择日期">
                             </el-date-picker>
                         </el-form-item>
                     </template></el-table-column>

src/views/bpm/handleTask/components/purchaseOrder/invoice/detailDialog.vue

@@ -167,6 +167,7 @@
   import { getReceiveSaleOrderrecordDetail } from '@/api/bpm/components/purchasingManage/purchaseorderreceive';
   import detailDialog from '@/views/bpm/handleTask/components/inoutBound/detailDialog.vue';
   import add from '@/views/bpm/stockManagement/add.vue';
+  import { getOutInBySourceBizNo } from '@/api/classifyManage';
 
   export default {
     props: {
@@ -334,21 +335,31 @@
     async created() {
       await this.getDetailData(this.businessId);
 
-      if (
-        !['starter', 'deptLeaderApprove', 'storeManagerApprove'].includes(
-          this.taskDefinitionKey
-        )
-      ) {
-        this.tabOptions.push({ key: 'inoutBoundView', name: '入库单详情' });
-        this.activeComp = 'inoutBoundView';
-      }
-      if (this.taskDefinitionKey == 'storeManagerApprove') {
-        this.tabOptions.push({ key: 'inoutBound', name: '入库单' });
-        this.activeComp = 'inoutBound';
-        this.$emit('activeCompChange', 'inoutBound');
-        this.$nextTick(() => {
-          this.$refs.add.pickerSuccess(this.form);
-        });
+      try {
+        const data = await getOutInBySourceBizNo(this.form.receiveNo);
+        console.log('aa==', data);
+        if (data != null) {
+          this.tabOptions.push({ key: 'inoutBoundView', name: '入库单详情' });
+          this.activeComp = 'inoutBoundView';
+          return;
+        }
+      } catch (error) {
+        if (
+          !['starter', 'deptLeaderApprove', 'storeManagerApprove'].includes(
+            this.taskDefinitionKey
+          )
+        ) {
+          this.tabOptions.push({ key: 'inoutBoundView', name: '入库单详情' });
+          this.activeComp = 'inoutBoundView';
+        }
+        if (this.taskDefinitionKey == 'storeManagerApprove') {
+          this.tabOptions.push({ key: 'inoutBound', name: '入库单' });
+          this.activeComp = 'inoutBound';
+          this.$emit('activeCompChange', 'inoutBound');
+          this.$nextTick(() => {
+            this.$refs.add.pickerSuccess(this.form);
+          });
+        }
       }
     },
 

src/views/bpm/stockManagement/add.vue

@@ -924,7 +924,14 @@
                   dictName="质检结果"
                   clearable
                   v-model="row.result"
+                  v-if="!row.isPack"
                 />
+                <span v-else>
+                  <span v-if="!row.result"></span>
+                  <span v-if="row.result == 0">合格</span>
+                  <span v-else-if="row.result == 1">不合格</span>
+                  <span v-else>让步接收</span>
+                </span>
               </template>
             </el-table-column>
             <el-table-column label="质检状态" prop="status" width="120">
@@ -933,7 +940,13 @@
                   dictName="质检状态"
                   clearable
                   v-model="row.status"
+                  v-if="!row.isPack"
                 />
+                <span v-else
+                  ><span v-if="!row.status"></span>
+                  <span v-if="row.status == 0">未检</span>
+                  <span v-else>已检</span></span
+                >
               </template>
             </el-table-column>
 
@@ -1041,7 +1054,11 @@
               prop="meterielCode"
             >
               <template slot-scope="{ row }">
-                <el-input v-model="row.materielCode"></el-input>
+                <el-input
+                  v-model="row.materielCode"
+                  v-if="!row.isMeta"
+                ></el-input>
+                <span v-else>{{ row.materialCode }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -1050,7 +1067,11 @@
               prop="clientCode"
             >
               <template slot-scope="{ row }">
-                <el-input v-model="row.clientCode"></el-input>
+                <el-input
+                  v-model="row.clientCode"
+                  v-if="!row.isMeta"
+                ></el-input>
+                <span v-else> {{ row.clientCode }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -1059,7 +1080,8 @@
               prop="engrave"
             >
               <template slot-scope="{ row }">
-                <el-input v-model="row.engrave"></el-input>
+                <el-input v-model="row.engrave" v-if="!row.isMeta"></el-input>
+                <span v-else> {{ row.engrave }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -1069,7 +1091,8 @@
               prop="weight"
             >
               <template slot-scope="{ row }">
-                <el-input v-model="row.weight"></el-input>
+                <el-input v-model="row.weight" v-if="!row.isMeta"></el-input>
+                <span v-else>{{ row.weight }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -1087,7 +1110,13 @@
                   dictName="质检结果"
                   clearable
                   v-model="row.result"
+                  v-if="!row.isMeta"
                 />
+                <span v-else
+                  ><span v-if="!row.status"></span>
+                  <span v-if="row.status == 0">未检</span>
+                  <span v-else>已检</span></span
+                >
               </template>
             </el-table-column>
             <el-table-column label="质检状态" prop="status" width="120">
@@ -1096,7 +1125,20 @@
                   dictName="质检状态"
                   clearable
                   v-model="row.status"
+                  v-if="!row.isMeta"
                 />
+                <span v-else
+                  ><span v-if="!row.status"></span>
+                  <span v-if="row.status == 0">未检</span>
+                  <span v-else>已检</span></span
+                >
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="80">
+              <template slot-scope="{ row }">
+                <el-button type="text" @click="packMeta(row)">
+                  {{ !row.isMeta ? '保存' : '编辑' }}
+                </el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -1156,6 +1198,7 @@
 </template>
 
 <script>
+  import { getProductList } from '@/api/bpm/components/saleManage/contact';
   import { getLoginUser } from '@/api/login';
   import picker from './components/picker.vue';
   import outin from '@/api/warehouseManagement/outin';
@@ -1326,7 +1369,8 @@
                 weightUnit: item.weightUnit,
                 engrave: item.engrave,
                 result: item.result,
-                status: item.status
+                status: item.status,
+                isMeta: false
               });
             }
           });
@@ -1334,8 +1378,13 @@
         } else {
           this.resultArray = [];
         }
+        console.log('this.resultArray', this.resultArray);
       },
       //包装明细保存
+      packMeta(row) {
+        console.log(row);
+        row.isMeta = !row.isMeta;
+      },
       packCout(row) {
         //true保存==》反之
         if (!row.isPack) {
@@ -1414,11 +1463,41 @@
               ...item,
               assetName: item.productName,
               assetCode: item.productCode,
-              categoryId: item.productCategoryId
+              categoryId: item.productCategoryId,
+              minPackUnit: item.packingUnit
             };
           });
-          this.onSelectTableData(list);
+          this.onSelectTableData(await this.serachMainCode(list));
+        }
+      },
+      async serachMainCode(arr) {
+        let newArr = [];
+        // 使用 Promise.all 来等待所有异步操作完成
+        await Promise.all(
+          arr.map(async (item) => {
+            const data = await getProductList({
+              pageNum: 1,
+              size: 10,
+              categoryLevelId: item.categoryLevelPathIdParent,
+              code: item.assetCode
+            });
+            newArr.push(data.list); // 将结果存储到 newArr 中
+          })
+        );
+        let re = [];
+        for (const item of newArr) {
+          for (const it of item) {
+            re.push(it);
+          }
         }
+        return re.map((item) => {
+          return {
+            ...item,
+            minPackUnit: item.packingUnit,
+            assetCode: item.code,
+            assetName: item.name
+          };
+        });
       },
       onClear() {
         this.formData.extInfo.documentSource = '';
@@ -1943,12 +2022,12 @@
             this.formatWarehouseMaterialList();
 
             let arr = this.warehousingMaterialList.map((item) => {
-              console.log(item,'item')
+              console.log(item, 'item');
               return {
                 netWeight: item.netWeight,
                 num: item.num,
                 batchNo: item.batchNo,
-                code:item.productCode,
+                code: item.productCode,
                 categoryId:
                   this.formData.bizType == 2
                     ? item.categoryId
@@ -2052,6 +2131,7 @@
       },
       //添加明细
       async onSelectTableData(val) {
+        console.log('===ssa', val);
         const res = await getCode('lot_number_code');
 
         this.warehousingMaterialList.push(