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

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

@@ -115,17 +115,7 @@
      </div>
      </template> -->
       <template v-slot:technicalDrawings="{ row }">
-        <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>
+        <fileMain v-model="row.technicalDrawings" type="view"></fileMain>
       </template>
     </ele-pro-table>
   </div>
@@ -201,6 +191,34 @@
             slot: 'specification',
             align: 'center'
           },
+          {
+            width: 120,
+            prop: 'imgCode',
+            align: 'center',
+            label: '图号/件号',
+            showOverflowTooltip: true
+          },
+          {
+            width: 120,
+            prop: 'produceType',
+            align: 'center',
+            label: '属性类型',
+            showOverflowTooltip: true,
+            formatter: (row, column) => {
+              return row.produceType && row.produceType.length
+                ? row.produceType
+                    .map((item) => this.getDictValue('生产类型', item))
+                    .join(',')
+                : '';
+            }
+          },
+          {
+            width: 120,
+            prop: 'packingSpecification',
+            align: 'center',
+            label: '包装规格',
+            showOverflowTooltip: true
+          },
           {
             width: 200,
             prop: 'supplierMark',
@@ -318,13 +336,13 @@
                 : '';
             }
           },
-          {
-            width: 120,
-            prop: 'deliveryDays',
-            label: '交期(天)',
-            slot: 'deliveryDays',
-            align: 'center'
-          },
+          // {
+          //   width: 120,
+          //   prop: 'deliveryDays',
+          //   label: '交期(天)',
+          //   slot: 'deliveryDays',
+          //   align: 'center'
+          // },
           {
             width: 200,
             prop: 'guaranteePeriod',
@@ -362,11 +380,7 @@
             prop: 'technicalDrawings',
             label: '技术图纸',
             slot: 'technicalDrawings',
-            formatter: (_row, _column, cellValue) => {
-              return (
-                (_row.guaranteePeriod || '') + _row.guaranteePeriodUnitName
-              );
-            },
+       
             align: 'center'
           },
           {
@@ -381,6 +395,8 @@
     },
     created() {
       this.requestDict('产地');
+      this.requestDict('生产类型');
+      
       this.getDetailData(this.businessId);
     },
     methods: {

src/views/bpm/handleTask/components/purchaseOrder/outSourceSend/inventoryTable.vue

@@ -28,17 +28,7 @@
           style="margin-bottom: 20px"
           :prop="'datasource.' + $index + '.technicalDrawings'"
         >
-          <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>
+          <fileMain v-model="row.technicalDrawings" type="view"></fileMain>
         </el-form-item>
       </template>
       <template v-slot:industryArtFiles="{ row, $index }">
@@ -47,17 +37,7 @@
           :prop="'datasource.' + $index + '.industryArtFiles'"
         >
           <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 }">
@@ -66,17 +46,7 @@
           :prop="'datasource.' + $index + '.otherFiles'"
         >
           <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:customerReqFiles="{ row, $index }">
@@ -85,17 +55,17 @@
           :prop="'datasource.' + $index + '.customerReqFiles'"
         >
           <fileMain v-model="row.customerReqFiles" type="view"></fileMain>
-<!--          <div v-if="row.customerReqFiles && row.customerReqFiles?.length">-->
-<!--            <el-link-->
-<!--              v-for="link in row.customerReqFiles"-->
-<!--              :key="link.id"-->
-<!--              type="primary"-->
-<!--              :underline="false"-->
-<!--              @click="downloadFile(link)"-->
-<!--            >-->
-<!--              {{ link.name }}-->
-<!--            </el-link>-->
-<!--          </div>-->
+          <!--          <div v-if="row.customerReqFiles && row.customerReqFiles?.length">-->
+          <!--            <el-link-->
+          <!--              v-for="link in row.customerReqFiles"-->
+          <!--              :key="link.id"-->
+          <!--              type="primary"-->
+          <!--              :underline="false"-->
+          <!--              @click="downloadFile(link)"-->
+          <!--            >-->
+          <!--              {{ link.name }}-->
+          <!--            </el-link>-->
+          <!--          </div>-->
         </el-form-item>
       </template>
 
@@ -190,7 +160,7 @@
 
   import { copyObj } from '@/utils/util';
   import { getFile } from '@/api/system/file';
-  import fileMain from "@/components/addDoc/index.vue";
+  import fileMain from '@/components/addDoc/index.vue';
 
   export default {
     mixins: [dictMixins],
@@ -280,6 +250,34 @@
             slot: 'specification',
             align: 'center'
           },
+          {
+            width: 120,
+            prop: 'imgCode',
+            align: 'center',
+            label: '图号/件号',
+            showOverflowTooltip: true
+          },
+          {
+            width: 120,
+            prop: 'produceType',
+            align: 'center',
+            label: '属性类型',
+            showOverflowTooltip: true,
+            formatter: (row, column) => {
+              return row.produceType && row.produceType.length
+                ? row.produceType
+                    .map((item) => this.getDictValue('生产类型', item))
+                    .join(',')
+                : '';
+            }
+          },
+          {
+            width: 120,
+            prop: 'packingSpecification',
+            align: 'center',
+            label: '包装规格',
+            showOverflowTooltip: true
+          },
           {
             minWidth: 150,
             prop: 'customerMark',
@@ -498,7 +496,8 @@
     },
     created() {
       this.requestDict('产地');
-
+      this.requestDict('生产类型');
+      
       getWarehouseList().then((res) => {
         this.warehouseList = res;
       });