【修改】bug

src/api/basic_data/material.js

@@ -360,3 +360,14 @@ export function handleEdit(params){
     data:params
   })
 }
+
+
+
+
+export function examineData(params){
+  return request({
+    url:'/product-upd-price/confirm',
+    method: 'POST',
+    params
+  })
+}

src/views/basic_data/material/modify_list.vue

@@ -125,6 +125,7 @@
             icon="el-icon-info"
             icon-color="red"
             title="内容确定删除吗？"
+            style="margin-right:10px"
             @onConfirm="hanleDeleteAll"
           >
             <el-button
@@ -136,6 +137,7 @@
               >删除</el-button
             >
           </el-popconfirm>
+          <el-button size="mini"  type="warning" icon="el-icon-finished" @click="batchExamine"  v-if="$checkBtnRole('examine', $route.meta.roles)">批量审批</el-button>
         </div>
         <div class="fr">
             <ExportButton :exUrl="'/product-upd-price/export'" :exParams="exParams" />
@@ -479,6 +481,7 @@
     <ModifyListApply v-else-if="show === 2 || show==5" :cid='cid'/>
     <ModifyListApproval v-else-if="show === 3 " :detail="detail" />
     <ModifyListDetail v-else :detail="detail" />
+       <ExamineDialog :isShow.sync="isShowExamineDialog" :examineForm.sync="examineForm" />
   </div>
 </template>
 
@@ -486,13 +489,15 @@
 import ModifyListApply from './components/modify_list-apply.vue'
 import ModifyListApproval from './components/modify_list-approval.vue'
 import ModifyListDetail from './components/modify_list-detail.vue'
+import ExamineDialog from '@/components/Common/examine-dialog'
 import Mixin from '@/mixin/index'
 import {
   getPriceSubmit,
   getProductRricedel,
   getProductRriceDetail,
   getProductRriceList,
-  getTypeList
+  getTypeList,
+  examineData
 } from '@/api/basic_data/material'
 import { downloadFiles } from '@/utils/util'
 import { getCategoryList } from '@/api/common'
@@ -560,10 +565,16 @@ export default {
       },
       cid:'',
       typeList: [],
-      dictList:[]
+      dictList:[],
+       isShowExamineDialog: false,
+      examineForm: {
+        status: 'OK',
+        remark: '',
+      },
     };
   },
   components: {
+    ExamineDialog,
     ModifyListApply,
     ModifyListApproval,
     ModifyListDetail,
@@ -614,9 +625,34 @@ export default {
         });
       });
     },
