Md

src/views/oms/EmisBaseTools/TakeEmpPicker.vue

@@ -110,7 +110,7 @@ import { listBindSalesmen } from "@/api/oms/emisStaff";
        queryParams:{
          pageNum:1,
          pageSize:100,
-         userId:null,
+         empCode:null,
          searchValue:null,
        }
      };
@@ -164,7 +164,7 @@ import { listBindSalesmen } from "@/api/oms/emisStaff";
 
     },
     onRowClick(row, column, event) {
-        this.svalue=row.userId;
+        this.svalue=row.empCode;
         this.slable=row.empName;
 
         this.isInputing = false;
@@ -212,6 +212,8 @@ import { listBindSalesmen } from "@/api/oms/emisStaff";
          this.total = response.total;
          this.optionItems = response.rows;
 
+         console.log("===>this.optionItems==>",this.optionItems);
+
           // 初始值存储
           if(key==null && val==null){
             this.defaultTotal = this.total+0;

src/views/oms/emisWaybill/OrderRecord.vue

@@ -104,19 +104,7 @@
                         <el-input v-model="form.sendSiteName" placeholder="" disabled />
                       </el-form-item>
                     </el-col> -->
-                    <!-- <el-col :span="12" >
-                      <el-form-item :label="$t('专属业务员')"  prop="privSalesmen">
-                        <TakeEmpPicker v-model="form.privSalesmen" ></TakeEmpPicker>
 
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" >
-                      <el-button
-                          type="primary"
-                          size="small"
-                          @click="handlePrivSalesmen"
-                        > {{ $t('去绑定业务员') }}</el-button>
-                    </el-col> -->
 
 
                   </el-row>
@@ -257,8 +245,8 @@
                       </el-col>
 
                       <el-col :span="12"  v-if="form.pickupMethod==2">
-                          <el-form-item :label="$t('快递员')"  prop="privSalesmen">
+                          <el-form-item :label="$t('快递员')"  prop="takePieceEmployeeCode">
-                            <TakeEmpPicker v-model="form.privSalesmen" ></TakeEmpPicker>
+                            <TakeEmpPicker v-model="form.takePieceEmployeeCode" ></TakeEmpPicker>
                           </el-form-item>
                         </el-col>
                         <el-col :span="12"  v-if="form.pickupMethod==2">
@@ -669,7 +657,9 @@
           运费预估:￥<span style="font-size:15px;color:red;font-weight:500">{{form.freight}}</span>
           <div>温馨提示：具体运价时效以快递小哥核实为准！</div>
         </div>
-        <el-button type="primary" @click="submitForm">{{$t('立即下单')}}</el-button>
+        <el-button type="primary" @click="submitForm" v-if="this.action!='modify'">{{$t('立即下单')}}</el-button>
+        <el-button type="primary" @click="submitForm" v-if="this.action=='modify'">{{$t('立即保存')}}</el-button>
+
         <!-- <el-button @click="initData">{{$t('重置')}}</el-button> -->
       </div>
 
@@ -1024,6 +1014,7 @@ watch: {
 // },
 created() {
 
+
   if(this.$route.query.action=="copyOrder"){
     // this.$router.meta.title="再来一单";
     this.action=this.$route.query.action;
@@ -1047,6 +1038,8 @@ created() {
     this.initData();
   }
   else if(this.$route.query.action=="preOrderByProd"){
+    this.action=this.$route.query.action;
+
     this.reset();
 
     this.initData();
@@ -1085,6 +1078,7 @@ created() {
 
   }
   else if(this.$route.query.action=="add"){
+    this.action=this.$route.query.action;
     this.initData();
   }
 },
@@ -1207,9 +1201,20 @@ methods: {
 
   },
   onComplete(){
+
+    if(this.action!='add'){
+      this.jumpToSendOrderList();
+      return
+    }
+
+    // if(this.action!='add'){
+    //   this.jumpToNewOrder();
+    //   return
+    // }
+
     let msgInfo="下单成功,运单号是["+this.billCode+"]请等待快递小哥上门取件~";
     if(this.form.pickMethod==1){
-      msgInfo="下单成功,运单号是["+this.billCode+"]请~";
+      msgInfo="下单成功,运单号是["+this.billCode+"]请联系仓库";
     }
 
     this.$confirm(msgInfo, "提示", {
@@ -1223,8 +1228,17 @@ methods: {
         this.billCode=null;
         this.form.billCode=null;
         this.initData();
+
       });
   },
+  jumpToNewOrder(){
+    this.$store.dispatch("tagsView/delView", this.$route);
+    this.$router.replace({ path: '/OrderMgnt/OrderRecord?action=add'});
+  },
+  jumpToSendOrderList(){
+    this.$store.dispatch("tagsView/delView", this.$route);
+    this.$router.replace({ path: '/OrderMgnt/SendOrderbillList'});
+  },
   onPaymentTypeChange(){
   // 非月结清空月结客户选择
   if(this.form.paymentType == '1' ||
@@ -1382,7 +1396,7 @@ methods: {
     listBindSalesmen(qParam).then(response => {
       if(response.rows&&response.rows.length>0){
         let item0=response.rows[0];
-        this.form.privSalesmen = item0.empCode;
+        this.form.takePieceEmployeeCode = item0.empCode;
       }
     });
   },
@@ -1455,6 +1469,7 @@ methods: {
       postForm.packType=this.form.packType.join(",");
     }
 
+
     realSubmitOrder(postForm).then(res => {
         console.log("===>realSubmitOrder==>",res)
         this.billCode=res.data.billCode;

src/views/oms/emisWaybill/SendOrderbillList.vue

@@ -96,12 +96,19 @@
             <el-form-item label="目的省份" prop="receiveProvince">
               <ProvincePicker2  v-model="queryParams.receiveProvince" :countryCode="queryParams.receiveCountry"  :disabled="!queryParams.receiveCountry" ></ProvincePicker2>
             </el-form-item>
+            <el-form-item label="是否问题件" prop="blIsQuestion">
+            <el-select clearable="" v-model="queryParams.blIsQuestion" placeholder="请选择">
+              <el-option label="是" :value="1"></el-option>
+              <el-option label="否" :value="0"></el-option>
+            </el-select>
+          </el-form-item>
             <el-form-item label="签收状态" prop="blSign">
               <el-select clearable v-model="queryParams.blSign" placeholder="请选择">
                 <el-option label="已签收" :value="1"></el-option>
                 <el-option label="未签收" :value="0"></el-option>
               </el-select>
             </el-form-item>
+
             <el-form-item label="订单状态" prop="orderStatus">
               <el-select clearable v-model="queryParams.orderStatus" placeholder="请选择">
                 <el-option label="未接单" :value="0"></el-option>
@@ -427,12 +434,14 @@
       <!-- <el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" /> -->
       <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
 
-      <!-- <el-table-column :label="$t('是否问题件')" align="center" prop="blIsQuestion" min-width="80" >
+      <el-table-column :label="$t('是否问题件')" align="center" prop="blIsQuestion" min-width="80" >
           <template slot-scope="scope">
               <el-tag v-if="scope.row.blIsQuestion==1" type="danger">是</el-tag>
               <el-tag v-else type="info">否</el-tag>
           </template>
-        </el-table-column>
+      </el-table-column>
+
+      <!--
       <el-table-column :label="$t('问题件类型')" align="center" prop="problemTypeName" width="80" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" width="80" :show-overflow-tooltip="true"/> -->