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

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

@@ -423,7 +423,13 @@
             slot: 'specification',
             align: 'center'
           },
-
+          {
+            minWidth: 200,
+            prop: 'taskName',
+            label: '工序',
+            slot: 'taskName',
+            align: 'center'
+          },
           {
             width: 120,
             prop: 'totalCount',

src/views/bpm/handleTask/components/saleOrder/invoiceConfirm/detailDialog.vue

@@ -54,39 +54,42 @@
               style="margin-bottom: 16px"
             >
               <fileMain v-model="detailData.sendFiles" type="view"></fileMain>
-<!--              <div v-if="detailData.sendFiles && detailData.sendFiles?.length">-->
-<!--                <el-link-->
-<!--                  v-for="link in detailData.sendFiles"-->
-<!--                  :key="link.id"-->
-<!--                  type="primary"-->
-<!--                  :underline="false"-->
-<!--                  @click="downloadFile(link)"-->
-<!--                >-->
-<!--                  {{ link.name }}</el-link-->
-<!--                >-->
-<!--              </div>-->
+              <!--              <div v-if="detailData.sendFiles && detailData.sendFiles?.length">-->
+              <!--                <el-link-->
+              <!--                  v-for="link in detailData.sendFiles"-->
+              <!--                  :key="link.id"-->
+              <!--                  type="primary"-->
+              <!--                  :underline="false"-->
+              <!--                  @click="downloadFile(link)"-->
+              <!--                >-->
+              <!--                  {{ link.name }}</el-link-->
+              <!--                >-->
+              <!--              </div>-->
             </el-form-item>
             <el-form-item
               label="回执附件："
               prop="sendFiles"
               style="margin-bottom: 16px"
             >
-              <fileMain v-model="detailData.repliedFiles" type="view"></fileMain>
-<!--              <div-->
-<!--                v-if="-->
-<!--                  detailData.repliedFiles && detailData.repliedFiles?.length-->
-<!--                "-->
-<!--              >-->
-<!--                <el-link-->
-<!--                  v-for="link in detailData.repliedFiles"-->
-<!--                  :key="link.id"-->
-<!--                  type="primary"-->
-<!--                  :underline="false"-->
-<!--                  @click="downloadFile(link)"-->
-<!--                >-->
-<!--                  {{ link.name }}</el-link-->
-<!--                >-->
-<!--              </div>-->
+              <fileMain
+                v-model="detailData.repliedFiles"
+                type="view"
+              ></fileMain>
+              <!--              <div-->
+              <!--                v-if="-->
+              <!--                  detailData.repliedFiles && detailData.repliedFiles?.length-->
+              <!--                "-->
+              <!--              >-->
+              <!--                <el-link-->
+              <!--                  v-for="link in detailData.repliedFiles"-->
+              <!--                  :key="link.id"-->
+              <!--                  type="primary"-->
+              <!--                  :underline="false"-->
+              <!--                  @click="downloadFile(link)"-->
+              <!--                >-->
+              <!--                  {{ link.name }}</el-link-->
+              <!--                >-->
+              <!--              </div>-->
             </el-form-item>
             <!-- <el-form-item label="计价方式：" style="margin-bottom: 22px">
               {{ form.pricingWay == 1 ? '按数量计费' : '按重量计费' }}
@@ -136,91 +139,67 @@
         </el-row>
       </el-form>
 
-      <headerTitle title="物品清单"></headerTitle>
-      <ele-pro-table
-        ref="table"
-        :needPage="false"
-        :columns="competAnalysisListcolumns"
-        :toolkit="[]"
-        :datasource="detailData.productList"
-        row-key="id"
-      >
-        <!-- <template v-slot:toolbar>
-        <div class="headbox">
-        <span class="amount">总计：{{detailData.totalAmount}}元</span>
-        <span class="amount">应付金额：{{detailData.payAmount}}元</span>
-      </div>
-      </template> -->
-        <template v-slot:stockLedger="scope">
-          <el-popover placement="right" width="60%" trigger="hover">
-            <ele-pro-table
-              :ref="'childrenTable' + scope.$index"
-              row-key="id"
-              max-height="300px"
-              :needPage="false"
-              :columns="childrenColumns"
-              :toolkit="[]"
-              :datasource="scope.row.sendProductDetail"
-              cache-key="stockLedgerRoleTable"
-              class="time-form"
-            >
-            </ele-pro-table>
-            <el-button type="text" slot="reference">明细</el-button>
-          </el-popover>
-        </template>
-        <template v-slot:industryArtFiles="{ row, $index }">
-          <el-form-item
-            style="margin-bottom: 20px"
-            :prop="'datasource.' + $index + '.industryArtFiles'"
+      <el-tabs type="border-card">
+        <el-tab-pane label="物品清单">
+          <ele-pro-table
+            ref="table"
+            :needPage="false"
+            :columns="competAnalysisListcolumns"
+            :toolkit="[]"
+            :datasource="detailData.productList"
+            row-key="id"
           >
-            <fileMain v-model="row.industryArtFiles" type="view"></fileMain>
-<!--            <div v-if="row.industryArtFiles && row.industryArtFiles?.length">-->
-<!--              <el-link-->
-<!--                v-for="link in row.industryArtFiles"-->
-<!--                :key="link.id"-->
-<!--                type="primary"-->
-<!--                :underline="false"-->
-<!--                @click="downloadFile(link)"-->
-<!--              >-->
-<!--                {{ link.name }}</el-link-->
-<!--              >-->
-<!--            </div>-->
-          </el-form-item>
-        </template>
-        <template v-slot:otherFiles="{ row, $index }">
-          <el-form-item
-            style="margin-bottom: 20px"
-            :prop="'datasource.' + $index + '.otherFiles'"
+            <template v-slot:stockLedger="scope">
+              <el-popover placement="right" width="60%" trigger="hover">
+                <ele-pro-table
+                  :ref="'childrenTable' + scope.$index"
+                  row-key="id"
+                  max-height="300px"
+                  :needPage="false"
+                  :columns="childrenColumns"
+                  :toolkit="[]"
+                  :datasource="scope.row.sendProductDetail"
+                  cache-key="stockLedgerRoleTable"
+                  class="time-form"
+                >
+                </ele-pro-table>
+                <el-button type="text" slot="reference">明细</el-button>
+              </el-popover>
+            </template>
+            <template v-slot:industryArtFiles="{ row, $index }">
+              <el-form-item
+                style="margin-bottom: 20px"
+                :prop="'datasource.' + $index + '.industryArtFiles'"
+              >
+                <fileMain v-model="row.industryArtFiles" type="view"></fileMain>
+              </el-form-item>
+            </template>
+            <template v-slot:otherFiles="{ row, $index }">
+              <el-form-item
+                style="margin-bottom: 20px"
+                :prop="'datasource.' + $index + '.otherFiles'"
+              >
+                <fileMain v-model="row.otherFiles" type="view"></fileMain>
+              </el-form-item>
+            </template>
+            <template v-slot:technicalDrawings="{ row }">
+              <fileMain v-model="row.technicalDrawings" type="view"></fileMain>
+            </template>
+          </ele-pro-table>
+        </el-tab-pane>
+
+        <el-tab-pane label="托盘清单" >
+          <ele-pro-table
+            ref="table"
+            :needPage="false"
+            :columns="trayListColumns"
+            :toolkit="[]"
+            :datasource="trayListData"
+            row-key="id"
           >
-            <fileMain v-model="row.otherFiles" type="view"></fileMain>
-<!--            <div v-if="row.otherFiles && row.otherFiles?.length">-->
-<!--              <el-link-->
-<!--                v-for="link in row.otherFiles"-->
-<!--                :key="link.id"-->
-<!--                type="primary"-->
-<!--                :underline="false"-->
-<!--                @click="downloadFile(link)"-->
-<!--              >-->
-<!--                {{ link.name }}</el-link-->
-<!--              >-->
-<!--            </div>-->
-          </el-form-item>
-        </template>
-        <template v-slot:technicalDrawings="{ row }">
-          <fileMain v-model="row.technicalDrawings" type="view"></fileMain>
-<!--          <div v-if="row.technicalDrawings && row.technicalDrawings?.length">-->
-<!--            <el-link-->
-<!--              v-for="link in row.technicalDrawings"-->
-<!--              :key="link.id"-->
-<!--              type="primary"-->
-<!--              :underline="false"-->
-<!--              @click="downloadFile(link)"-->
-<!--            >-->
-<!--              {{ link.name }}</el-link-->
-<!--            >-->
-<!--          </div>-->
-        </template>
-      </ele-pro-table>
+          </ele-pro-table>
+        </el-tab-pane>
+      </el-tabs>
     </div>
     <keep-alive>
       <add
@@ -243,8 +222,8 @@
   import { reviewStatusEnum } from '@/enum/dict';
   import { copyObj } from '@/utils/util';
   import add from '@/views/bpm/outgoingManagement/outbound.vue';
-  import fileMain from "@/components/addDoc/index.vue";
-  import {getSendSaleOrderConfirmDetail} from "@/api/bpm/components/saleManage/invoiceConfirm";
+  import fileMain from '@/components/addDoc/index.vue';
+  import { getSendSaleOrderConfirmDetail } from '@/api/bpm/components/saleManage/invoiceConfirm';
 
   export default {
     mixins: [dictMixins],
@@ -265,9 +244,7 @@
         form: {
           orderFiles: []
         },
-        rules: {},
-        detailData: {},
-        childrenColumns: [
+        trayListColumns: [
           {
             width: 45,
             type: 'index',
@@ -276,26 +253,106 @@
             fixed: 'left'
           },
           {
-            minWidth: 100,
-            prop: 'code',
+            minWidth: 160,
+            prop: 'productCode',
             label: '编码',
+            showOverflowTooltip: true,
+            align: 'center'
+          },
+          {
+            minWidth: 120,
+            prop: 'productName',
+            label: '名称',
+            showOverflowTooltip: true,
+            align: 'center'
+          },
+
+          {
+            minWidth: 160,
+            prop: 'batchNo',
+            label: '批次号',
+            showOverflowTooltip: true,
             align: 'center'
           },
           {
-            minWidth: 140,
+            minWidth: 160,
             prop: 'barcodes',
             label: '发货条码',
+            showOverflowTooltip: true,
             align: 'center'
           },
           {
-            minWidth: 100,
+            minWidth: 120,
+            prop: 'materielDesignation',
+            label: '物料代号',
+            showOverflowTooltip: true,
+            align: 'center'
+          },
+          {
+            minWidth: 120,
+            prop: 'clientCode',
+            label: '客户代号',
+            showOverflowTooltip: true,
+            align: 'center'
+          },
+          {
+            minWidth: 120,
             prop: 'engrave',
             label: '刻码',
+            showOverflowTooltip: true,
+            align: 'center'
+          },
+          {
+            minWidth: 160,
+            prop: 'packageNo',
+            align: 'center',
+            label: '包装编码',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 100,
+            prop: 'packingQuantity',
+            align: 'center',
+            label: '包装数量',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 120,
+            prop: 'packingUnit',
+            align: 'center',
+            label: '包装单位',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 100,
+            prop: 'totalCount',
+            label: '计量数量',
+            showOverflowTooltip: true,
             align: 'center'
+          },
+          {
+            minWidth: 150,
+            prop: 'measuringUnit',
+            label: '计量单位',
+            showOverflowTooltip: true,
+            align: 'center'
+          },
+          {
+            width: 120,
+            slot: 'type',
+            prop: 'type',
+            label: '回收状态',
+            align: 'center',
+            formatter: (row, column) => {
+              return row.type === 0 ? '未回收' : row.type === 1 ? '已回收' : '';
+            },
+            fixed: 'right'
           }
         ],
+        rules: {},
+        detailData: {},
         competAnalysisListcolumns: [
-        {
+          {
             width: 45,
             type: 'index',
             columnKey: 'index',
@@ -303,14 +360,14 @@
             fixed: 'left'
           },
           {
-            minWidth: 160,
+            minWidth: 200,
             prop: 'productCode',
             label: '编码',
             showOverflowTooltip: true,
             align: 'center'
           },
           {
-            minWidth: 120,
+            minWidth: 180,
             prop: 'productName',
             label: '名称',
             showOverflowTooltip: true,
@@ -318,7 +375,7 @@
           },
 
           {
-            minWidth: 160,
+            minWidth: 200,
             prop: 'batchNo',
             label: '批次号',
             showOverflowTooltip: true,
@@ -396,8 +453,11 @@
             slot: 'pricingWay',
             align: 'center',
             formatter: (row, column) => {
-              return row.pricingWay == 1 ? '按数量计费' : row.pricingWay == 2 ? '按重量计费':'';
-
+              return row.pricingWay == 1
+                ? '按数量计费'
+                : row.pricingWay == 2
+                ? '按重量计费'
+                : '';
             }
           },
           {
@@ -439,7 +499,7 @@
             formatter: (row, column) => {
               return row.provenance && row.provenance.length
                 ? row.provenance
-                    .map((item) => this.getDictValue('产地', item ))
+                    .map((item) => this.getDictValue('产地', item))
                     .join(',')
                 : '';
             }
@@ -457,14 +517,13 @@
             label: '收货状态',
             slot: 'isException',
             formatter: (row, column) => {
-              return row.isException == 1
-                ? '未收货'
-                : '已收货'
+              return row.isException == 1 ? '未收货' : '已收货';
             },
             fixed: 'right',
             align: 'center'
           }
-        ]
+        ],
+        trayListData: []
       };
     },
     props: {
@@ -489,14 +548,6 @@
       changeActive(item) {
         this.activeComp = item.key;
         this.$emit('activeCompChange', item.key);
-        // if (
-        //   this.taskDefinitionKey == 'storemanApprove' &&
-        //   item.key == 'outBound'
-        // ) {
-        //   this.$nextTick(() => {
-        //     this.$refs.add.eomSuccess(this.form);
-        //   });
-        // }
       },
       save(data) {
         this.$refs.add.handleNewSave(data);
@@ -532,6 +583,7 @@
           data.categoryLevelTopId = data.topCategoryIds;
           this.form = data;
           this.detailData = data;
+          this.trayListData = data.trayList;
         }
       }
     }