yusheng 1 年間 前
コミット
243b69dbca

+ 11 - 5
src/utils/request.js

@@ -9,7 +9,7 @@ import { getToken, setToken } from './token-util';
 import { logout } from './page-tab-util';
 import JSONBIG from 'json-bigint';
 import { Loading } from 'element-ui';
-let loadingInstance = null
+let loadingInstance = null;
 const service = axios.create({
   baseURL: API_BASE_URL,
   transformResponse: [
@@ -35,11 +35,11 @@ service.interceptors.request.use(
     if (token && config.headers) {
       config.headers.common[TOKEN_HEADER_NAME] = token;
     }
-   // loadingInstance = Loading.service({background:"rgba(255,253,253,0)",text:'',spinner: '1'});
+    // loadingInstance = Loading.service({background:"rgba(255,253,253,0)",text:'',spinner: '1'});
     return config;
   },
   (error) => {
-   // loadingInstance.close();
+    // loadingInstance.close();
     return Promise.reject();
   }
 );
@@ -53,15 +53,21 @@ service.interceptors.response.use(
     if (res.data.code == '-1' && res.config?.showErrorToast !== false) {
       Message.error(res.data.message);
     }
+    if (res.data.code == '-2' && res.config?.showErrorToast !== false) {
+      Message.warning({
+        dangerouslyUseHTMLString: true,
+        message: res.data.message
+      });
+    }
     const token = res.headers[TOKEN_HEADER_NAME.toLowerCase()];
     if (token) {
       setToken(token);
     }
-  //  loadingInstance.close();
+    //  loadingInstance.close();
     return res;
   },
   (error) => {
-   // loadingInstance.close();
+    // loadingInstance.close();
     // 登录过期处理
     if (error?.response?.status === 401) {
       const currentPath = router.currentRoute.path;

+ 1 - 1
src/views/saleManage/contact/components/addContactDialog.vue

@@ -1366,7 +1366,7 @@
           this.isUpdate = false;
           // 默认带出列表页面选中的分类
           this.$nextTick(() => {
-            this.categoryIdList = contactCategoryId?[contactCategoryId]:'';
+            this.categoryIdList = contactCategoryId?[contactCategoryId]:[];
           });
         } else {
           this.isUpdate = true;

+ 1 - 1
src/views/saleManage/saleOrder/accountstatement/components/saleForm.vue

@@ -37,7 +37,7 @@
         <!--        </el-form-item>-->
         <el-form-item
           label="选择订单"
-          prop="orderId"
+          prop="sourceId"
           v-if="dataForm.sourceType == 3"
         >
           <el-input

+ 9 - 69
src/views/saleManage/saleOrder/components/addDialog.vue

@@ -86,18 +86,7 @@
           <el-form-item label="合同编号" prop="contractNumber">
             <el-input disabled v-model="form.contractNumber" />
           </el-form-item>
-          <!-- <el-form-item
-            label="交货日期"
-            prop="deliveryDate"
-
-          >
-            <el-date-picker
-              v-model="form.deliveryDate"
-              type="date"
-              placeholder="选择日期"
-            >
-            </el-date-picker>
-          </el-form-item> -->
+         
           <el-form-item label="结算方式" prop="settlementMode">
             <DictSelection
               dictName="结算方式"
@@ -123,17 +112,7 @@
               </template>
             </el-input>
           </el-form-item>
-          <!-- <el-form-item label="计价方式" prop="pricingWay">
-            <el-radio-group
-              v-model="form.pricingWay"
-              @change="changePricingWay"
-              :disabled="!!form.contractId"
-            >
-              <el-radio v-for="item in pricingWayList" :label="item.id">{{
-                item.name
-              }}</el-radio>
-            </el-radio-group>
-          </el-form-item> -->
+       
         </el-col>
       </el-row>
       <headerTitle title="基本信息" v-if="form.needProduce != 2"></headerTitle>
@@ -205,11 +184,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="售出方名称" prop="partbName">
-            <!-- <el-input
-                clearable
-                v-model="form.partbName"
-                placeholder="请输入"
-              /> -->
+
             <el-input
               v-if="enterprisePage.length <= 1"
               clearable
@@ -423,7 +398,6 @@
 
 <script>
   import { emailReg, numberReg, telReg } from 'ele-admin';
-  import { acceptUnpackoptions } from '@/enum/dict';
   import inventoryTable from '@/BIZComponents/inventoryTable.vue';
   import fileUpload from '@/components/upload/fileUpload';
   import dictMixins from '@/mixins/dictMixins';
@@ -528,29 +502,18 @@
         clearing: false, //是否清除合同
         processSubmitDialogFlag: false,
         fullscreen: false, //全屏
-        payWayOptions: [],
-        delDetailIds: [],
         linkNameOptions: [],
-        pricingWayList: [
-          { id: 1, name: '按数量计价' },
-          { id: 2, name: '按重量计价' }
-        ],
-        acceptUnpackoptions,
+
         visible: false,
         title: '',
-        row: {},
-        activeName: 'base',
         formDef,
         form: copyObj(formDef),
-        tableBankData: [],
         tableLinkData: [],
         // 组织机构树形结构数据
         groupTreeData: [],
         groupData: [],
         rules: {
-          // deliveryDate: [
-          //   { required: true, message: '请选择交货日期', trigger: 'change' }
-          // ],
+
           settlementMode: [
             { required: true, message: '请选择结算方式', trigger: 'change' }
           ],
@@ -994,9 +957,7 @@
         this.form.partbFax = data.fax;
         this.form.partbAddress = data.address;
       },
-      salesmanChange(val, info) {
-        this.otherForm.salesmanName = info.name;
-      },
+
       settlementModeChange(info) {
         this.form.settlementModeName = info.dictValue;
       },
@@ -1081,14 +1042,7 @@
               updateContractStatus([this.form.contractId]);
             }
             if (type === 'sub') {
-              // if (commitData.needProduce == 1) {
-              //   this.$parent.$refs.autogenerateDialogRef.init(
-              //     this.businessId || res,
-              //     true
-              //   );
-              // } else {
-              //   this.saleOrderSubmit(res, commitData);
-              // }
+             
               this.saleOrderSubmit(res, commitData);
               return;
             } else {
@@ -1112,24 +1066,11 @@
             variables: {
               businessCode: data.orderNo
             }
-            // callBackMethodType : '1',
-            // callBackMethod : 'proTargetPlanApproveApiImpl.updatePlanApprovalStatus',
-            // pcHandle : '/bpm/handleTask/components/project-manage/plan-manage/submit.vue',
-            // pcView : '/bpm/handleTask/components/project-manage/plan-manage/detailDialog.vue',
-            // miniHandle : '',
-            // miniView : '',
+       
           };
           this.$refs.processSubmitDialogRef.init(params);
         });
-        // submit({
-        //   businessId: this.businessId || res
-        //   // productionSupervisorId
-        // }).then(() => {
-        //   this.$message.success('操作成功');
-        //
-        //   this.cancel();
-        //   this.$emit('done');
-        // });
+      
       },
       reload() {
         this.cancel();
@@ -1137,7 +1078,6 @@
       },
       cancel() {
         this.$nextTick(() => {
-          this.activeName = 'base';
           // 关闭后,销毁所有的表单数据
           this.$refs['otherForm'] && this.$refs['otherForm'].resetFields();
           this.$refs['formRef'] && this.$refs['formRef'].resetFields();

+ 109 - 137
src/views/saleManage/saleOrder/components/detailDialog.vue

@@ -27,221 +27,196 @@
       </div>
     </div>
     <div v-show="activeComp == 'order'">
-      <el-form ref="form" class="el-form-box" :model="form" :rules="rules" label-width="120px">
+      <el-form
+        ref="form"
+        class="el-form-box"
+        :model="form"
+        label-width="120px"
+      >
         <headerTitle title="订单信息"> </headerTitle>
         <el-row>
           <el-col :span="12">
-            <el-form-item
-              label="订单编号:"
-              prop="orderNo"
-
-            >
+            <el-form-item label="订单编号:" prop="orderNo">
               <el-input v-model="form.orderNo" disabled></el-input>
             </el-form-item>
-            <el-form-item
-              label="合同名称:"
-              prop="contractName"
-
-            >
+            <el-form-item label="合同名称:" prop="contractName">
               <el-input v-model="form.contractName" disabled></el-input>
             </el-form-item>
-            <el-form-item
-              label="合同编号:"
-              prop="contractNumber"
-
-            >
+            <el-form-item label="合同编号:" prop="contractNumber">
               <el-input v-model="form.contractNumber" disabled></el-input>
             </el-form-item>
-            <el-form-item
-              label="结算方式:"
-              prop="settlementModeName"
-
-            >
+            <el-form-item label="结算方式:" prop="settlementModeName">
               <el-input v-model="form.settlementModeName" disabled></el-input>
             </el-form-item>
 
-
-            <el-form-item
-              label="客户收货地址:"
-              prop="receiveAddress">
+            <el-form-item label="客户收货地址:" prop="receiveAddress">
               <el-input v-model="form.receiveAddress" disabled></el-input>
             </el-form-item>
-            <el-form-item
-              label="订单备注:"
-              prop="remark">
-              <el-input type="textarea" v-model="form.remark" disabled></el-input>
+            <el-form-item label="订单备注:" prop="remark">
+              <el-input
+                type="textarea"
+                v-model="form.remark"
+                disabled
+              ></el-input>
             </el-form-item>
             <el-form-item prop="orderFiles" label="订单附件:">
               <fileMain v-model="form.orderFiles" type="view"></fileMain>
-
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-          
-
-            <el-form-item
-              label="项目名称:"
-              prop="projectName">
+            <el-form-item label="项目名称:" prop="projectName">
               <el-input v-model="form.projectName" disabled></el-input>
             </el-form-item>
-            <el-form-item
-              label="销售部门:"
-              prop="salesDeptName">
+            <el-form-item label="销售部门:" prop="salesDeptName">
               <el-input v-model="form.salesDeptName" disabled></el-input>
             </el-form-item>
-            <el-form-item
-              label="销售类型:"
-              prop="saleTypeName">
+            <el-form-item label="销售类型:" prop="saleTypeName">
               <el-input v-model="form.saleTypeName" disabled></el-input>
             </el-form-item>
-            <el-form-item
-              label="总金额:"
-              prop="totalAmount">
+            <el-form-item label="总金额:" prop="totalAmount">
               <el-input v-model="form.totalAmount" disabled>
-                <template slot="append">
-                  元
-                </template>
+                <template slot="append"> 元 </template>
               </el-input>
             </el-form-item>
-            <el-form-item
-              label="优惠后总金额:"
-              prop="payAmount">
+            <el-form-item label="优惠后总金额:" prop="payAmount">
               <el-input v-model="form.payAmount" disabled>
-                <template slot="append">
-                  元
-                </template>
+                <template slot="append"> 元 </template>
               </el-input>
             </el-form-item>
-            <el-form-item
-              label="计价方式:">
-              <el-radio v-model="form.pricingWay" disabled :label="1">按数量计费</el-radio>
-              <el-radio v-model="form.pricingWay" disabled :label="2">按重量计费</el-radio>
-            </el-form-item>
             <el-form-item
               label="订单类型:"
               prop="needProduce"
-              style="margin-bottom: 22px">
-              <el-radio v-model="form.needProduce" disabled :label="1">生产性订单</el-radio>
-              <el-radio v-model="form.needProduce" disabled :label="0">库存式订单</el-radio>
+              style="margin-bottom: 22px"
+            >
+              <el-radio v-model="form.needProduce" disabled :label="1"
+                >生产性订单</el-radio
+              >
+              <el-radio v-model="form.needProduce" disabled :label="0"
+                >库存式订单</el-radio
+              >
+              <el-radio v-model="form.needProduce" disabled :label="2"
+                >无客户生产性订单</el-radio
+              >
+              <el-radio v-model="form.needProduce" disabled :label="4"
+                >不定向订单</el-radio
+              >
+            </el-form-item>
+            <el-form-item
+              label="总数"
+              prop="totalPlanNum"
+              v-if="form.needProduce == 4"
+            >
+              <el-input
+                v-model="form.totalPlanNum"
+                class="totalPlanNum"
+                disabled
+              >
+                <template slot="append">
+                  <DictSelection
+                    dictName="计量单位"
+                    disabled
+                    v-model="form.planNumUnit"
+                  >
+                  </DictSelection>
+                </template>
+              </el-input>
             </el-form-item>
-
           </el-col>
         </el-row>
         <headerTitle title="基本信息"></headerTitle>
         <el-row>
           <el-col :span="12">
-            <el-form-item
-              label="客户名称:"
-              prop="partaName">
+            <el-form-item label="客户名称:" prop="partaName">
               <el-input v-model="form.partaName" disabled></el-input>
             </el-form-item>
             <el-form-item
               label="客户统一社会信用代码:"
               prop="partaUnifiedSocialCreditCode"
-             class="form_item_label">
-              <el-input v-model="form.partaUnifiedSocialCreditCode" disabled></el-input>
+              class="form_item_label"
+            >
+              <el-input
+                v-model="form.partaUnifiedSocialCreditCode"
+                disabled
+              ></el-input>
             </el-form-item>
-            <el-form-item
-              label="客户联系人:"
-              prop="partaLinkName">
+            <el-form-item label="客户联系人:" prop="partaLinkName">
               <el-input v-model="form.partaLinkName" disabled></el-input>
             </el-form-item>
-            <el-form-item
-              label="客户电话:"
-              prop="partaTel">
+            <el-form-item label="客户电话:" prop="partaTel">
               <el-input v-model="form.partaTel" disabled></el-input>
             </el-form-item>
-            <el-form-item
-              label="客户传真:"
-              prop="partaFax">
+            <el-form-item label="客户传真:" prop="partaFax">
               <el-input v-model="form.partaFax" disabled></el-input>
             </el-form-item>
-            <el-form-item
-              label="	客户Email:"
-              prop="partaEmail">
+            <el-form-item label="	客户Email:" prop="partaEmail">
               <el-input v-model="form.partaEmail" disabled></el-input>
             </el-form-item>
-            <el-form-item
-              label="客户地址:"
-              prop="partaAddress">
+            <el-form-item label="客户地址:" prop="partaAddress">
               <el-input v-model="form.partaAddress" disabled></el-input>
             </el-form-item>
-            <!-- <el-form-item
-              label="客户税号"
-              prop="contactAddress"
-
-            >
-              <el-input
-                clearable
-                v-model="form.contactAddress"
-                placeholder="请输入"
-              />
-            </el-form-item> -->
+        
           </el-col>
 
           <el-col :span="12">
-            <el-form-item
-              label="售出方名称:"
-              prop="partbName">
+            <el-form-item label="售出方名称:" prop="partbName">
               <el-input v-model="form.partbName" disabled></el-input>
             </el-form-item>
             <el-form-item
               label="售出方统一社会信用代码:"
               prop="partbUnifiedSocialCreditCode"
-              class="form_item_label">
-              <el-input v-model="form.partbUnifiedSocialCreditCode" disabled></el-input>
+              class="form_item_label"
+            >
+              <el-input
+                v-model="form.partbUnifiedSocialCreditCode"
+                disabled
+              ></el-input>
             </el-form-item>
-            <el-form-item
-              label="售出方联系人:"
-              prop="partbLinkName">
+            <el-form-item label="售出方联系人:" prop="partbLinkName">
               <el-input v-model="form.partbLinkName" disabled></el-input>
             </el-form-item>
             <el-form-item
               prop="partbTel"
-              label="售出方联系电话:" class="form_item_label">
+              label="售出方联系电话:"
+              class="form_item_label"
+            >
               <el-input v-model="form.partbTel" disabled></el-input>
             </el-form-item>
             <el-form-item prop="partbFax" label="售出方传真:">
               <el-input v-model="form.partbFax" disabled></el-input>
             </el-form-item>
 
-            <el-form-item
-              label="售出方Email:"
-              prop="partbEmail">
+            <el-form-item label="售出方Email:" prop="partbEmail">
               <el-input v-model="form.partbEmail" disabled></el-input>
             </el-form-item>
 
-            <el-form-item
-              label="售出方地址:"
-              prop="partbAddress">
+            <el-form-item label="售出方地址:" prop="partbAddress">
               <el-input v-model="form.partbAddress" disabled></el-input>
             </el-form-item>
-            <!-- <el-form-item
-              label="售出方税号"
-              prop="contactAddress"
-
-            >
-              <el-input
-                clearable
-                v-model="form.contactAddress"
-                placeholder="请输入"
-              />
-            </el-form-item> -->
+     
           </el-col>
         </el-row>
       </el-form>
 
-      <headerTitle title="物品清单"></headerTitle>
+      <headerTitle title="物品清单" v-if="form.needProduce != 4"></headerTitle>
       <inventoryTabledetail
-        @toSendTab="toSendTab"
+        v-if="form.needProduce != 4"
         ref="inventoryTabledetailRef"
         :isCustomerMark="true"
         :isDiscountTotalPrice="true"
         pageName="send"
       ></inventoryTabledetail>
+      <headerTitle title="类型清单" v-if="form.needProduce == 4"></headerTitle>
+      <typeList
+        v-if="form.needProduce == 4"
+        ref="typeListRef"
+        type="view"
+      ></typeList>
     </div>
-    <bpmDetail v-if="activeComp==='bpm'&&form.processInstanceId" :id="form.processInstanceId"></bpmDetail>
+    <bpmDetail
+      v-if="activeComp === 'bpm' && form.processInstanceId"
+      :id="form.processInstanceId"
+    ></bpmDetail>
 
     <div v-if="activeComp == 'invoice'">
       <invoiceList :orderId="detailId"></invoiceList>
@@ -268,7 +243,8 @@
   import { copyObj } from '@/utils/util';
   import bpmDetail from '@/views/bpm/processInstance/detail.vue';
   import inventoryTabledetail from '@/BIZComponents/inventoryTableDetails.vue';
-  import fileMain from "@/components/addDoc/index.vue";
+  import fileMain from '@/components/addDoc/index.vue';
+  import typeList from './typeList.vue';
 
   export default {
     mixins: [dictMixins],
@@ -276,7 +252,10 @@
       fileMain,
       invoiceList,
       returnGoodsList,
-      accountstatementList,bpmDetail,inventoryTabledetail
+      accountstatementList,
+      bpmDetail,
+      inventoryTabledetail,
+      typeList
     },
     data() {
       return {
@@ -291,15 +270,9 @@
         visible: false,
         detailId: '',
         title: '详情',
-        row: {},
-        activeName: 'base',
         form: {
-          orderFiles: [{ name: '222' }]
+          orderFiles: []
         },
-        rules: {},
-        detailData: {},
-
-
       };
     },
     methods: {
@@ -309,8 +282,8 @@
         this.getDetailData(row.id);
         this.detailId = row.id;
       },
-      toSendTab(tabName){
-        this.activeComp = tabName
+      toSendTab(tabName) {
+        this.activeComp = tabName;
       },
       cancel() {
         this.$nextTick(() => {
@@ -322,19 +295,18 @@
           this.visible = false;
         });
       },
-      downloadFile(file) {
-        getFile({ objectName: file.storePath }, file.name);
-      },
+
       async getDetailData(id) {
         this.loading = true;
         const data = await getSaleOrderDetail(id);
         this.loading = false;
         if (data) {
           this.form = data;
-          this.detailData = data;
           this.$nextTick(() => {
             this.$refs.inventoryTabledetailRef &&
               this.$refs.inventoryTabledetailRef.putTableValue(data);
+            this.$refs.typeListRef &&
+              this.$refs.typeListRef.putTableValue(row.typedetailList);
           });
         }
       }

+ 0 - 12
src/views/saleManage/saleOrder/components/drawer.vue

@@ -207,18 +207,6 @@ export default {
         this.$refs.saleOrderInfoRef.init(this.row);
         this.$refs.saleOrderReminderListRef.init(this.row.reminderRecord)
 
-        // this.$refs.followListRef.init(row);
-        // this.$refs.businessAddTable &&
-        //   this.$refs.businessAddTable.putTableValue(
-        //     this.row.competAnalysisList
-        //   );
-        // this.$refs.personnelAddTable &&
-        //   this.$refs.personnelAddTable.putTableValue(
-        //     this.row.partyList,
-        //     this.row.contactId
-        //   );
-        // this.$refs.inventoryTable &&
-        //   this.$refs.inventoryTable.putTableValue(this.row);
       });
     },
 

+ 2 - 8
src/views/saleManage/saleOrder/components/paymentList.vue

@@ -38,9 +38,7 @@
           trigger: 'change'
         }">
         {{scope.row.price||0.00}}元
-            <!-- <el-input v-model="scope.row.price" placeholder="请输入" disabled>
-              <template slot="append">元</template>
-            </el-input> -->
+
         </el-form-item>
         </template>
         <template v-slot:deadLine="scope">
@@ -186,7 +184,6 @@
        
       
        
-       //this.$set( this.form.datasource[index], 'price',  price)
       },
       //检验比例
       checkRatio(){
@@ -238,10 +235,7 @@
           }
         }
       },
