Merge branch 'master' into feature/Feature-return

src/api/setting.js

@@ -483,3 +483,12 @@ export function editSubAccount(params) {
     params,
   });
 }
+
+// 新建经销商子账号
+export function getRoleChecked(params) {
+  return request({
+    url: "/admin/user/user/child/module/checked",
+    method: "get",
+    params,
+  });
+}

src/views/basic_data/material/components/modify_list-apply.vue

@@ -806,9 +806,9 @@
             @select-all="handleSelectionAllChange"
             @selection-change="handleSelectionChange"
           >
+<!--            :selectable="selectable"-->
             <el-table-column
               align="center"
-              :selectable="selectable"
               type="selection"
               width="55"
             />
@@ -1347,17 +1347,17 @@ export default {
      * @param {String} index - 索引值
      * @return Boolean
      */
-    selectable: function(row, index) {
-      // row.disabled == undefined 才能被选中
-      if (row.disabled == undefined || row.disabled == false) {
-        return true
-      } else {
-        return false
-      }
-      // 函数必须有返回值且是布尔值
-      // 页面刷新后该函数会执行 N 次进行判断(N 为表格行数)
-      // 如果没有返回值则默认返回false(全部无法选中)
-    },
+    // selectable: function(row, index) {
+    //   // row.disabled == undefined 才能被选中
+    //   if (row.disabled == undefined || row.disabled == false) {
+    //     return true
+    //   } else {
+    //     return false
+    //   }
+    //   // 函数必须有返回值且是布尔值
+    //   // 页面刷新后该函数会执行 N 次进行判断(N 为表格行数)
+    //   // 如果没有返回值则默认返回false(全部无法选中)
+    // },
     hanleSbumit() {
       this.filterWallets(this.items)
       const params = {
@@ -1507,28 +1507,28 @@ export default {
           result.data[i].rebateList = rebateList
           result.data[i].fang = false
         }
-        if (this.dataList.length) {
-          for (let j = 0; j < result.data.length; j++) {
-            for (let k = 0; k < this.dataList.length; k++) {
-              if (result.data[j].materialId === this.dataList[k].id) {
-                this.dataList[k].disabled = true
-              }
-            }
-          }
-        }
+        // if (this.dataList.length) {
+        //   for (let j = 0; j < result.data.length; j++) {
+        //     for (let k = 0; k < this.dataList.length; k++) {
+        //       if (result.data[j].materialId === this.dataList[k].id) {
+        //         this.dataList[k].disabled = true
+        //       }
+        //     }
+        //   }
+        // }
 
 
+        // this.items = [...this.items,...result.data]
+        // let newArr = [];
+        // let obj = {};
+        // for (var i = 0; i < this.items.length; i++) {
+        //   if (!obj[this.items[i].materialId]) {
+        //     newArr.push(this.items[i])
+        //     obj[this.items[i].materialId] = true
+        //   }
+        // }
+        // console.log(newArr,454 ,obj)
         this.items = [...this.items,...result.data]
-        let newArr = [];
-        let obj = {};
-        for (var i = 0; i < this.items.length; i++) {
-          if (!obj[this.items[i].key]) {
-            newArr.push(this.items[i])
-            obj[this.items[i].key] = true
-          }
-        }
-        console.log(newArr,454)
-        this.items = newArr
         // console.log(resArrs(result.data,this.dataList),'55555')
 
       } else {

src/views/basic_data/material/price_list.vue

@@ -114,7 +114,7 @@
     <!-- 按钮 -->
     <div class="btn-group clearfix">
       <div class="fr">
-        <el-button type="primary" size="small">导出</el-button>
+<!--        <el-button type="primary" size="small">导出</el-button>-->
         <!-- <el-button type="primary" size="small">打印</el-button> -->
       </div>
     </div>
@@ -129,7 +129,7 @@
           fit
           stripe
         >
-          <el-table-column type="selection" align="center" />
+<!--          <el-table-column type="selection" align="center" />-->
           <!-- <el-table-column
             align="center"
             label="产品品类"

src/views/engin_deposit/components/deposit-apply-surrender.vue

@@ -222,7 +222,7 @@
               <imageUpload :file-list="fileList" :multiple="true" :start-restricting="true" :restrict-filename="restrictFilename" />
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :lg="24">
+          <el-col :xs="24" :sm="12" :lg="24" v-if="details.dataList && details.dataList.length">
             <!-- 列表 -->
             <div class="mymain-container">
               <div class="table">
@@ -319,14 +319,14 @@
                         class="textColor"
                         @click="downLoadFn(scope.row.fileUrl,scope.row.fileName)"
                       >下载</el-button>
-                      <!--                <el-button-->
-                      <!--                  v-if="checkFileType(scope.row.fileUrl) == 'pdf'"-->
-                      <!--                  type="text"-->
-                      <!--                  class="textColor"-->
-                      <!--                  @click="openPdf(scope.row.fileUrl)"-->
-                      <!--                >-->
-                      <!--                  查看-->
-                      <!--                </el-button>-->
+                      <el-popconfirm
+                        style="margin-left: 10px"
+                        title="这是一段内容确定删除吗？"
+                        @onConfirm="delFile(scope.$index)"
+                      >
+                        <el-button type="text" slot="reference">删除</el-button>
+                      </el-popconfirm>
+
                     </template>
                   </el-table-column>
                 </el-table>
@@ -429,7 +429,17 @@ export default {
         this.$errorMsg('请选择安装时间')
         return
       }
-      this.fileList.forEach(el => {
+      this.fileList.forEach((el) => {
+         console.log(this.details.dataList.length)
+        if (this.details.dataList.length){
+          this.details.dataList.forEach((i,e)=>{
+            console.log(i.fileName==el.name)
+            if (el.name === i.fileName){
+              this.details.dataList.splice(e,1)
+            }
+          })
+        }
+
         this.details.dataList.push({
           dataDescribe: el.name,
           enginOrderNo: this.details.refProjectNo,
@@ -444,6 +454,10 @@ export default {
         this.$parent.getList()
       })
     },
+    delFile(index){
+      this.details.dataList.splice(index,1)
+      this.$successMsg('删除成功')
+    },
     handleReset() {
       this.$refs.form.resetFields()
     },
@@ -492,6 +506,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.aaa {
+  height: 64px;
+  width: 64px;
+}
+.gdzl {
+  display: inline-block;
+}
 ::v-deep .textareaStyle {
   .el-textarea__inner {
     resize: none;

src/views/engin_deposit/components/deposit_list-detail.vue

@@ -220,7 +220,7 @@
       <el-divider />
 
       <!-- 列表 -->
-      <div class="mymain-container">
+      <div class="mymain-container" >
         <div class="table">
           <el-table
             v-loading="listLoading"

src/views/engin_deposit/components/refund_list-detail.vue

@@ -30,7 +30,7 @@
         <el-col :xs="12" :sm="24" :lg="8" class="item">
           <div class="label">行业类别</div>
           <div class="value">
-            {{ detailList.refPromiseStatus }}
+            {{ detailList.refTradeCategory }}
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">

src/views/engin_deposit/deposit_list.vue

@@ -136,7 +136,7 @@
             <el-table-column
               align="center"
               label="经销商编码"
-              prop="customerId"
+              prop="customerNumber"
               min-width="160"
               show-overflow-tooltip
             />

src/views/setting/sub_account.vue

@@ -8,9 +8,9 @@
         <div class="fl">
           <el-button v-if="checkBtnRole('add')" size="small" type="primary" icon="el-icon-plus" @click="addOrEdit('add')">新增账号</el-button>
         </div>
-        <div class="fr">
-          <ImportButton :im-url="'stock/importToll'" @importSuccess="getList" />
-        </div>
+        <!--        <div class="fr">-->
+        <!--          <ImportButton :im-url="'stock/importToll'" @importSuccess="getList" />-->
+        <!--        </div>-->
       </div>
 
       <div class="table">
@@ -19,9 +19,16 @@
           <el-table-column align="center" label="账号" prop="userName" />
           <el-table-column align="center" label="创建时间" prop="createTime" />
           <el-table-column align="center" label="最后登录时间" prop="lastLoginTime" />
+          <el-table-column align="center" label="主帐号" prop="isMaster">
+            <template slot-scope="scope">
+
+              <el-tag v-if="scope.row.isMaster" type="success">是</el-tag>
+              <el-tag v-else type="danger">否</el-tag>
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="操作" width="180">
             <template slot-scope="scope">
-              <el-button type="text" @click="addOrEdit('edit',scope.row)">编辑</el-button>
+              <el-button type="text" @click="addOrEdit('edit',scope.row)">修改</el-button>
               <el-button v-if="checkBtnRole('detail')" type="text" @click="setMenuRole(scope.row.adminUserId,'role')">设置权限</el-button>
 
             </template>
@@ -74,11 +81,11 @@
       :visible.sync="dialogVisible"
       :close-on-click-modal="false"
       width="45%"
-      :title="'add'===addFormType?'新增':'编辑'"
+      :title="'add'===addFormType?'新增':'修改'"
       @close="cancelAddForm"
     >
       <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
-        <el-form-item label="账号" prop="account">
+        <el-form-item v-if="addFormType!=='edit'" label="账号" prop="account">
           <el-input v-model="ruleForm.account" type="text" autocomplete="off" />
         </el-form-item>
         <el-form-item label="密码" prop="password">
@@ -87,7 +94,7 @@
       </el-form>
 
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" style="float: left;" @click="setMenuRole">设置权限</el-button>
+        <!--        <el-button type="primary" style="float: left;" @click="setMenuRole">设置权限</el-button>-->
         <el-button @click="cancelAddForm">取 消</el-button>
         <el-button type="primary" @click="submitAddForm">确 定</el-button>
       </span>
@@ -104,7 +111,8 @@ import {
   editSubAccount,
   getAccountList,
   getMenuList,
-  getMenuRoleIds
+  getRoleChecked,
+  setMenuRole
 } from '@/api/setting'
 
 export default {
@@ -173,13 +181,11 @@ export default {
 
     getList() {
       this.listLoading = true
-
       const params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
         customerId: this.customerId
       }
-
       getAccountList(params).then(res => {
         this.dataList = res.data.records
         this.listTotal = res.data.total
@@ -216,7 +222,8 @@ export default {
         this.$nextTick(() => {
           this.ruleForm = {
             account: row.userName,
-            password: row.password
+            password: '',
+            adminUserId: row.adminUserId
           }
         })
       }
@@ -237,11 +244,12 @@ export default {
         const params = {
           userName: this.ruleForm.account,
           password: this.ruleForm.password,
-          adminModuleIds: this.$refs.tree ? this.$refs.tree.getCheckedKeys().join(',') : ''
+          adminModuleIds: ''
+          // adminModuleIds:this.$refs.tree ? this.$refs.tree.getCheckedKeys().join(',') :
         }
         if (valid) {
           if (this.addFormType === 'edit') {
-            params.adminRoleId = this.editId
+            params.adminUserId = this.ruleForm.adminUserId
             editSubAccount(params).then(res => {
               this.cancelAddForm()
               this.getList()
@@ -265,27 +273,22 @@ export default {
       getMenuList({ adminUserId: this.userid }).then(res => {
         this.menuRoleList = res.data
       })
-      if (type === 'role') {
-
-        getMenuRoleIds({ adminRoleId: id }).then(res => {
-          console.log(78888,res.data)
-          this.$refs.tree.setCheckedKeys(res.data)
-        })
-      }
+      getRoleChecked({ adminUserId: id }).then(res => {
+        this.$refs.tree.setCheckedKeys(res.data)
+      })
     },
 
     // 设置权限 - 提交数据
     submitRoleForm(type) {
-      // if (type === 'role') {
-      //   const params = {
-      //     adminModuleIds: this.$refs.tree.getCheckedKeys().join(','),
-      //     adminRoleId: this.editId
-      //   }
-      //   setMenuRole(params).then(res => {
-      //     this.getList()
-      //     this.$successMsg()
-      //   })
-      // }
+      const params = {
+        adminModuleIds: this.$refs.tree.getCheckedKeys().join(','),
+        adminRoleId: this.editId
+      }
+      setMenuRole(params).then(res => {
+        this.getList()
+        this.$successMsg()
+      })
+
       this.roleFormVisible = false
     },
 

src/views/supply/engin/components/commerce_detail.vue

@@ -42,7 +42,7 @@
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">行业类别</div>
-              <div class="value">{{detailData.refPromiseStatus}}</div>
+              <div class="value">{{detailData.refTradeCategory}}</div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">跨区厂编号</div>
@@ -58,15 +58,19 @@
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">联系人</div>
-              <div class="value">{{detailData.aaa}}</div>
+              <div class="value">{{detailData.refLinkman}}</div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">固定电话</div>
-              <div class="value">{{detailData.aaa}}</div>
+              <div class="value">{{detailData.refTel}}</div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">移动电话</div>
-              <div class="value">{{detailData.aaa}}</div>
+              <div class="value">{{detailData.refPhone}}</div>
+            </el-col>
+            <el-col :span="24" class="item">
+              <div class="label">安装地址</div>
+              <div class="value">{{detailData.refInstallAddress}}</div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">不扣押金</div>

src/views/supply/engin/components/commerce_examine.vue

@@ -38,7 +38,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">行业类别</div>
-          <div class="value">{{detailData.refPromiseStatus}}</div>
+          <div class="value">{{detailData.refTradeCategory}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">跨区厂编号</div>
@@ -54,15 +54,19 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">联系人</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refLinkman}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">固定电话</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refTel}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">移动电话</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refPhone}}</div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">安装地址</div>
+          <div class="value">{{detailData.refInstallAddress}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">不扣押金</div>

src/views/supply/engin/components/commerce_form.vue

@@ -398,7 +398,6 @@ export default {
         createDate: '',
         fileNum: '',
         salesMan: '',
-        tradeCategory: ''
       },
       mainFormRules: {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
@@ -568,7 +567,7 @@ export default {
         this.mainForm.jxsName = data.customerName;
         this.mainForm.enginNum = data.refEnginRecordNo;
         this.mainForm.enginName = data.refProjectName;
-        this.mainForm.loginType = data.refPromiseStatus;
+        this.mainForm.loginType = data.refTradeCategory;
         this.mainForm.factoryNum = data.refFactoryNo;
         this.mainForm.company = data.refUseUnit;
         this.mainForm.saleType = data.saleTypeId;
@@ -653,14 +652,13 @@ export default {
         // this.mainForm.type = data.mainId;
         this.mainForm.enginNum = data.enginInfoNo;
         this.mainForm.enginName = data.projectName;
-        this.mainForm.loginType = data.enginSignType;
+        this.mainForm.loginType = data.tradeCategory;
         this.mainForm.company = data.useUnit;
         this.mainForm.contactMan = data.linkman;
         this.mainForm.tel = data.tel;
         this.mainForm.phone = data.phone;
         this.mainForm.address = data.installAddress;
         this.mainForm.salesMan = data.serviceId;
-        this.mainForm.tradeCategory = data.tradeCategory;
 
         this.goodsList = data.items.map(item => {
           return {
@@ -799,9 +797,8 @@ export default {
             // mainId: this.mainForm.type || '',
             refEnginRecordNo: this.mainForm.enginNum || '',
             refProjectName: this.mainForm.enginName || '',
-            refPromiseStatus: this.mainForm.loginType || '',
+            refTradeCategory: this.mainForm.loginType || '',
             refFactoryNo: this.mainForm.factoryNum || '',
-            refTradeCategory: this.mainForm.tradeCategory || '',
             refUseUnit: this.mainForm.company || '',
             refLinkman: this.mainForm.contactMan || '',
             refTel: this.mainForm.tel || '',

src/views/supply/engin/components/commerce_return.vue

@@ -38,7 +38,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">行业类别</div>
-          <div class="value">{{detailData.refPromiseStatus}}</div>
+          <div class="value">{{detailData.refTradeCategory}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">跨区厂编号</div>
@@ -54,15 +54,15 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">联系人</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refLinkman}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">固定电话</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refTel}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">移动电话</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refPhone}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">不扣押金</div>

src/views/supply/engin/components/home_detail.vue

@@ -42,7 +42,7 @@
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">行业类别</div>
-              <div class="value">{{detailData.refPromiseStatus}}</div>
+              <div class="value">{{detailData.refTradeCategory}}</div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">跨区厂编号</div>
@@ -58,15 +58,19 @@
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">联系人</div>
-              <div class="value">{{detailData.aaa}}</div>
+              <div class="value">{{detailData.refLinkman}}</div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">固定电话</div>
-              <div class="value">{{detailData.aaa}}</div>
+              <div class="value">{{detailData.refTel}}</div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">移动电话</div>
-              <div class="value">{{detailData.aaa}}</div>
+              <div class="value">{{detailData.refPhone}}</div>
+            </el-col>
+            <el-col :span="24" class="item">
+              <div class="label">安装地址</div>
+              <div class="value">{{detailData.refInstallAddress}}</div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">不扣押金</div>

src/views/supply/engin/components/home_examine.vue

@@ -38,7 +38,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">行业类别</div>
-          <div class="value">{{detailData.refPromiseStatus}}</div>
+          <div class="value">{{detailData.refTradeCategory}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">跨区厂编号</div>
@@ -58,15 +58,19 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">联系人</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refLinkman}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">固定电话</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refTel}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">移动电话</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refPhone}}</div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">安装地址</div>
+          <div class="value">{{detailData.refInstallAddress}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">不扣押金</div>

src/views/supply/engin/components/home_form.vue

@@ -488,6 +488,7 @@ export default {
         loginNum: '',
         enginName: '',
         loginType: '',
+        promiseStatus: '',
         factoryNum: '',
         company: '',
         saleType: '',
@@ -506,7 +507,6 @@ export default {
         salesMan: '',
         projectRemark: '',
         projectType: '',
-        tradeCategory: ''
       },
       mainFormRules: {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
@@ -758,7 +758,8 @@ export default {
         // this.mainForm.saleType = '';
         this.mainForm.loginNum = data.recordNo;
         this.mainForm.enginName = data.projectName;
-        this.mainForm.loginType = data.promiseStatus;
+        this.mainForm.loginType = data.tradeCategory;
+        this.mainForm.promiseStatus = data.promiseStatus;
         this.mainForm.company = data.useUnit;
         this.mainForm.contactMan = data.buyUnitCallMen;
         this.mainForm.tel = data.buyUnitTel;
@@ -767,7 +768,6 @@ export default {
         this.mainForm.declareNo = data.declareNo;
         this.mainForm.projectRemark = data.buChonShuoMing;
         this.mainForm.projectType = data.govBuyType;
-        this.mainForm.tradeCategory = data.tradeCategory;
 
         let saleTypeItem = this.salesTypeList.find(o => o.id == this.mainForm.saleType);
 
@@ -863,7 +863,8 @@ export default {
         this.mainForm.jxsName = data.customerName;
         this.mainForm.loginNum = data.refEnginRecordNo;
         this.mainForm.enginName = data.refProjectName;
-        this.mainForm.loginType = data.refPromiseStatus;
+        this.mainForm.loginType = data.refTradeCategory;
+        this.mainForm.promiseStatus = data.refPromiseStatus;
         this.mainForm.factoryNum = data.refFactoryNo;
         this.mainForm.company = data.refUseUnit;
         this.mainForm.saleType = data.saleTypeId;
@@ -1109,7 +1110,8 @@ export default {
             loginUserId: this.mainForm.loginUserId,
             refEnginRecordNo: this.mainForm.loginNum || '',
             refProjectName: this.mainForm.enginName || '',
-            refPromiseStatus: this.mainForm.loginType || '',
+            refTradeCategory: this.mainForm.loginType || '',
+            refPromiseStatus: this.mainForm.promiseStatus || '',
             refFactoryNo: this.mainForm.factoryNum || '',
             refUseUnit: this.mainForm.company || '',
             refLinkman: this.mainForm.contactMan || '',
@@ -1128,7 +1130,6 @@ export default {
             serviceName: saleManItem.nickName,
             refProjectNote: this.mainForm.projectRemark,
             refProjectType: this.mainForm.projectType,
-            refTradeCategory: this.mainForm.tradeCategory,
             items: goodsList,
           }
 

src/views/supply/engin/components/home_return.vue

@@ -38,7 +38,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">行业类别</div>
-          <div class="value">{{detailData.refPromiseStatus}}</div>
+          <div class="value">{{detailData.refTradeCategory}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">跨区厂编号</div>
@@ -54,15 +54,15 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">联系人</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refLinkman}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">固定电话</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refTel}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">移动电话</div>
-          <div class="value">{{detailData.aaa}}</div>
+          <div class="value">{{detailData.refPhone}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">不扣押金</div>

src/views/supply/engin/home_list.vue

@@ -120,7 +120,6 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="工程编码" prop="refProjectNo" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="工程登录单号" prop="refEnginRecordNo" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="订单类型" prop="enginOrderType" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">

src/views/supply/pickup/check.vue

@@ -85,7 +85,11 @@
                 {{ scope.row.pickStatus == '1' ? '上午':'下午' }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="销售订单号" prop="mainOrderId" min-width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="销售订单号" prop="mainOrderId" min-width="200" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.orderType == 'HOME' ? scope.row.mainOrderId : scope.row.enginOrderNo }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="发货申请单号" prop="invoiceId" min-width="180" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="120" show-overflow-tooltip></el-table-column>
             <!-- <el-table-column align="center" label="产品大类" prop="mainName" min-width="120" show-overflow-tooltip></el-table-column> -->

src/views/supply/policy/components/retail_form.vue

@@ -68,7 +68,7 @@
             <el-select
               v-model="mainForm.k3ServiceName"
               placeholder="选择业务员"
-              disabled
+
               style="width: 100%"
               @change="handleUser"
             >
@@ -264,32 +264,32 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          label="业务员"
-          prop="retiredQty"
-          min-width="160"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <el-select
-              v-model="scope.row.serviceName"
-              size="small"
-              disabled
-              placeholder="选择业务员"
-
-              style="width: 100%"
-              @change="handleUser2($event,scope.row)"
-            >
-              <el-option
-                v-for="item in scope.row.userList"
-                :key="item.adminUserId"
-                :label="item.nickName"
-                :value="item.adminUserId"
-              />
-            </el-select>
-          </template>
-        </el-table-column>
+<!--        <el-table-column-->
+<!--          align="center"-->
+<!--          label="业务员"-->
+<!--          prop="retiredQty"-->
+<!--          min-width="160"-->
+<!--          show-overflow-tooltip-->
+<!--        >-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-select-->
+<!--              v-model="scope.row.serviceName"-->
+<!--              size="small"-->
+<!--              disabled-->
+<!--              placeholder="选择业务员"-->
+
+<!--              style="width: 100%"-->
+<!--              @change="handleUser2($event,scope.row)"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="item in scope.row.userList"-->
+<!--                :key="item.adminUserId"-->
+<!--                :label="item.nickName"-->
+<!--                :value="item.adminUserId"-->
+<!--              />-->
+<!--            </el-select>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column
           align="center"
           label="实付金额"
@@ -385,7 +385,7 @@
         </el-table-column>
       </el-table>
     </div>
-    
+
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="clickSubmitForm">保 存</el-button>
@@ -1399,9 +1399,10 @@ export default {
           this.mainForm.remark = data.remark
           this.mainForm.policyId = data.policyId
           this.policyId = data.policyId
-
-          this.mainForm.k3ServiceName = data.retailOrderItemList[0].wallets[0].serviceName
-          this.mainForm.k3ServiceId = data.retailOrderItemList[0].wallets[0].serviceId
+          this.mainForm.k3ServiceName = data.k3ServiceName
+          this.mainForm.k3ServiceId = data.k3ServiceId
+          // this.mainForm.k3ServiceName = data.retailOrderItemList[0].wallets[0].serviceName
+          // this.mainForm.k3ServiceId = data.retailOrderItemList[0].wallets[0].serviceId
           data.retailOrderItemList.forEach((item) => {
             item.status1 = ''
             item.status2 = ''