Merge branch 'dev-zs' of...

Merge branch 'dev-zs' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into dev-zs

src/api/ecw/order.js

@@ -1074,9 +1074,8 @@ export function copyOrder(orderId) {
 // 强制到仓
 export function order_warehouse_check_force(data) {
   return request({
-    url: "/order/order-warehouse-check/force",
-    method: "post",
-    data
+    url: "/order/order-warehouse-check/force/" + data.orderId,
+    method: "post"
   })
 }
 
@@ -1090,9 +1089,8 @@ export function order_warehouse_check_query(id) {
 // 撤销到仓
 export function order_warehouse_check_revoke(data) {
   return request({
-    url: "/order/order-warehouse-check/revoke",
-    method: "post",
-    data
+    url: "/order/order-warehouse-check/revoke/" + data.orderId,
+    method: "post"
   })
 }
 // 到仓修改

src/views/ecw/box/shippingAir/nodePage/unloading/startUnloading.vue

@@ -301,11 +301,13 @@ export default {
     order_warehouse_check_revoke(orderId) {
       this.$confirm(this.$t("确定要撤销到仓么？")).then(async () => {
         let r = await order_warehouse_check_revoke({ orderId })
+        this.getLoadGoodsList()
       })
     },
     order_warehouse_check_force(orderId) {
       this.$confirm(this.$t("确定要强制到仓么？")).then(async () => {
         let r = await order_warehouse_check_force({ orderId })
+        this.getLoadGoodsList()
       })
     },
     getTotlContent,

src/views/ecw/customer/edit.vue

@@ -234,7 +234,7 @@
                 <el-input-number v-model="form.weightYearly" :min="1" />
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="12"> 
               <el-form-item :label="$t('主要竞争对手')" prop="competitorIds">
                 <el-select clearable v-model="form.competitorIds" :placeholder="$t('请选择')" @change="changeCompetitor">
                   <el-option v-for="item in competitorList" :key="item.id" :label="item.name" :value="item.id" />

src/views/ecw/offer/edit.vue

@@ -411,8 +411,9 @@
         </div>
         <div class="form-section">
           <el-form-item :label="$t('竞争对手')" prop="competitor">
-            <el-select clearable v-model="form.competitor" :placeholder="$t('请选择')" class="w-200">
+            <el-select clearable v-model="form.competitor" :placeholder="$t('请选择')" class="w-200" @change="changeCompetitor">
               <el-option v-for="item in competitorList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option :label="$t('其他')" :value="0" />
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('重要程度')" prop="importance">
@@ -563,7 +564,7 @@ import { getCustomerContactsSelect } from "@/api/ecw/customerContacts"
 import Decimal from "decimal.js"
 import getQuote from "@/views/ecw/customer/index.vue"
 import { getRegionList } from "@/api/ecw/order"
-import { competitorListAll } from "@/api/ecw/customer"
+import { competitorListAll, addCompetitor } from "@/api/ecw/customer"
 import { getCustomerContactsListByCustomer } from "@/api/ecw/customerContacts"
 import { parse } from "querystring"
 
@@ -1435,6 +1436,27 @@ export default {
         arr.push(tmp)
       })
       return arr
+    },
+    changeCompetitor(val) {
+      if (val == 0) {
+        this.$prompt("请输入主要竞争对手", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消"
+        }).then((data) => {
+          console.log(data)
+          addCompetitor({
+            name: data.value
+          }).then((r) => {
+            this.$message.success("添加成功！")
+            competitorListAll().then((res) => {
+              this.competitorList = res.data
+              this.$nextTick(() => {
+                this.form.competitor = r.data
+              })
+            })
+          })
+        })
+      }
     }
   }
 }

src/views/ecw/order/warehousingTo/components/Warehouse.vue

@@ -161,7 +161,7 @@
                 </el-table-column>
                 <el-table-column :label="$t('储位')" prop="orderLocationBackVOList" width="150px">
                   <template v-slot="{ row, column, $index }">
-                    <warehouse-area-select v-if="visible" v-model="form.table[$index].orderLocationBackVOList" :order-id="orderId" :order-item-id="warehousing.orderItemId" :warehouse-in-id="form.table[$index].id" :warehouse-id="warehouseId" :is-editing="false"></warehouse-area-select>
+                    <warehouse-area-select v-if="visible" v-model="form.table[$index].orderLocationBackVOList" :order-id="orderId" :order-item-id="warehousing.orderItemId" :warehouse-in-id="form.table[$index].id" :warehouse-id="warehouseId" :is-editing="false" readonly></warehouse-area-select>
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('备注')">