From 69c74095a6a16b606583930bda8240f9451f842f Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 28 Nov 2024 17:42:34 +0800
Subject: [PATCH] md

---
 src/api/oms/emisGoods.js                      |  8 +++++++
 src/api/oms/emisWaybill.js                    | 10 +++++++++
 src/api/system/user.js                        | 20 +++++++++---------
 src/views/oms/EmisBaseTools/TakeEmpPicker.vue |  4 ++--
 src/views/oms/emisWaybill/OrderRecord.vue     | 21 +++++++++----------
 .../oms/emisWaybill/SendOrderbillList.vue     | 21 +++++++++++++++++--
 6 files changed, 59 insertions(+), 25 deletions(-)

diff --git a/src/api/oms/emisGoods.js b/src/api/oms/emisGoods.js
index 7858803..e8c3b13 100644
--- a/src/api/oms/emisGoods.js
+++ b/src/api/oms/emisGoods.js
@@ -17,6 +17,14 @@ export function listSimpleEmisGoods(query) {
   })
 }
 
+export function listMyGoodsSimple(query) {
+  return request({
+    url: '/oms2c/emisGoods/listMyGoodsSimple',
+    method: 'get',
+    params: query
+  })
+}
+
 
 
 // 查询货物信息详细
diff --git a/src/api/oms/emisWaybill.js b/src/api/oms/emisWaybill.js
index 7fd69f8..a97d57d 100644
--- a/src/api/oms/emisWaybill.js
+++ b/src/api/oms/emisWaybill.js
@@ -175,3 +175,13 @@ export function delEmisWaybill(id) {
     method: 'delete'
   })
 }
