md

src/api/oms/emisMonthpayAccount.js

@@ -69,3 +69,12 @@ export function bindMonthPayCode(query) {
   })
 }
 
+
+export function unbindMonthPayCode(query) {
+  return request({
+    url: '/oms2c/emisWaybill/unbindMonthPayCode',
+    method: 'get',
+    params: query
+  })
+}
+

src/views/oms/baseOperator/BindMonthPay.vue

@@ -69,11 +69,11 @@
         <el-form ref="form" :model="form" size="small" :rules="rules" label-width="100px" >
           <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
             <el-col :span="16">
-              <el-form-item  label="月结卡号" prop="monthPayCode">
+              <el-form-item  label="月结账号" prop="monthPayCode">
                 <el-input
                     auto-complete="new-password"
                   v-model="form.monthPayCode"
-                  :placeholder="$t('月结卡号')"
+                  :placeholder="$t('月结账号')"
                   clearable
                 />
               </el-form-item>
@@ -85,10 +85,10 @@
                   size="mini"
                    icon="el-icon-search"
                   @click="handelApplyBind"
-                >查询卡号</el-button>
+                >查询</el-button>
             </el-col>
             <el-col :span="24">
-              <div style="padding: 20px;color: red;font-weight: 600;background: #f8f8f8;border-radius: 10px;margin-bottom:20px">
+              <div style="padding: 20px;color: blue;font-weight: 600;background: #f8f8f8;border-radius: 10px;margin-bottom:20px">
                 {{ verifyMessage }}
               </div>
             </el-col>
@@ -115,8 +115,7 @@
 </template>
 
 <script>