-      // 清空表格
-      restTable() {
-        this.form.datasource = [];
-      },
+
       // 重新排序
       setSort() {
         this.form.datasource.forEach((n, index) => {

+ 1 - 29
src/views/saleManage/saleOrder/components/project-search.vue

@@ -33,11 +33,7 @@
             />
           </el-form-item>
         </el-col>
-<!--        <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">-->
-<!--          <el-form-item label="组织机构:">-->
-<!--            <auth-selection data-type="Array" v-model="where.deptIds" style="width: 100%"></auth-selection>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
+
         <el-col style="display: flex;justify-content: flex-end" v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
           <el-form-item>
             <el-button
@@ -62,31 +58,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-<!--      <el-row :gutter="10">-->
-<!--        <el-col style="display: flex;justify-content: flex-end" v-bind="styleResponsive ? { md: 24 } : { span: 24 }">-->
-<!--          <el-form-item>-->
-<!--            <el-button-->
-<!--              size="small"-->
-<!--              type="primary"-->
-<!--              icon="el-icon-search"-->
-<!--              class="ele-btn-icon"-->
-<!--              @click="search"-->
-<!--            >-->
-<!--              查询-->
-<!--            </el-button>-->
 
-<!--            <el-button-->
-<!--              @click="reset"-->
-<!--              icon="el-icon-refresh"-->
-<!--              class="ele-btn-icon"-->
-<!--              size="medium"-->
-<!--            >重置-->
-<!--            </el-button-->
-<!--            >-->
-<!--            <slot></slot>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
     </el-form>
   </template>
 

+ 1 - 12
src/views/saleManage/saleOrder/components/searchTable.vue

@@ -48,18 +48,7 @@
       </el-col>
     </el-row>
     <el-row :gutter="15">
-      <!--<el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
-        <el-form-item label="订单状态:" prop="orderStatus">
-          <el-select v-model="params.orderStatus" placeholder="请选择" class="w100" clearable>
-            <el-option
-              v-for="item in orderStatusOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>-->
+
       <el-col v-bind="styleResponsive ? { lg:6, md: 12 } : { span:6 }">
         <el-form-item label="产品名称:" prop="productName">
           <el-input

+ 7 - 43
src/views/saleManage/saleOrder/invoice/components/addInvoiceDialog.vue

@@ -181,7 +181,7 @@
 </template>
 
 <script>
-  import { acceptUnpackoptions, treeClassifyCodeEnum } from '@/enum/dict';
+  import {  treeClassifyCodeEnum } from '@/enum/dict';
   import fileUpload from '@/components/upload/fileUpload';
   import dictMixins from '@/mixins/dictMixins';
   import parentList from '@/views/saleManage/contact/components/parentList.vue';
@@ -275,20 +275,14 @@
         delDetailIds: [],
         linkNameOptions: [],
         carList: [],
-        acceptUnpackoptions,
         visible: false,
         entrustedReceiveDialogFlag: false,
         processSubmitDialogFlag: false,
         title: '',
-        row: {},
         activeName: 'first',
         formDef,
         form: copyObj(formDef),
-        tableBankData: [],
-        tableLinkData: [],
-        // 组织机构树形结构数据
-        groupTreeData: [],
-        groupData: [],
+ 
         rules: {
           partaName: [
             { required: true, message: '请选择客户名称', trigger: 'change' }
@@ -538,12 +532,7 @@
         }
       },
 
-      handHead() {
-        let item = {
-          id: this.form.partbLinkId
-        };
-        this.$refs.headRef.open(item);
-      },
+
 
       //选择订单弹框
       handleOrderBtn(e) {
@@ -575,7 +564,6 @@
       //打开新增编辑弹框
       async open(type, row, orderId) {
         this.title = type === 'add' ? '新增发货单' : '修改';
-        this.row = row;
         this.visible = true;
         this.carList = await carBookPageListAPI({ pageNum: 1, size: 100 });
 
@@ -604,18 +592,7 @@
       totalCountChange(num) {
         this.form.trayNum = num;
       },
-      salesmanChange(val, info) {
-        this.otherForm.salesmanName = info.name;
-      },
-      settlementModeChange(info) {
-        this.form.settlementModeName = info.dictValue;
-      },
-      ifChiefChange(value, idx) {
-        if (value === 1) {
-          this.tableLinkData.forEach((e) => (e.ifChief = 0));
-          this.tableLinkData[idx].ifChief = 1;
-        }
-      },
+
 
       getValidate() {
         return Promise.all([
@@ -683,9 +660,7 @@
               item['isReplace'] = 1;
             }
           });
-          // console.log(productList,'productList')
-          // console.log(replaceList,'productList')
-          // return
+       
           let commitData = Object.assign({}, this.form, {
             productList,
             replaceList,
@@ -744,23 +719,12 @@
             variables: {
               businessCode: data.docNo
             }
-            // callBackMethodType : '1',
-            // callBackMethod : 'proTargetPlanApproveApiImpl.updatePlanApprovalStatus',
-            // pcHandle : '/bpm/handleTask/components/project-manage/plan-manage/submit.vue',
-            // pcView : '/bpm/handleTask/components/project-manage/plan-manage/detailDialog.vue',
-            // miniHandle : '',
-            // miniView : '',
+          
           };
 
           this.$refs.processSubmitDialogRef.init(params);
         });
-        // submit({
-        //   businessId: this.businessId || res
-        //   // productionSupervisorId
-        // }).then((res) => {
-        //   this.cancel();
-        //   this.$emit('done');
-        // });
+
       },
       reload() {
         this.cancel();

+ 1 - 9
src/views/saleManage/saleOrder/invoice/components/detailDialog.vue

@@ -237,11 +237,7 @@
         reviewStatusEnum,
         visible: false,
         outboundDetailsDialogFlag: false,
-        // qmsAll:[],
-        detailId: '',
         title: '详情',
-        row: {},
-        activeName: 'base',
         form: {
           orderFiles: []
         },
@@ -607,21 +603,17 @@
     methods: {
       async open(row) {
         this.activeComp = 'main';
-        this.form = row;
         this.visible = true;
         await this.getDetailData(row.id);
-        this.detailId = row.id;
         console.log(this.competAnalysisListcolumns);
       },
       handleTag(val) {
         this.activeComp = val;
         if (val == 'store') {
-          // getInfoBySourceBizNoAll(this.form.docNo).then((res) => {
-          //   this.qmsAll = res;
+
           this.$nextTick(() => {
             this.$refs.innerBoundDetailsRef._getInfo(this.form.docNo);
           });
-          // });
         }
       },
       cancel() {