+      // 打开 批量审批
+    batchExamine() {
+      if (this.ids.length) {
+        this.isShowExamineDialog = true;
+        return
+      }
+      this.$errorMsg('请选择审核项')
+    },
+    // 提交 批量审批
+    submitExamineForm() {
+      // let ids = this.dis.map(item => {
+      //   return item
+      // });
+    const  ids = [...new Set(this.ids)]
+      examineData({
+        ids: ids.join(','),
+        examineStatus: this.examineForm.status,
+        examineRemark: this.examineForm.remark,
+      })
+        .then((res) => {
+          this.isShowExamineDialog = false;
+          this.$successMsg("修改成功");
+          this.getList();
+        })
+    },
     handleGetPriceSubmit(id) {
       console.log(id);
-      getPriceSubmit({ id }).then((res) => {
+      getPriceSubmit({ ids:id }).then((res) => {
         this.$successMsg("已提审");
         this.getList();
       });

src/views/supply/apply/components/engin_return_form.vue

@@ -50,18 +50,18 @@
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="项目类别" prop="enginName">
-            <el-input v-model="mainForm.enginName" placeholder="请输入项目类别"></el-input>
+          <el-form-item label="项目类别" prop="refProjectCategory">
+            <el-input v-model="mainForm.refProjectCategory" placeholder="请输入项目类别" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="工程登录类型" prop="loginType">
-            <el-input v-model="mainForm.loginType" placeholder="请输入工程登录类型"></el-input>
+            <el-input v-model="mainForm.loginType" placeholder="请输入工程登录类型" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="跨厂区编号" prop="factoryNum">
-            <el-input v-model="mainForm.factoryNum" placeholder="请输入跨厂区编号"></el-input>
+            <el-input v-model="mainForm.factoryNum" placeholder="请输入跨厂区编号" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
@@ -211,8 +211,8 @@
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="6">
-            <el-form-item prop="enginName" label="项目类别">
-              <el-input v-model="screenForm.enginName" placeholder="请输入项目类别"></el-input>
+            <el-form-item prop="refProjectCategory" label="项目类别">
+              <el-input v-model="screenForm.refProjectCategory" placeholder="请输入项目类别"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="6">
@@ -267,7 +267,7 @@
           <el-table-column align="left" label="发货申请单号" prop="orderNo" min-width="120" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="订单号" prop="mainOrderId" min-width="160" show-overflow-tooltip>
              <template slot-scope="scope">
-           {{scope.row.orderType === 'TRADE' || scope.row.orderType === 'HMOE' ? scope.row.enginOrderNo : scope.row.mainOrderId}}
+           {{scope.row.orderType === 'TRADE' || scope.row.orderType === 'HOME' ? scope.row.enginOrderNo : scope.row.mainOrderId}}
            </template>
           </el-table-column>
           <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
@@ -359,7 +359,7 @@ export default {
         jxsNum: '',
         jxsName: '',
         loginNum: '',
-        enginName: '',
+        refProjectCategory: '',
         loginType: '',
         factoryNum: '',
         company: '',
@@ -384,7 +384,7 @@ export default {
       isShowDialog: false,
       screenForm: {
         loginNum: '',
-        enginName: '',
+        refProjectCategory: '',
         model: '',
         orderNum: '',
         orderNo: '',
@@ -488,7 +488,7 @@ export default {
         this.mainForm.jxsNum = data.customerNumber;
         this.mainForm.jxsName = data.customerName;
         this.mainForm.loginNum = data.enginOrderNo;
-        this.mainForm.enginName = data.refProjectName;
+        this.mainForm.refProjectCategory = data.refProjectName;
         this.mainForm.loginType = data.enginOrderType;
         this.mainForm.factoryNum = data.refFactoryNo;
         this.mainForm.company = data.refUseUnit;
@@ -570,7 +570,7 @@ export default {
         pageNum: this.currentPage,
         pageSize: 10,
         refEnginRecordNo: this.screenForm.loginNum,
-        refProjectName: this.screenForm.enginName,
+        refProjectName: this.screenForm.refProjectCategory,
         specification: this.screenForm.model,
         correspondId: this.screenForm.warehouse,
         categoryName: this.screenForm.type,
@@ -725,7 +725,7 @@ export default {
       getEnginGoodsDetail({enginOrderNo}).then(res => {
         let data = res.data;
         this.mainForm.loginNum = data.refEnginRecordNo;
-        this.mainForm.enginName = data.refProjectName;
+        this.mainForm.refProjectCategory = data.refProjectName;
         this.mainForm.loginType = data.refPromiseStatus;
         this.mainForm.factoryNum = data.refFactoryNo;
         this.mainForm.company = data.refUseUnit;
@@ -787,7 +787,7 @@ export default {
             customerName: this.mainForm.jxsName,
             remark: this.mainForm.remark,
             enginOrderNo: this.mainForm.loginNum,
-            refProjectName: this.mainForm.enginName,
+            refProjectName: this.mainForm.refProjectCategory,
             enginOrderType: this.mainForm.loginType,
             refFactoryNo: this.mainForm.factoryNum,
             refUseUnit: this.mainForm.company,
@@ -800,7 +800,7 @@ export default {
             fileUrl: this.fileList && this.fileList.length > 0 ? this.fileList[0].url : '',
             fileName: this.fileList && this.fileList.length > 0 ? this.fileList[0].name : '',
             correspondId: this.mainForm.warehouse,
-            correspondName: warehouseItem.name,
+            correspondName: warehouseItem.name?warehouseItem.name:'',
             salesOrderId: this.goodsList[0].id,
             orders: goodsList,
             examineStatus: status,

src/views/supply/apply/engin_list.vue

@@ -56,18 +56,7 @@
                 <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="业务员" prop="salesMan">
-                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" clearable filterable style="width: 100%">
-                  <el-option
-                    v-for="item in salesmanList"
-                    :key="item.adminUserId"
-                    :label="item.nickName"
-                    :value="item.adminUserId">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="订单类型" prop="orderType">
                 <el-select v-model="screenForm.orderType" placeholder="请选择" clearable>
@@ -95,7 +84,30 @@
                 <el-input v-model="screenForm.refUseUnit" placeholder="请输入使用单位"></el-input>
               </el-form-item>
             </el-col>
-
+     <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="表头业务员" prop="k3ServiceId">
+                <el-select v-model="screenForm.k3ServiceId" placeholder="选择表头业务员" clearable filterable style="width: 100%">
+                  <el-option
+                    v-for="item in salesmanList"
+                    :key="item.adminUserId"
+                    :label="item.nickName"
+                    :value="item.adminUserId">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+                 <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="表体业务员" prop="salesMan">
+                <el-select v-model="screenForm.salesMan" placeholder="选择表体业务员" clearable filterable style="width: 100%">
+                  <el-option
+                    v-for="item in salesmanList"
+                    :key="item.adminUserId"
+                    :label="item.nickName"
+                    :value="item.adminUserId">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -365,6 +377,7 @@ export default {
         mainOrderId: '',
         refEnginRecordNo: '',
         refUseUnit: '',
+        k3ServiceId:''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -409,6 +422,7 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         examineStatus: this.screenForm.status,
         serviceId: this.screenForm.salesMan,
+        k3ServiceId:this.screenForm.k3ServiceId,
         type: this.screenForm.orderType,
         mainOrderId: this.screenForm.mainOrderId,
         refEnginRecordNo: this.screenForm.refEnginRecordNo,
@@ -463,6 +477,7 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         examineStatus: this.screenForm.status,
         serviceId: this.screenForm.salesMan,
+        k3ServiceId: this.screenForm.k3ServiceId,
         type: this.screenForm.orderType,
         mainOrderId: this.screenForm.mainOrderId,
         refEnginRecordNo: this.screenForm.refEnginRecordNo,

src/views/supply/deliver/deliver_list.vue

@@ -67,7 +67,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            
+
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -85,16 +85,18 @@
           </div>
         </div>
         <div class="table">
-          <el-table 
-            v-loading="listLoading" 
-            :data="dataList" 
-            element-loading-text="Loading" 
-            border 
-            fit 
-            highlight-current-row 
+          <el-table
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
             stripe
             show-summary
             :summary-method="$getSummaries">
+                        <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="160" show-overflow-tooltip></el-table-column>
+
             <el-table-column align="left" label="发货单号" prop="id" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.id" />
@@ -195,12 +197,12 @@
     <!-- 密码记录 -->
     <el-dialog title="密码记录" :visible.sync="isShowDialog" :show-close="false" width="50%" :close-on-click-modal="false">
       <div class="table" style="margin: 10px 0 20px;">
-        <el-table 
-          v-loading="dialogTable_listLoading" 
-          :data="dialogTable_dataList" 
-          element-loading-text="Loading" 
-          tooltip-effect="dark" 
-          style="width: 100%" 
+        <el-table
+          v-loading="dialogTable_listLoading"
+          :data="dialogTable_dataList"
+          element-loading-text="Loading"
+          tooltip-effect="dark"
+          style="width: 100%"
           max-height="270">
           <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
           <el-table-column align="center" prop="printPassword" label="密码"></el-table-column>
@@ -224,7 +226,7 @@
         <el-button @click="isShowDialog = false">关 闭</el-button>
       </div>
     </el-dialog>
-    
+
     <DeliverDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
 
   </div>

src/views/supply/deliver/sum_list.vue

@@ -80,8 +80,8 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="业务员" prop="salesMan">
-                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" clearable filterable style="width: 100%">
+              <el-form-item label="表体业务员" prop="k3ServiceId">
+                <el-select v-model="screenForm.k3ServiceId" placeholder="选择表体业务员" clearable filterable style="width: 100%">
                   <el-option
                     v-for="item in salesmanList"
                     :key="item.adminUserId"
@@ -91,8 +91,19 @@
                 </el-select>
               </el-form-item>
             </el-col>
-
-            <el-col :xs="24" :sm="24" :lg="24" class="tr">
+        <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="表体业务员" prop="salesMan">
+                <el-select v-model="screenForm.salesMan" placeholder="选择表体业务员" clearable filterable style="width: 100%">
+                  <el-option
+                    v-for="item in salesmanList"
+                    :key="item.adminUserId"
+                    :label="item.nickName"
+                    :value="item.adminUserId">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="18" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -221,7 +232,9 @@
               </template>
             </el-table-column>
             <el-table-column align="right" label="发货数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
+                       <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>
+
+           <el-table-column align="left" label="表体业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="政策单号" prop="policyCode" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="政策名称" prop="policyTitle" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="区域" prop="adminArea" min-width="100" show-overflow-tooltip></el-table-column>
@@ -285,6 +298,7 @@ export default {
         orderNum: '',
         type: '',
         salesMan: '',
+        k3ServiceId:'',
         mainOrderId:''
       },
       categoryList: [],
@@ -312,6 +326,7 @@ export default {
         id: this.screenForm.orderNum,
         categoryName: this.screenForm.type,
         serviceId: this.screenForm.salesMan,
+        k3ServiceId:this.screenForm.k3ServiceId
       }
     },
     comRefundableQty(){
@@ -380,6 +395,7 @@ export default {
         id: this.screenForm.orderNum,
         categoryName: this.screenForm.type,
         serviceId: this.screenForm.salesMan,
+        k3ServiceId:this.screenForm.k3ServiceId,
         mainOrderId:this.screenForm.mainOrderId
       };
       getSumList(params).then((res) => {

src/views/supply/implement/nsales_list.vue

@@ -129,8 +129,8 @@
             </el-table-column>
             <el-table-column align="left" label="订单号" prop="orderNo" min-width="140" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.orderType === 'TRADE' || scope.row.orderType === 'HMOE' ? scope.row.enginOrderNo : scope.row.mainOrderId" />
-                <span>{{scope.row.orderType === 'TRADE' || scope.row.orderType === 'HMOE' ? scope.row.enginOrderNo : scope.row.mainOrderId}}</span>
+                <CopyButton :copyText="scope.row.orderType === 'TRADE' || scope.row.orderType === 'HOME' ? scope.row.enginOrderNo : scope.row.mainOrderId" />
+                <span>{{scope.row.orderType === 'TRADE' || scope.row.orderType === 'HOME' ? scope.row.enginOrderNo : scope.row.mainOrderId}}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>

src/views/supply/sales/sales_list.vue

@@ -221,7 +221,7 @@
             <!--            <el-table-column align="left" label="订单号" prop="orderNo" min-width="140" show-overflow-tooltip>-->
             <!--              <template slot-scope="scope">-->
             <!--                <CopyButton :copyText="scope.row.orderType === 'TRADE' ? scope.row.enginOrderNo : scope.row.mainOrderId" />-->
-            <!--                <span>{{scope.row.orderType === 'TRADE' || scope.row.orderType === 'HMOE' ? scope.row.enginOrderNo : scope.row.mainOrderId}}</span>-->
+            <!--                <span>{{scope.row.orderType === 'TRADE' || scope.row.orderType === 'HOME' ? scope.row.enginOrderNo : scope.row.mainOrderId}}</span>-->
             <!--              </template>-->
             <!--            </el-table-column>-->
             <el-table-column