Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wms into dev

src/components/upload/import-dialogNew.vue

@@ -37,7 +37,7 @@
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button size="small" @click="dialogVisible = false">关 闭</el-button>
-      <el-button size="small" @click="upload" type="primary">上 传</el-button>
+      <el-button size="small" @click="upload" type="primary" :loading="loading">上 传</el-button>
     </div>
   </el-dialog>
 </template>
@@ -62,7 +62,8 @@
         uploadShow: false,
         module: '',
         attaments: [], //上传文件
-        file: ''
+        file: '',
+        loading: false
       };
     },
 
@@ -92,18 +93,28 @@
       },
       // 文件上传
       async upload() {
+        this.loading = true;
         if (this.attaments.length == 0) {
           return this.$message.warning('文件不能为空！');
         }
         this.module = this.$props.defModule;
-
-        await importBatch({
-          module: this.module,
-          multiPartFiles: this.attaments
-        });
-        this.$message.success('操作成功！');
-        this.dialogVisible = false;
-        this.$emit('success');
+        try {
+          await importBatch({
+            module: this.module,
+            multiPartFiles: this.attaments
+          });
+          this.$message.success('操作成功！');
+          this.loading = false;
+          this.dialogVisible = false;
+          this.$emit('success');
+        } catch (error) {
+          this.loading = false;
+          // this.$message.error(error.message);
+          // this.$alert(error.message, '导入失败', {
+          //   confirmButtonText: '确定',
+          //   type: 'error'
+          // });
+        }
       },
       //下载模板
       downLoadTemplate() {

src/views/warehouseManagement/inventoryAllocation/components/print-template-bs-car.vue

@@ -43,7 +43,6 @@
       <div
         style="
           width: 100%;
-          font-size: 12px;
           display: flex;
           justify-content: space-between;
           margin-bottom: 10px;
@@ -57,7 +56,6 @@
       <div
         style="
           width: 100%;
-          font-size: 12px;
           display: flex;
           justify-content: space-between;
           margin-bottom: 10px;
@@ -82,16 +80,16 @@
         <tbody>
           <tr align="center">
             <td style="padding: 5px; width: 35px"> 序号 </td>
-            <td style="padding: 5px;"> 车型 </td>
-            <td style="padding: 5px;"> 料号 </td>
-            <td style="padding: 5px;"> 零件名 </td>
-            <td style="padding: 5px;"> 单位</td>
-            <td style="padding: 5px"> 交货数</td>
-            <td style="padding: 5px"> 实收数量</td>
-            <td style="padding: 5px"> 客户订单号</td>
-            <td style="padding: 5px"> 重量</td>
-            <td style="padding: 5px"> 工艺</td>
-            <td style="padding: 5px"> 备注</td>
+            <td style="padding: 5px; width: 10%;"> 车型 </td>
+            <td style="padding: 5px; width: 12%;"> 料号 </td>
+            <td style="padding: 5px; width: 20%;"> 零件名 </td>
+            <td style="padding: 5px; width: 8%;"> 单位</td>
+            <td style="padding: 5px; width: 8%;"> 交货数</td>
+            <td style="padding: 5px; width: 8%;"> 实收数量</td>
+            <td style="padding: 5px; width: 15%"> 客户订单号</td>
+            <td style="padding: 5px; width: 8%;"> 重量</td>
+            <td style="padding: 5px; width: 10%;"> 工艺</td>
+            <td style="padding: 5px; width: 10%;"> 备注</td>
           </tr>
 
           <tr align="center" v-for="(item, index) in detailList">
@@ -131,7 +129,6 @@
       <div
         style="
           width: 100%;
-          font-size: 12px;
           display: flex;
           justify-content: space-between;
           margin-top: 10px;
@@ -204,11 +201,11 @@
         this.detailList = res.map((item) => {
           return {
             ...item,
-            categoryCode: this.infoData.categoryCode,
-            categoryName: this.infoData.categoryName,
-            brandNum: this.infoData.brandNum,
-            categoryModel: this.infoData.model,
-            specification: this.infoData.specification
+            // categoryCode: this.infoData.categoryCode,
+            // categoryName: this.infoData.categoryName,
+            // brandNum: this.infoData.brandNum,
+            // categoryModel: this.infoData.model,
+            // specification: this.infoData.specification
           };
         });
         console.log('infoData', this.infoData)

src/views/warehouseManagement/inventoryAllocation/components/print-template-bs.vue

@@ -31,15 +31,15 @@
       <table style="width: 100%; border-collapse: collapse; margin-bottom: 20px;">
         <thead>
           <tr>
-            <th style="border: 1px solid #000; padding: 8px; text-align: center;" width="50px;">序号</th>
-            <th style="border: 1px solid #000; padding: 8px; text-align: center;">型号</th>
-            <th style="border: 1px solid #000; padding: 8px; text-align: center; width: 160px;">零件名</th>
-            <th style="border: 1px solid #000; padding: 8px; text-align: center;">单位</th>
-            <th style="border: 1px solid #000; padding: 8px; text-align: center;">送货数量</th>
-            <th style="border: 1px solid #000; padding: 8px; text-align: center;">验收数量</th>
-            <th style="border: 1px solid #000; padding: 8px; text-align: center;">备注</th>
-            <th style="border: 1px solid #000; padding: 8px; text-align: center;">订单号</th>
-            <th style="border: 1px solid #000; padding: 8px; text-align: center;">加工工艺</th>
+            <th style="border: 1px solid #000; padding: 8px; text-align: center; width: 40px;">序号</th>
+            <th style="border: 1px solid #000; padding: 8px; text-align: center; width: 15%;">型号</th>
+            <th style="border: 1px solid #000; padding: 8px; text-align: center; width: 20%;">零件名</th>
+            <th style="border: 1px solid #000; padding: 8px; text-align: center; width: 8%;">单位</th>
+            <th style="border: 1px solid #000; padding: 8px; text-align: center; width: 8%;">送货数量</th>
+            <th style="border: 1px solid #000; padding: 8px; text-align: center; width: 8%;">验收数量</th>
+            <th style="border: 1px solid #000; padding: 8px; text-align: center; width: 10%;">备注</th>
+            <th style="border: 1px solid #000; padding: 8px; text-align: center; width: 12%;">订单号</th>
+            <th style="border: 1px solid #000; padding: 8px; text-align: center; width: 12%;">加工工艺</th>
           </tr>
         </thead>
         <tbody>
@@ -68,7 +68,7 @@
         </tbody>
       </table>
 
-      <div style="display: flex; margin-top: 20px; width: 100%;">
+      <div style="display: flex; width: 100%;">
         <div style="flex: 1;">发货人：{{ infoData.allotName || '' }}</div>
         <div style="flex: 1;">送货人：</div>
         <div style="flex: 1;">收货人：</div>
@@ -146,11 +146,11 @@ export default {
         this.detailList = res.map((item) => {
           return {
             ...item,
-            categoryCode: this.infoData.categoryCode,
-            categoryName: this.infoData.categoryName,
-            brandNum: this.infoData.brandNum,
-            categoryModel: this.infoData.model,
-            specification: this.infoData.specification
+            // categoryCode: this.infoData.categoryCode,
+            // categoryName: this.infoData.categoryName,
+            // brandNum: this.infoData.brandNum,
+            // categoryModel: this.infoData.model,
+            // specification: this.infoData.specification
           };
         });
         console.log('infoData', this.infoData)

src/views/warehouseManagement/inventoryAllocation/details.vue

@@ -250,7 +250,8 @@
         auditStatus: [
           { code: 0, label: '未提交', class: 'danger-text' },
           { code: 1, label: '审核中', class: 'primary-text' },
-          { code: 2, label: '已完成', class: 'primary-text' }
+          { code: 2, label: '已完成', class: 'primary-text' },
+          { code: 3, label: '已驳回', class: 'danger-text' }
         ],
         detailList: [],
         infoData: {},
@@ -288,6 +289,9 @@
           if ([2].includes(this.infoData.auditStatus)) {
             base.push({ code: 2, label: '已完成', activeColor: '#157a2c' });
           }
+          if ([3].includes(this.infoData.auditStatus)) {
+            base.push({ code: 3, label: '已驳回', activeColor: '#cc3300' });
+          }
         }
         console.log(base, 'base');
         return base;

src/views/warehouseManagement/inventoryAllocation/index.vue

@@ -20,7 +20,7 @@
             >打印送货单</el-button
           >
           <el-button v-if="$hasPermission('wms:inventoryAllocation:print2')" :disabled="selection.length > 1" icon="el-icon-download" type="primary"  @click="printExl2"
-            >打印送货单</el-button
+            >打印送货单带车</el-button
           >
         </template>
         <!-- 单号链接 -->
@@ -31,7 +31,7 @@
         </template>
         <template v-slot:action="{ row }">
           <el-link
-            v-if="row.status == 0 && row.type == 2"
+            v-if="(row.status == 0 || row.status == 3) && row.type == 2"
             type="primary"
             :underline="false"
             icon="el-icon-view"
@@ -40,7 +40,7 @@
             提交
           </el-link>
           <el-link
-            v-if="row.status == 0"
+            v-if="row.status == 0 || row.status == 3"
             type="primary"
             :underline="false"
             icon="el-icon-view"
@@ -57,7 +57,7 @@
             详情
           </el-link> -->
           <el-link
-            v-if="row.status == 0"
+            v-if="row.status == 0 || row.status == 3"
             type="primary"
             :underline="false"
             icon="el-icon-delete"
@@ -96,7 +96,8 @@ import { enterprisePage } from '@/api/bpm/index.js';
         stutusOptions: {
           0: '未提交',
           1: '审核中',
-          2: '已完成'
+          2: '已完成',
+          3: '已驳回'
         },
         // 表格列配置
         columns: [

src/views/warehouseManagement/outgoingManagement/add.vue

@@ -1180,10 +1180,12 @@
       handleDeleteClick(row, index) {
         console.log('删除', row.id);
         this.productList.splice(index, 1);
-        console.log('删除后', this.packingList);
+        this.formData.outInDetailList.splice(index, 1);
         this.packingList = this.packingList.filter(
           (item) => item.outInDetailId !== row.id
         );
+        console.log('删除后', this.packingList);
+        console.log('删除后~~~', this.formData.outInDetailList);
       },
       handleBizSceneChange() {
         if (this.formData.extInfo.assetType == 7) {

src/views/warehouseManagement/outgoingManagement/index.vue

@@ -400,6 +400,30 @@
             align: 'center',
             showOverflowTooltip: true
           },
+          {
+            prop: 'specification',
+            label: '规格',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'modelType',
+            label: '型号',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'colorKey',
+            label: '颜色',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'modelKey',
+            label: '机型',
+            align: 'center',
+            showOverflowTooltip: true
+          },
           // {
           //   prop: 'verifyStatus',
           //   label: '状态',

src/views/warehouseManagement/stockManagement/add.vue

@@ -1616,7 +1616,8 @@
           });
           // 只有一个仓库自动显示出来
           if (res.length == 1) {
-            let name = res[0]?.factoryName + '-' + res[0]?.name;
+            // let name = res[0]?.factoryName + '-' + res[0]?.name;
+            let name = res[0]?.name;
             console.log('仓库-----------------------------', res);
             this.$set(this.productList[index], 'warehouseId', res[0].id);
             this.$set(this.productList[index], 'warehouseName', name);

src/views/warehouseManagement/stockManagement/index.vue

@@ -194,7 +194,7 @@
           >
 
           <el-button icon="el-icon-printer" type="primary" @click="handlePrint('printTemplateTrRef')" v-if="$hasPermission('wms:outin:printIn1')"
-            >打印入库单</el-button
+            >打印采购入库单</el-button
           >
 
           <!-- <el-button
@@ -399,13 +399,36 @@
             showOverflowTooltip: true,
             width: 150
           },
+          {
+            prop: 'specification',
+            label: '规格',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'modelType',
+            label: '型号',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'colorKey',
+            label: '颜色',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'modelKey',
+            label: '机型',
+            align: 'center',
+            showOverflowTooltip: true
+          },
           {
             prop: 'sourceBizNo',
             label: '来源单据',
             align: 'center',
             showOverflowTooltip: true
           },
-
           {
             prop: 'createUserName',
             label: '入库人',