-  import { listSimpleEmisMonthpayAccount,verifyBindMonthPayCode,bindMonthPayCode } from "@/api/oms/emisMonthpayAccount";
+  import { listSimpleEmisMonthpayAccount,verifyBindMonthPayCode,bindMonthPayCode,unbindMonthPayCode } from "@/api/oms/emisMonthpayAccount";
-  //import { getSalemanList,listBindSalesmen,queryNewSalesmen,bindSalesmen,deleteBindSalemen,setDefaultBindSalesmen } from "@/api/oms/emisStaff";
 export default {
   name: "BindMonthPay",
   components: {
@@ -250,7 +249,7 @@ export default {
       let that=this;
 
       bindMonthPayCode({monthPayCode:this.form.monthPayCode}).then(response => {
-        that.verifyMessage = response.msg+" | 月结公司:" + response.data;
+        that.verifyMessage="你已申请绑定【" + response.data+"】的月结账号,请输入验证密码。"
         that.blInputVerifyCode=true;
       });
     },
@@ -263,13 +262,15 @@ export default {
     },
     handleNewBind() {
         this.reset();
+        this.verifyMessage=null;
         this.blInputVerifyCode=false;
         this.openForm=true;
     },
     handleUnbind(row) {
       if(this.selectList&&this.selectList.length>0){
           this.selectList.forEach(item=>{
-            deleteBindSalemen({empCode:item.empCode}).then(response => {
+            unbindMonthPayCode({monthPayCode:item.custNo}).then(response => {
+              this.$modal.msgSuccess("解绑成功");
               this.handleQuery();
             });
           });
@@ -286,15 +287,12 @@ export default {
           this.openForm=false;
           this.handleQuery();
       });
-    },
-    handleSetDefaultFlag(row){
-
     },
     handleDefaultFlagChange(row){
-      setDefaultBindSalesmen({empCode:row.empCode,defaultFlag:row.defaultFlag}).then(response => {
+      // setDefaultBindSalesmen({empCode:row.empCode,defaultFlag:row.defaultFlag}).then(response => {
-          this.$modal.msgSuccess(response.msg);
+      //     this.$modal.msgSuccess(response.msg);
-          this.getList();
+      //     this.getList();
-      });
+      // });
     },
     handleFormChanged(){
         this.openForm = false;
@@ -303,16 +301,6 @@ export default {
     cancelForm(){
       this.openForm = false;
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除').then(function() {
-        return delEmisTransProduct(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
 
     /** 列索引函数  */
     getIndex($index) {

src/views/oms/emisWaybill/OrderRecord.vue

@@ -105,8 +105,8 @@
                       </el-form-item>
                     </el-col> -->
                     <el-col :span="12" >
-                      <el-form-item :label="$t('专属业务员')"  prop="takePieceEmployeeCode">
+                      <el-form-item :label="$t('专属业务员')"  prop="privSalesmen">
-                        <TakeEmpPicker v-model="form.takePieceEmployeeCode" ></TakeEmpPicker>
+                        <TakeEmpPicker v-model="form.privSalesmen" ></TakeEmpPicker>
 
                       </el-form-item>
                     </el-col>
@@ -710,8 +710,9 @@ import GoodsInput from '@/views/oms/EmisBaseTools/GoodsInput.vue';
 
 import TransProductCasPicker from '@/views/oms/EmisBaseTools/TransProductCasPicker.vue';
 import { listSimpleEmisMonthpayAccount } from "@/api/oms/emisMonthpayAccount";
+import { listEmisCustomerAddress } from "@/api/oms/emisCustomerAddress";
+import { listBindSalesmen } from "@/api/oms/emisStaff";
 
-// import TransProductCasPicker from '@/views/oms/EmisBaseTools/TransProductCasPicker.vue';
 
 import { doScan } from "@/api/oms/emisTmsScanRecord";
 import { deepClone } from '@/utils/index'
@@ -1052,6 +1053,12 @@ methods: {
           this.form.billWeight='1'
           this.isNeedSave=true;
 
+          // 获取默认专属业务员
+          this.initPrivSalesmen();
+          this.initDefaultAddress();
+
+          // 默认的收寄件地址
+
           // 月结客户OMS登录
           let customerType=this.$store.getters.customerType;
           if(customerType==2){
@@ -1235,6 +1242,7 @@ methods: {
       feeRemark: null,
       realValue: null,
       takePieceEmployeeCode: null,
+      privSalesmen:null,
       sendSiteCode: null,
       sendSiteName: null,
       destinationCountry:  null,
@@ -1262,12 +1270,45 @@ methods: {
   };
     this.resetForm("form");
   },
+
+  // 获取专属业务员
+  initPrivSalesmen(){
+    let qParam={
+      pageNum:1,
+      pageSize:1,
+      blDefaultFlag:1,
+    }
+    listBindSalesmen(qParam).then(response => {
+      if(response.rows&&response.rows.length>0){
+        let item0=response.rows[0];
+        this.form.privSalesmen = item0.empCode;
+      }
+    });
+  },
+  initDefaultAddress(){
+    // 默认寄件
+    listEmisCustomerAddress({addressType:1,blDefaultFlag:1}).then(response => {
+      console.log("====>addressType:1 response.rows==>",response.rows);
+      if(response.rows&&response.rows.length>0){
+        let item0=response.rows[0];
+        this.onChangeSelectSender(item0);
+      }
+    });
+
+    // 默认收件
+    listEmisCustomerAddress({addressType:2,blDefaultFlag:1}).then(response => {
+      console.log("====>addressType:2 response.rows==>",response.rows);
+      if(response.rows&&response.rows.length>0){
+        let item0=response.rows[0];
+        this.onChangeSelectReceiver(item0);
+      }
+    });
+  },
   /** 提交按钮 */
   submitForm() {
 
     this.$refs["form"].validate((valid,obj) => {
       if (valid) {
-
         this.realSaveOrderInfo();
       }
       else {

src/views/system/dept/index.vue

@@ -71,6 +71,8 @@
       <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
       <!-- <el-table-column prop="domainName" label="所属域" align="center" width="90"></el-table-column> -->
       <el-table-column prop="orderNum" label="排序" width="80"></el-table-column>
+      <el-table-column prop="leader" label="负责人" width="100"></el-table-column>
+
       <el-table-column prop="status" label="状态" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>