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

src/views/bpm/handleTask/components/inquiryManage/addDialog.vue

@@ -298,6 +298,10 @@
         });
       },
       removeSupplier(supplierId) {
+        if(supplierId == this.form.winnerId){
+          this.form.winnerId = ''
+          this.form.winnerName = ''
+        }
         this.supplierList = this.supplierList.filter(
           (item) => item.supplierId != supplierId
         );
@@ -358,7 +362,6 @@
             this.$message.warning('产品清单不能为空');
             return;
           }
-
           this.form.files = this.form.files || [];
           return this.form;
         } catch (error) {

src/views/bpm/handleTask/components/purchaseNeedManage/addDialog.vue

@@ -5,7 +5,7 @@
       <el-row>
         <el-col :span="12">
           <el-form-item
-            label="需求类型"
+            label="订单类型"
             prop="sourceType"
             style="margin-bottom: 22px"
           >

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

@@ -14,7 +14,7 @@
       </headerTitle>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="需求类型：" prop="contactTel">
+          <el-form-item label="订单类型：" prop="sourceTypeName">
             {{ form.sourceTypeName }}
           </el-form-item>
         </el-col>

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

@@ -92,13 +92,13 @@
           //   showOverflowTooltip: true,
           //   minWidth: 200
           // },
-          {
-            prop: 'purchaseTypeName',
-            label: '采购订单类型',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 140
-          },
+          // {
+          //   prop: 'purchaseTypeName',
+          //   label: '采购订单类型',
+          //   align: 'center',
+          //   showOverflowTooltip: true,
+          //   minWidth: 140
+          // },
           {
             prop: 'partaName',
             label: '采购方名称',

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

@@ -26,7 +26,7 @@
           </el-form-item>
 
           <el-form-item
-            label="需求类型"
+            label="订单类型"
             prop="sourceType"
             style="margin-bottom: 22px"
           >
@@ -93,18 +93,18 @@
             >
             </el-date-picker>
           </el-form-item> -->
-          <el-form-item
-            label="采购订单类型"
-            prop="purchaseType"
-            style="margin-bottom: 22px"
-          >
-            <DictSelection
-              dictName="采购订单类型"
-              clearable
-              v-model="form.purchaseType"
-            >
-            </DictSelection>
-          </el-form-item>
+<!--          <el-form-item-->
+<!--            label="采购订单类型"-->
+<!--            prop="purchaseType"-->
+<!--            style="margin-bottom: 22px"-->
+<!--          >-->
+<!--            <DictSelection-->
+<!--              dictName="采购订单类型"-->
+<!--              clearable-->
+<!--              v-model="form.purchaseType"-->
+<!--            >-->
+<!--            </DictSelection>-->
+<!--          </el-form-item>-->
           <el-form-item label="结算方式" prop="settlementMode">
             <DictSelection
               dictName="结算方式"
@@ -460,9 +460,9 @@ export default {
         deliveryDate: [
           {required: true, message: '请选择交货日期', trigger: 'change'}
         ],
-        purchaseType: [
-          {required: true, message: '请选择采购订单类型', trigger: 'change'}
-        ],
+        // purchaseType: [
+        //   {required: true, message: '请选择采购订单类型', trigger: 'change'}
+        // ],
         settlementMode: [
           {required: true, message: '请选择结算方式', trigger: 'change'}
         ],
@@ -883,10 +883,10 @@ export default {
 
         let commitData = Object.assign({}, this.form, {
           productList: this.$refs.inventoryTable.getTableValue(),
-          purchaseTypeName: this.getDictValue(
-            '采购订单类型',
-            this.form.purchaseType
-          ),
+          // purchaseTypeName: this.getDictValue(
+          //   '采购订单类型',
+          //   this.form.purchaseType
+          // ),
           sourceTypeName: this.getDictValue(
             '需求来源类型',
             this.form.sourceType

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

@@ -26,19 +26,19 @@
             {{ form.requireDeptName }}
           </el-form-item>
           <el-form-item
-            label="需求类型："
+            label="订单类型："
             prop="requireDeptName"
             style="margin-bottom: 16px"
           >
             {{ form.sourceTypeName }}
           </el-form-item>
-          <el-form-item
-            label="采购订单类型："
-            prop="purchaseTypeName"
-            style="margin-bottom: 16px"
-          >
-            {{ form.purchaseTypeName }}
-          </el-form-item>
+<!--          <el-form-item-->
+<!--            label="采购订单类型："-->
+<!--            prop="purchaseTypeName"-->
+<!--            style="margin-bottom: 16px"-->
+<!--          >-->
+<!--            {{ form.purchaseTypeName }}-->
+<!--          </el-form-item>-->
 
           <el-form-item prop="orderFiles" label="附件：">
             <div

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

@@ -59,7 +59,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item
-            label="需求类型"
+            label="订单类型"
             style="margin-bottom: 22px"
           >
             <el-input v-model="form.sourceTypeName" disabled></el-input>

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

@@ -97,13 +97,13 @@ export default {
         //   showOverflowTooltip: true,
         //   minWidth: 200
         // },
-        {
-          prop: 'purchaseTypeName',
-          label: '采购订单类型',
-          align: 'center',
-          showOverflowTooltip: true,
-          minWidth: 140
-        },
+        // {
+        //   prop: 'purchaseTypeName',
+        //   label: '采购订单类型',
+        //   align: 'center',
+        //   showOverflowTooltip: true,
+        //   minWidth: 140
+        // },
         {
           prop: 'partaName',
           label: '采购方名称',

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

@@ -93,7 +93,7 @@ export default {
         },
         {
           prop: 'sourceTypeName',
-          label: '需求来源',
+          label: '订单类型',
           align: 'center',
           showOverflowTooltip: true,
           minWidth: 140

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

@@ -31,8 +31,8 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item
-            label="需求来源"
-            prop="contactName"
+            label="订单类型"
+            prop="sourceTypeName"
             style="margin-bottom: 22px"
           >
             <el-input v-model="form.sourceTypeName" disabled></el-input>

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

@@ -80,8 +80,8 @@
      <el-row :gutter="20">
        <el-col :span="12">
          <el-form-item
-           label="需求来源："
-           prop="contactName"
+           label="订单类型："
+           prop="sourceTypeName"
            style="margin-bottom: 22px"
          >
            {{ form.sourceTypeName }}

src/views/bpm/handleTask/components/purchaseOrder/outsourceSendReturnGoods/addReturnGoodsDialog.vue

@@ -33,7 +33,7 @@
             />
           </el-form-item>
           <el-form-item
-            label="需求类型"
+            label="订单类型"
             style="margin-bottom: 22px"
           >
             <el-input v-model="form.sourceTypeName" disabled></el-input>

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

@@ -433,7 +433,7 @@
     },
     created() {
       this.getDetailData(this.businessId);
-      if (this.taskDefinitionKey == 'storemanApprove') {
+      if (this.taskDefinitionKey == 'storeman') {
         this.tabOptions.push({ key: 'inoutBound', name: '入库单' });
       }
       if (this.taskDefinitionKey == 'purchaserUploadReceipt') {
@@ -444,10 +444,7 @@
       changeActive(item) {
         this.activeComp = item.key;
         this.$emit('activeCompChange', item.key);
-        if (
-          this.taskDefinitionKey == 'storemanApprove' &&
-          item.key == 'inoutBound'
-        ) {
+        if (this.taskDefinitionKey == 'storeman' && item.key == 'inoutBound') {
           this.$nextTick(() => {
             this.$refs.add.pickerSuccess(this.form);
           });

src/views/bpm/handleTask/components/purchaseOrder/outsourceSendReturnGoods/submit.vue

@@ -23,11 +23,7 @@
         icon="el-icon-edit-outline"
         type="success"
         size="mini"
-        v-if="
-          taskDefinitionKey != 'storemanApprove' ||
-          (taskDefinitionKey == 'storemanApprove' &&
-            outInData.verifyStatus == 2)
-        "
+        v-if="taskDefinitionKey != 'storeman'"
         @click="handleAudit(1)"
         >通过
       </el-button>
@@ -37,10 +33,7 @@
         size="mini"
         :loading="isSaveLoading"
         @click="storemanApprove"
-        v-if="
-          ['storemanApprove'].includes(taskDefinitionKey) &&  activeComp == 'inoutBound' &&
-          [0, 3].includes(outInData.verifyStatus)
-        "
+        v-else
         >申请入库
       </el-button>
       <el-button
@@ -48,7 +41,8 @@
         type="danger"
         size="mini"
         @click="handleAudit(0)"
-        v-if="!['starter'].includes(taskDefinitionKey)">驳回
+        v-if="!['starter'].includes(taskDefinitionKey)"
+        >驳回
       </el-button>
 
       <el-dropdown
@@ -137,16 +131,6 @@
         }
       };
     },
-    async created() {
-      if (this.taskDefinitionKey == 'storemanApprove') {
-        let data = await getReturnSaleOrderrecordDetail(this.businessId);
-        try {
-          this.outInData = await getOutInBySourceBizNo(data.returnNo);
-        } catch (error) {
-          this.outInData.verifyStatus = 0;
-        }
-      }
-    },
     methods: {
       async storemanApprove() {
         let res = await this.getTableValue();
@@ -195,17 +179,8 @@
           if (!arr) {
             return;
           }
-
           await UpdateReturnInformation(arr);
         }
-        if (this.taskDefinitionKey === 'purchaserUploadReceipt') {
-          let data = await this.getTableValue();
-          if (data.repliedFiles.length == 0) {
-            this.$message.error('回执附件不能为空');
-            return;
-          }
-          await uploadReceipt(data);
-        }
         this._approveTaskWithVariables(status);
       },
       async _approveTaskWithVariables(status) {

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

@@ -33,7 +33,7 @@
             />
           </el-form-item>
           <el-form-item
-            label="需求类型"
+            label="订单类型"
             style="margin-bottom: 22px"
           >
             <el-input v-model="form.sourceTypeName" disabled></el-input>

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

@@ -37,7 +37,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="需求类型：" prop="contactTel">
+          <el-form-item label="订单类型：" prop="sourceTypeName">
             {{ form.sourceTypeName }}
           </el-form-item>
         </el-col>

src/views/bpm/handleTask/components/saleOrder/addDialog.vue

@@ -46,11 +46,11 @@
             />
           </el-form-item>
           <el-form-item
-            label="生产性订单"
+            label="订单类型"
             prop="needProduce"
             style="margin-bottom: 22px">
-            <el-radio v-model="form.needProduce" :label="1">是</el-radio>
-            <el-radio v-model="form.needProduce" :label="0">否</el-radio>
+            <el-radio v-model="form.needProduce" :label="1">生产性订单</el-radio>
+            <el-radio v-model="form.needProduce" :label="0">贸易性订单</el-radio>
           </el-form-item>
           <el-form-item prop="orderFiles" label="订单附件">
             <fileUpload

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

@@ -129,11 +129,11 @@
               {{ form.pricingWay==1?'按数量计费':'按重量计费' }}
             </el-form-item>
             <el-form-item
-              label="生产性订单："
+              label="订单类型："
               prop="totalAmount"
               style="margin-bottom: 16px"
             >
-              {{ form.needProduce?'是':'否' }}
+              {{ form.needProduce?'生产性订单':'贸易性订单' }}
             </el-form-item>
           </el-col>
         </el-row>

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

@@ -345,7 +345,7 @@
   import { deepClone } from '@/components/FormGenerator/utils/index';
   import {
     getTreeByPid,
-    getTreeByGroup,
+    allCategoryLevel,
     getOutInBySourceBizNoOrError
   } from '@/api/classifyManage';
   import pickOrder from '@/views/bpm/outgoingManagement/components/pickOrder.vue';
@@ -777,7 +777,7 @@
       },
       // 获取物品类型列表
       async getAssetTypeOptions() {
-        const { data } = await getTreeByGroup({ type: 1 });
+        const { data } = await allCategoryLevel();
         this.codeList = data;
         let obj = {};
         data.forEach((item) => {