+
+
+// 取消运单
+export function cancelOrder(data) {
+  return request({
+    url: '/oms2c/emisWaybill/cancelOrder',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/api/system/user.js b/src/api/system/user.js
index b52d273..c1fc521 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -38,12 +38,12 @@ export function getNewEmpCode(ownerSiteCode) {
 }
 
 
-
 // 查询用户详细
-export function getUser(userId) {
+export function getUser(id) {
   return request({
-    url: '/system/user/' + parseStrEmpty(userId),
-    method: 'get'
+    url: '/system/user/getInfo',
+    method: 'get',
+    params:{id:parseStrEmpty(id)}
   })
 }
 
@@ -74,9 +74,9 @@ export function delUser(userId) {
 }
 
 // 用户密码重置
-export function resetUserPwd(userId, password) {
+export function resetUserPwd(userName, password) {
   const data = {
-    userId,
+    userName,
     password
   }
   return request({
@@ -87,9 +87,9 @@ export function resetUserPwd(userId, password) {
 }
 
 // 用户状态修改
-export function changeUserStatus(userId, status) {
+export function changeUserStatus(id, status) {
   const data = {
-    userId,
+    id,
     status
   }
   return request({
@@ -148,9 +148,9 @@ export function uploadAvatar(data) {
 }
 
 // 查询授权角色
-export function getAuthRole(userId) {
+export function getAuthRole(id) {
   return request({
-    url: '/system/user/authRole/' + userId,
+    url: '/system/user/authRole/' + id,
     method: 'get'
   })
 }
diff --git a/src/views/oms/EmisBaseTools/TakeEmpPicker.vue b/src/views/oms/EmisBaseTools/TakeEmpPicker.vue
index 61a4f9a..d5d0b54 100644
--- a/src/views/oms/EmisBaseTools/TakeEmpPicker.vue
+++ b/src/views/oms/EmisBaseTools/TakeEmpPicker.vue
@@ -205,7 +205,7 @@ import { listBindSalesmen } from "@/api/oms/emisStaff";
        this.loading = true;
 
        this.queryParams.searchValue = val;
-       this.queryParams.userId = key;
+       this.queryParams.empCode = key;
 
        listBindSalesmen(this.queryParams).then(response => {
          this.loading = false;
@@ -219,7 +219,7 @@ import { listBindSalesmen } from "@/api/oms/emisStaff";
           }
 
           if(!this.isInputing ){
-            let selectItem = response.rows.find(item => item.userId == this.svalue);
+            let selectItem = response.rows.find(item => item.empCode == this.svalue);
             if(selectItem){
               this.slable = selectItem.empName;
             }
diff --git a/src/views/oms/emisWaybill/OrderRecord.vue b/src/views/oms/emisWaybill/OrderRecord.vue
index 313e18b..dccbefc 100644
--- a/src/views/oms/emisWaybill/OrderRecord.vue
+++ b/src/views/oms/emisWaybill/OrderRecord.vue
@@ -144,7 +144,7 @@
                       </el-col>
 
                       <el-col :span="18">
-                      <el-form-item :label="$t('目的国')" prop="sender.country">
+                      <el-form-item :label="$t('目的国')" prop="reciever.country">
                         <country-picker2 v-model="form.reciever.country" @onChange="handleCalcDestSite" ></country-picker2>
                       </el-form-item>
                     </el-col>
@@ -472,7 +472,7 @@
                                 <el-input v-model="scope.row.cargoQty"    size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column>
-                            <el-table-column prop="price" label="单价" align="center" width="60" :show-overflow-tooltip="true">
+                            <el-table-column prop="price" label="货值(USD)" align="center" width="100" :show-overflow-tooltip="true">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.price" size="mini" placeholder=""></el-input>
                               </template>
@@ -483,8 +483,6 @@
                               </template>
                             </el-table-column> -->
 
-
-
                             <el-table-column prop="goodsModel" label="规格型号" align="center" width="80" :show-overflow-tooltip="true">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.goodsModel" size="mini" placeholder=""></el-input>
@@ -495,11 +493,6 @@
                                 <el-input  v-model="scope.row.brand" size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column>
-                            <!-- <el-table-column prop="hscode" label="海关编码" align="center" width="80" :show-overflow-tooltip="true">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.hscode" size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column> -->
 
                             <el-table-column prop="material" label="材质" align="center" width="60" :show-overflow-tooltip="true">
                               <template slot-scope="scope">
@@ -527,7 +520,13 @@
                               </template>
                             </el-table-column> -->
 
-                            <!-- <el-table-column prop="length"  :label="$t('长(cm)')"  align="center" width="80">
+                            <el-table-column prop="hscode" label="海关编码" align="center" width="80" :show-overflow-tooltip="true">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.hscode" size="mini" placeholder=""></el-input>
+                              </template>
+                            </el-table-column>
+
+                        <el-table-column prop="length"  :label="$t('长(cm)')"  align="center" width="80">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.length"   size="mini" placeholder=""></el-input>
                               </template>
@@ -541,7 +540,7 @@
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.height"   size="mini" placeholder=""></el-input>
                               </template>
-                            </el-table-column> -->
+                            </el-table-column>
 
 
                             <el-table-column :label="$t('操作')"  align="left" min-width="50">
diff --git a/src/views/oms/emisWaybill/SendOrderbillList.vue b/src/views/oms/emisWaybill/SendOrderbillList.vue
index 8d4ba49..a5756c2 100644
--- a/src/views/oms/emisWaybill/SendOrderbillList.vue
+++ b/src/views/oms/emisWaybill/SendOrderbillList.vue
@@ -240,7 +240,7 @@
                   size="mini"
                   icon="el-icon-cancel"
                   :disabled="single"
-                  @click="handleUpdate"
+                  @click="handleCancel"
                 >取消订单</el-button>
               </el-col>
 
@@ -525,7 +525,7 @@
 
 <script>
 import 'element-ui/lib/theme-chalk/display.css';
-import { listEmisWaybill,getQueryStatInfoMap } from "@/api/oms/emisWaybill";
+import { listEmisWaybill,getQueryStatInfoMap,cancelOrder } from "@/api/oms/emisWaybill";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
 
@@ -842,6 +842,23 @@ export default {
         // this.billCode=row.billCode;
         this.openView=true;
     },
+    handleCancel(row){
+
+      this.$prompt('请输入取消原因', "操作确认", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        closeOnClickModal: false,
+        inputPattern: /^.{1,30}$/,
+        inputErrorMessage: "取消原因长度必须介于 1 和 30 之间"
+      }).then(({ value }) => {
+
+        let item0=this.selectionList[0];
+        cancelOrder({orderSn:item0.orderSn,orderRemark:value}).then(response => {
+            this.$modal.msgSuccess("操作成功" );
+            this.getList();
+        });
+      }).catch(() => {});
+    },
     handleUpdate(row) {
        this.$router.push({ path: '/orderMgnt/OrderRecord', query: { action:"modify",billCode: this.billCode }})
     },