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

src/views/bpm/handleTask/components/financialManage/invoiceManage/components/addOrEditDialog.vue

@@ -5,11 +5,7 @@
       <el-row :gutter="12">
         <el-row :gutter="12">
           <el-col :span="12">
-            <el-form-item
-              label="发票类型"
-              prop="type"
-              
-            >
+            <el-form-item label="发票类型" prop="type">
               <el-select
                 v-model="form.type"
                 @change="handleSelType"
@@ -51,11 +47,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item
-              label="金额"
-              prop="amount"
-              
-            >
+            <el-form-item label="金额" prop="amount">
               <el-input-number
                 v-model="form.amount"
                 :precision="2"
@@ -68,11 +60,7 @@
           </el-col>
         </el-row>
         <el-col :span="12">
-          <el-form-item
-            label="申请部门"
-            prop="applyDeptId"
-            
-          >
+          <el-form-item label="申请部门" prop="applyDeptId">
             <ele-tree-select
               :disabled="taskDefinitionKey != 'starter'"
               clearable
@@ -87,11 +75,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item
-            label="申请人"
-            prop="applyUserId"
-            
-          >
+          <el-form-item label="申请人" prop="applyUserId">
             <personSelect
               :disabled="taskDefinitionKey != 'starter'"
               ref="directorRef"
@@ -100,9 +84,9 @@
             />
           </el-form-item>
         </el-col>
- 
+
         <el-col :span="12">
-          <el-form-item label="预计开票日期" >
+          <el-form-item label="预计开票日期">
             <el-date-picker
               :disabled="taskDefinitionKey != 'starter'"
               style="width: 100%"
@@ -118,7 +102,6 @@
             v-if="taskDefinitionKey != 'starter'"
             label="会计科目"
             prop="accountingSubjectId"
-            
           >
             <ele-tree-select
               clearable
@@ -150,11 +133,7 @@
       <headerTitle title="开票信息"></headerTitle>
       <el-row :gutter="12">
         <el-col :span="12">
-          <el-form-item
-            label="公司名称"
-            prop="companyName"
-            
-          >
+          <el-form-item label="公司名称" prop="companyName">
             <el-input
               v-model="form.companyName"
               :disabled="taskDefinitionKey != 'starter'"
@@ -162,25 +141,22 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item
-            label="统一社会信用代码"
-            prop="companyUsc"
-            
-          >
+          <el-form-item label="发票类型" prop="type1">
+            <el-radio v-model="form.type1" label="1">增值税普通发票</el-radio>
+            <el-radio v-model="form.type1" label="2">增值税专用发票</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="统一社会信用代码" prop="companyUsc">
             <el-input
               v-model="form.companyUsc"
               :disabled="taskDefinitionKey != 'starter'"
             ></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="12">
+
         <el-col :span="12">
-          <el-form-item
-            label="开户银行"
-            prop="companyBankBranchNo"
-            
-          >
+          <el-form-item label="开户银行" prop="companyBankBranchNo">
             <el-input
               v-model="form.companyBankBranchNo"
               :disabled="taskDefinitionKey != 'starter'"
@@ -188,26 +164,16 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item
-            label="银行账户"
-            prop="companyBankAccount"
-            
-          >
+          <el-form-item label="银行账户" prop="companyBankAccount">
             <el-input
               v-model="form.companyBankAccount"
               :disabled="taskDefinitionKey != 'starter'"
             ></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
 
-      <el-row :gutter="12">
         <el-col :span="12">
-          <el-form-item
-            label="单位地址"
-            prop="companyAddress"
-            
-          >
+          <el-form-item label="单位地址" prop="companyAddress">
             <el-input
               v-model="form.companyAddress"
               :disabled="taskDefinitionKey != 'starter'"
@@ -215,11 +181,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item
-            label="电话号码"
-            prop="companyTel"
-            
-          >
+          <el-form-item label="电话号码" prop="companyTel">
             <el-input
               v-model="form.companyTel"
               :disabled="taskDefinitionKey != 'starter'"
@@ -231,11 +193,7 @@
 
       <el-row :gutter="12">
         <el-col :span="12">
-          <el-form-item
-            label="收票人"
-            prop="receiverName"
-            
-          >
+          <el-form-item label="收票人" prop="receiverName">
             <el-input
               v-model="form.receiverName"
               :disabled="taskDefinitionKey != 'starter'"
@@ -243,11 +201,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item
-            label="收票人地址"
-            prop="receiverAddress"
-            
-          >
+          <el-form-item label="收票人地址" prop="receiverAddress">
             <el-input
               v-model="form.receiverAddress"
               :disabled="taskDefinitionKey != 'starter'"
@@ -257,11 +211,7 @@
       </el-row>
       <el-row :gutter="12">
         <el-col :span="12">
-          <el-form-item
-            label="联系方式"
-            prop="receiverTel"
-            
-          >
+          <el-form-item label="联系方式" prop="receiverTel">
             <el-input
               v-model="form.receiverTel"
               :disabled="taskDefinitionKey != 'starter'"
@@ -349,7 +299,8 @@
           remark: '',
           settlementAccountId: '',
           settlementAccountName: '',
-          type: ''
+          type: '',
+          type1: 2
         },
         feeTypeList: [],
         accountingSubjectList: [],

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

@@ -60,8 +60,11 @@
 
 </template>
 <script>
+import dictMixins from '@/mixins/dictMixins';
 
 export default {
+  mixins: [dictMixins],
+
   components: {},
   props: ['datasource', 'dataForm','dialogType', 'taskDefinitionKey', 'priceObj'],
   computed: {
@@ -115,25 +118,23 @@ export default {
             slot: 'modelType',
             showOverflowTooltip: true
           },
-          // {
-          //   minWidth: 100,
-          //   prop: 'orderNo',
-          //   label: '销售订单编码',
-          //   align: 'center',
-          //   slot: 'orderNo',
-          //   showOverflowTooltip: true
-          // },
-          // {
-          //   minWidth: 100,
-          //   prop: 'pricingWay',
-          //   label: '计价方式',
-          //   align: 'center',
-          //   slot: 'pricingWay',
-          //   showOverflowTooltip: true,
-          //   formatter: (_row, _column, cellValue) => {
-          //     return _row.pricingWay == 1 ? '按数量计价' : '按重量计价'
-          //   }
-          // },
+          {
+            prop: 'provenance',
+            label: '产地',
+            slot: 'provenance',
+            align: 'center',
+            // show:this.contractBookType==2,
+            minWidth: 200,
+            showOverflowTooltip: true,
+            formatter: (row, column) => {
+       
+              return row.provenance && row.provenance.length
+                ? row.provenance
+                    .map((item) => this.getDictValue('产地', item ))
+                    .join(',')
+                : '';
+            }
+          },
           {
             minWidth: 100,
             prop: 'totalCount',
@@ -198,6 +199,8 @@ export default {
             slot: 'discountTotalPrice',
             align: 'center',
           },
+       
+          
           // {
           //   minWidth: 100,
           //   prop: 'discountTotalPrice',
@@ -289,6 +292,9 @@ export default {
     };
   },
   watch: {},
+  created(){
+    this.requestDict('产地');
+  },
   methods: {
     handleEditCost(row, p1, p2) {
       if (!row[p1]) return row[p2] = row.totalPrice.toFixed(2)

src/views/bpm/handleTask/components/saleOrder/accountstatement/inventoryTable.vue

@@ -61,8 +61,11 @@
 
 </template>
 <script>
+import dictMixins from '@/mixins/dictMixins';
 
 export default {
+  mixins: [dictMixins],
+
   components: {},
   props: ['datasource', 'dataForm','dialogType', 'taskDefinitionKey', 'priceObj'],
   computed: {
@@ -127,14 +130,23 @@ export default {
             slot: 'modelType',
             showOverflowTooltip: true
           },
-          // {
-          //   minWidth: 100,
-          //   prop: 'orderNo',
-          //   label: '销售订单编码',
-          //   align: 'center',
-          //   slot: 'orderNo',
-          //   showOverflowTooltip: true
-          // },
+          {
+            prop: 'provenance',
+            label: '产地',
+            slot: 'provenance',
+            align: 'center',
+            // show:this.contractBookType==2,
+            minWidth: 200,
+            showOverflowTooltip: true,
+            formatter: (row, column) => {
+       
+              return row.provenance && row.provenance.length
+                ? row.provenance
+                    .map((item) => this.getDictValue('产地', item ))
+                    .join(',')
+                : '';
+            }
+          },
           {
             minWidth: 100,
             prop: 'pricingWay',
@@ -384,6 +396,9 @@ export default {
         }
       }
   },
+  created(){
+    this.requestDict('产地');
+  },
   data() {
     return {
       subTypeList:{

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/customerReturnOrder.vue

@@ -482,7 +482,9 @@
   import dictEnum from '@/enum/dict';
   import fileMain from '@/components/addDoc/index.vue';
   import parentList from '@/views/bpm/handleTask/components/supplierManage/parentList.vue';
+  import dictMixins from '@/mixins/dictMixins';
   export default {
+    mixins: [dictMixins],
     name: 'customerReturnOrder',
     props: {
       taskDefinitionKey: {
@@ -671,6 +673,22 @@
             slot: 'technicalDrawings',
             align: 'center'
           },
+          {
+            prop: 'provenance',
+            label: '产地',
+            slot: 'provenance',
+            align: 'center',
+
+            minWidth: 200,
+            showOverflowTooltip: true,
+            formatter: (row, column) => {
+              return row.provenance && row.provenance.length
+                ? row.provenance
+                    .map((item) => this.getDictValue('产地', item))
+                    .join(',')
+                : '';
+            }
+          },
           {
             minWidth: 140,
             prop: 'reason',
@@ -906,7 +924,7 @@
       }
     },
     created() {
-      console.log(this.isShowReturnOrder, '====');
+      this.requestDict('产地');
     },
     mounted() {
       this.getReturnInfo(this.businessId);

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

@@ -499,41 +499,23 @@
             showOverflowTooltip: true,
             align: 'center'
           },
-          // {
-          //   minWidth: 100,
-          //   prop: 'qmsResult',
-          //   label: '质检结果',
-          //   showOverflowTooltip: true,
-          //   align: 'center',
-          //   formatter: (_row, _column, cellValue) => {
-          //     return this.qualityResults[_row.qmsResult];
-          //   }
-          // },
-          // {
-          //   minWidth: 100,
-          //   prop: 'qmsStatus',
-          //   label: '质检状态',
-          //   showOverflowTooltip: true,
-          //   align: 'center',
-          //   formatter: (_row, _column, cellValue) => {
-          //     return this.qualityStatus[_row.qmsStatus];
-          //   }
-          // },
-          // {
-          //   minWidth: 130,
-          //   prop: 'productionDate',
-          //   showOverflowTooltip: true,
-          //   label: '生产日期',
-          //   align: 'center'
-          // },
-
-          // {
-          //   minWidth: 100,
-          //   prop: 'purchaseDate',
-          //   label: '采购日期',
-          //   align: 'center'
-          // },
-
+          {
+            prop: 'provenance',
+            label: '产地',
+            slot: 'provenance',
+            align: 'center',
+            // show:this.contractBookType==2,
+            minWidth: 200,
+            showOverflowTooltip: true,
+            formatter: (row, column) => {
+       
+              return row.provenance && row.provenance.length
+                ? row.provenance
+                    .map((item) => this.getDictValue('产地', item ))
+                    .join(',')
+                : '';
+            }
+          },
           {
             minWidth: 200,
             prop: 'returnReason',
@@ -562,6 +544,7 @@
     },
     created() {
       this.getDetailData(this.businessId);
+      this.requestDict('产地');
     },
     methods: {
       downloadFile(file) {

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

@@ -429,7 +429,21 @@
             showOverflowTooltip: true,
             align: 'center'
           },
-
+          {
+            prop: 'provenance',
+            label: '产地',
+            slot: 'provenance',
+            align: 'center',
+            minWidth: 200,
+            showOverflowTooltip: true,
+            formatter: (row, column) => {
+              return row.provenance && row.provenance.length
+                ? row.provenance
+                    .map((item) => this.getDictValue('产地', item ))
+                    .join(',')
+                : '';
+            }
+          },
           {
             width: 220,
             prop: 'remark',
@@ -461,7 +475,7 @@
     },
     async created() {
       await this.getDetailData(this.businessId);
-      console.log('this.taskDefinitionKey--------', this.taskDefinitionKey);
+      this.requestDict('产地');
       if (this.taskDefinitionKey == 'storemanApprove') {
         this.tabOptions.push({ key: 'outBound', name: '出库单' });
         this.activeComp = 'outBound';

src/views/bpm/handleTask/components/saleOrder/returnGoods/addReturnGoodsDialog.vue

@@ -85,22 +85,12 @@
           </el-form-item>
 
           <el-form-item prop="returnFiles" label="退货附件">
-            <fileMain v-model="form.fileUpload"></fileMain>
-            <!--            <fileUpload-->
-            <!--              v-model="form.returnFiles"-->
-            <!--              module="main"-->
-            <!--              :showLib="false"-->
-            <!--              :limit="10"-->
-            <!--            />-->
+            <fileMain v-model="form.returnFiles"></fileMain>
+       
           </el-form-item>
           <el-form-item prop="repliedFiles" label="回执附件">
             <fileMain v-model="form.repliedFiles"></fileMain>
-            <!--            <fileUpload-->
-            <!--              v-model="form.repliedFiles"-->
-            <!--              module="main"-->
-            <!--              :showLib="false"-->
-            <!--              :limit="10"-->
-            <!--            />-->
+          
           </el-form-item>
         </el-col>
       </el-row>
@@ -428,6 +418,23 @@
 
             align: 'center'
           },
+          {
+            prop: 'provenance',
+            label: '产地',
+            slot: 'provenance',
+            align: 'center',
+            // show:this.contractBookType==2,
+            minWidth: 200,
+            showOverflowTooltip: true,
+            formatter: (row, column) => {
+       
+              return row.provenance && row.provenance.length
+                ? row.provenance
+                    .map((item) => this.getDictValue('产地', item ))
+                    .join(',')
+                : '';
+            }
+          },
           {
             width: 220,
             prop: 'remark',
@@ -514,6 +521,7 @@
       }
     },
     created() {
+      this.requestDict('产地');
       this.getDetail(this.businessId);
     },
     methods: {

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

@@ -89,38 +89,15 @@
             prop="returnFiles"
             style="margin-bottom: 16px"
           >
-            <div
-              v-if="detailData.returnFiles && detailData.returnFiles?.length"
-            >
-              <el-link
-                v-for="link in detailData.returnFiles"
-                :key="link.id"
-                type="primary"
-                :underline="false"
-                @click="downloadFile(link)"
-              >
-                {{ link.name }}
-              </el-link>
-            </div>
+          <fileMain v-model="form.returnFiles" type="view"></fileMain>
+            
           </el-form-item>
           <el-form-item
             label="回执附件："
             prop="sendFiles"
             style="margin-bottom: 16px"
           >
-            <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="form.sendFiles" type="view"></fileMain>
           </el-form-item>
         </el-col>
       </el-row>
@@ -182,13 +159,14 @@
   import { reviewStatusEnum } from '@/enum/dict';
   import inventoryTabledetail from '@/BIZComponents/inventoryTableDetails.vue';
   import inventoryTable from '@/BIZComponents/inventoryTable.vue';
+  import fileMain from '@/components/addDoc/index.vue';
 
 
   export default {
     mixins: [dictMixins],
     components: {
       inventoryTabledetail,
-      inventoryTable
+      inventoryTable,fileMain
     },
     data() {
       return {
@@ -422,6 +400,21 @@
           
             align: 'center'
           },
+          {
+            prop: 'provenance',
+            label: '产地',
+            slot: 'provenance',
+            align: 'center',
+            minWidth: 200,
+            showOverflowTooltip: true,
+            formatter: (row, column) => {
+              return row.provenance && row.provenance.length
+                ? row.provenance
+                    .map((item) => this.getDictValue('产地', item ))
+                    .join(',')
+                : '';
+            }
+          },
           {
             width: 220,
             prop: 'remark',
@@ -566,41 +559,21 @@
             showOverflowTooltip: true,
             align: 'center'
           },
-          // {
-          //   minWidth: 100,
-          //   prop: 'qmsResult',
-          //   label: '质检结果',
-          //   showOverflowTooltip: true,
-          //   align: 'center',
-          //   formatter: (_row, _column, cellValue) => {
-          //     return this.qualityResults[_row.qmsResult];
-          //   }
-          // },
-          // {
-          //   minWidth: 100,
-          //   prop: 'qmsStatus',
-          //   label: '质检状态',
-          //   showOverflowTooltip: true,
-          //   align: 'center',
-          //   formatter: (_row, _column, cellValue) => {
-          //     return this.qualityStatus[_row.qmsStatus];
-          //   }
-          // },
-          // {
-          //   minWidth: 130,
-          //   prop: 'productionDate',
-          //   showOverflowTooltip: true,
-          //   label: '生产日期',
-          //   align: 'center'
-          // },
-
-          // {
-          //   minWidth: 100,
-          //   prop: 'purchaseDate',
-          //   label: '采购日期',
-          //   align: 'center'
-          // },
-
+          {
+            prop: 'provenance',
+            label: '产地',
+            slot: 'provenance',
+            align: 'center',
+            minWidth: 200,
+            showOverflowTooltip: true,
+            formatter: (row, column) => {
+              return row.provenance && row.provenance.length
+                ? row.provenance
+                    .map((item) => this.getDictValue('产地', item ))
+                    .join(',')
+                : '';
+            }
+          },
           {
             minWidth: 200,
             prop: 'returnReason',
@@ -629,6 +602,8 @@
     },
     created() {
       this.getDetailData(this.businessId);
+      this.requestDict('产地');
+
     },
     methods: {
       downloadFile(file) {

src/views/bpm/handleTask/components/saleOrder/returnGoods/inventoryTable.vue

@@ -422,7 +422,23 @@
           //   label: '采购日期',
           //   align: 'center'
           // },
-
+          {
+            prop: 'provenance',
+            label: '产地',
+            slot: 'provenance',
+            align: 'center',
+            // show:this.contractBookType==2,
+            minWidth: 200,
+            showOverflowTooltip: true,
+            formatter: (row, column) => {
+       
+              return row.provenance && row.provenance.length
+                ? row.provenance
+                    .map((item) => this.getDictValue('产地', item ))
+                    .join(',')
+                : '';
+            }
+          },
           {
             minWidth: 200,
             prop: 'returnReason',
@@ -452,6 +468,9 @@
         ]
       };
     },
+    created() {
+      this.requestDict('产地');
+    },
     computed: {
       totalAmount() {
         let num = 0;

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

@@ -355,26 +355,21 @@
             showOverflowTooltip: true,
             align: 'center'
           },
-          // {
-          //   minWidth: 100,
-          //   prop: 'qmsResult',
-          //   label: '质检结果',
-          //   showOverflowTooltip: true,
-          //   align: 'center',
-          //   formatter: (_row, _column, cellValue) => {
-          //     return this.qualityResults[_row.qmsResult];
-          //   }
-          // },
-          // {
-          //   minWidth: 100,
-          //   prop: 'qmsStatus',
-          //   label: '质检状态',
-          //   showOverflowTooltip: true,
-          //   align: 'center',
-          //   formatter: (_row, _column, cellValue) => {
-          //     return this.qualityStatus[_row.qmsStatus];
-          //   }
-          // },
+          {
+            prop: 'provenance',
+            label: '产地',
+            slot: 'provenance',
+            align: 'center',
+            minWidth: 200,
+            showOverflowTooltip: true,
+            formatter: (row, column) => {
+              return row.provenance && row.provenance.length
+                ? row.provenance
+                    .map((item) => this.getDictValue('产地', item ))
+                    .join(',')
+                : '';
+            }
+          },
 
           {
             minWidth: 200,
@@ -403,7 +398,7 @@
       }
     },
     created() {
-      console.log('this.tabOptions----------------', this.tabOptions);
+      this.requestDict('产地');
       this.getDetailData(this.businessId);
       if (this.taskDefinitionKey == 'storemanApprove') {
         this.tabOptions.push({ key: 'inoutBound', name: '入库单' });

src/views/bpm/handleTask/components/saleOrder/saleReturnGoods/inventoryTable.vue

@@ -50,7 +50,8 @@
           :prop="'datasource.' + scope.$index + '.sendTotalWeight'"
           :rules="[
             {
-              required: scope.row.pricingWay == 2 && [3, 1].includes(returnSourceType),
+              required:
+                scope.row.pricingWay == 2 && [3, 1].includes(returnSourceType),
               message: '请输入数字',
               trigger: 'blur'
             }
@@ -101,7 +102,8 @@
           :rules="[
             {
               required:
-                (entrustedCode || returnSourceType == 2) && scope.row.pricingWaypricingWay == 2,
+                (entrustedCode || returnSourceType == 2) &&
+                scope.row.pricingWaypricingWay == 2,
               message: '请输入数字',
               trigger: 'blur'
             }
@@ -240,8 +242,7 @@
       <template v-slot:headerReceiveTotalWeight="{ column }">
         <span
           :class="{
-            'is-required':
-              (entrustedCode || returnSourceType == 2)
+            'is-required': entrustedCode || returnSourceType == 2
           }"
           >{{ column.label }}</span
         >
@@ -449,8 +450,11 @@
             slot: 'pricingWay',
             align: 'center',
             formatter: (row, column) => {
-              return row.pricingWay == 1 ? '按数量计费' : row.pricingWay == 2 ? '按重量计费':'';
-
+              return row.pricingWay == 1
+                ? '按数量计费'
+                : row.pricingWay == 2
+                ? '按重量计费'
+                : '';
             }
           },
           {
@@ -460,7 +464,7 @@
             slot: 'singlePrice',
             align: 'center'
           },
-    
+
           // {
           //   minWidth: 80,
           //   prop: 'weight',
@@ -483,41 +487,21 @@
             showOverflowTooltip: true,
             align: 'center'
           },
-          // {
-          //   minWidth: 100,
-          //   prop: 'qmsResult',
-          //   label: '质检结果',
-          //   showOverflowTooltip: true,
-          //   align: 'center',
-          //   formatter: (_row, _column, cellValue) => {
-          //     return this.qualityResults[_row.qmsResult];
-          //   }
-          // },
-          // {
-          //   minWidth: 100,
-          //   prop: 'qmsStatus',
-          //   label: '质检状态',
-          //   showOverflowTooltip: true,
-          //   align: 'center',
-          //   formatter: (_row, _column, cellValue) => {
-          //     return this.qualityStatus[_row.qmsStatus];
-          //   }
-          // },
-          // {
-          //   minWidth: 130,
-          //   prop: 'productionDate',
-          //   showOverflowTooltip: true,
-          //   label: '生产日期',
-          //   align: 'center'
-          // },
-
-          // {
-          //   minWidth: 100,
-          //   prop: 'purchaseDate',
-          //   label: '采购日期',
-          //   align: 'center'
-          // },
-
+          {
+            prop: 'provenance',
+            label: '产地',
+            slot: 'provenance',
+            align: 'center',
+            minWidth: 200,
+            showOverflowTooltip: true,
+            formatter: (row, column) => {
+              return row.provenance && row.provenance.length
+                ? row.provenance
+                    .map((item) => this.getDictValue('产地', item))
+                    .join(',')
+                : '';
+            }
+          },
           {
             minWidth: 200,
             prop: 'returnReason',
@@ -546,6 +530,9 @@
         ]
       };
     },
+    created() {
+      this.requestDict('产地');
+    },
     computed: {
       totalAmount() {
         if (item.pricingWay == 1) {