到仓修改

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

@@ -142,9 +142,9 @@
             <div class="btns">
               <el-button type="danger" size="small" @click="openError(scope.row)">{{ $t("异常") }}</el-button>
               <el-button v-if="pageData.boxCustomsBackVO && pageData.boxCustomsBackVO.overMachineStatus == 2 && pageData.boxCustomsBackVO.overMachineAbnormalStatus == 2" plain type="primary" size="small" @click="$router.push('/order/warehousing-update?id=' + scope.row.orderId)">{{ $t("入仓修改 ") }}</el-button>
-              <el-button plain type="primary" size="small" @click="order_warehouse_check_revoke(scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("撤销到仓") }}</el-button>
-              <el-button plain type="primary" size="small" @click="order_warehouse_check_force(scope.row.orderId)" v-if="scope.row.installNum > scope.row.unloadNum">{{ $t("强制到仓") }}</el-button>
-              <el-button plain type="primary" size="small" @click="$router.push('/order/warehousingTo-update?id=' + scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("到仓修改") }}</el-button>
+              <el-button type="primary" size="small" @click="order_warehouse_check_revoke(scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("撤销到仓") }}</el-button>
+              <el-button type="primary" size="small" @click="order_warehouse_check_force(scope.row.orderId)" v-if="scope.row.installNum > scope.row.unloadNum">{{ $t("强制到仓") }}</el-button>
+              <el-button type="primary" size="small" @click="$router.push('/order/warehousingTo-update?id=' + scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("到仓修改") }}</el-button>
             </div>
           </template>
         </el-table-column>

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

@@ -132,9 +132,9 @@
           <template slot-scope="scope">
             <div class="btns">
               <el-button type="danger" size="small" @click="openError(scope.row)">{{ $t("异常") }}</el-button>
-              <el-button plain type="primary" size="small" @click="order_warehouse_check_revoke(scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("撤销到仓") }}</el-button>
-              <el-button plain type="primary" size="small" @click="order_warehouse_check_force(scope.row.orderId)" v-if="scope.row.installNum > scope.row.unloadNum">{{ $t("强制到仓") }}</el-button>
-              <el-button plain type="primary" size="small" @click="$router.push('/order/warehousingTo-update?id=' + scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("到仓修改") }}</el-button>
+              <el-button type="primary" size="small" @click="order_warehouse_check_revoke(scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("撤销到仓") }}</el-button>
+              <el-button type="primary" size="small" @click="order_warehouse_check_force(scope.row.orderId)" v-if="scope.row.installNum > scope.row.unloadNum">{{ $t("强制到仓") }}</el-button>
+              <el-button type="primary" size="small" @click="$router.push('/order/warehousingTo-update?id=' + scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("到仓修改") }}</el-button>
             </div>
           </template>
         </el-table-column>

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

@@ -192,12 +192,6 @@
         </el-tab-pane>
       </el-tabs>
 
-      <div v-if="edit && order.status !== 3">
-        <h2>{{ $t("审批流程") }}</h2>
-        <work-flow xmlkey="free_apply" v-model="selectedUsers" />
-        <!--        <div>选择的用户：{{selectedUsers}}</div>-->
-      </div>
-
       <span slot="footer">
         <el-button @click="handleClose">{{ $t("关 闭") }}</el-button>
         <el-button type="primary" :loading="submitting" @click="handleSubmit()">{{ $t("确认修改") }}</el-button>
@@ -239,7 +233,6 @@ import ProductSelector from "@/components/ProductSelector"
 import WarehouseAreaSelect from "@/components/WarehouseAreaSelect"
 import { getFeeTypeByOrderProduct, getProductBrankPage } from "@/api/ecw/productBrank"
 import { cancelProcessInstance } from "@/api/bpm/processInstance"
-import WorkFlow from "@/components/WorkFlow"
 import { DICT_TYPE, getDictDataLabel, getDictDatas } from "@/utils/dict"
 import { orderWarehouseIn, orderWarehouseInUpdateApply, warehousePictureDelete, warehousePictureList, order_warehouse_check_update } from "@/api/ecw/order"
 import { getProductAttrList } from "@/api/ecw/productAttr"
@@ -255,8 +248,7 @@ export default {
     WarehouseRecordDetail,
     ImageAndVideoUpload,
     ProductSelector,
-    WarehouseAreaSelect,
-    WorkFlow
+    WarehouseAreaSelect
   },
 
   props: {
@@ -423,8 +415,6 @@ export default {
         // // quantityAll: [{required: true, message: this.$t("数量不能为空"), trigger: "change"}]
       },
 
-      selectedUsers: undefined,
-
       // 入仓修改正在审核中
       isEditing: false,
       // 审批业务id
@@ -570,14 +560,13 @@ export default {
               prodId: this.form.prodId,
               warehouseCheckProdAttrIds: this.form.warehouseCheckProdAttrIds.join(","),
               usageIds: this.form.usageIds.join(","),
-              orderWarehouseInUpdateItemDoList: this.form.table.map((e) => {
+              updates: this.form.table.map((e) => {
                 return {
                   ...e,
                   boxGauge: e.boxGauge1 + "*" + e.boxGauge2 + "*" + e.boxGauge3,
                   orderLocationCreateReqVOList: e.orderLocationBackVOList
                 }
-              }),
-              copyUserId: this.selectedUsers
+              })
             })
               .then((r) => {
                 this.submitting = false

src/views/ecw/order/warehousingTo/index.vue

@@ -60,24 +60,6 @@
       </el-table-column>
     </el-table>
 
-    <el-card v-if="order.parentOrderId" style="margin-top: 20px">
-      <div slot="header" class="clearfix">
-        <span style="font-size: 18px">{{ $t("标签箱号") }}</span>
-      </div>
-
-      <div v-for="(item, index) in label.orderLabelDtoList" :key="index" style="margin-bottom: 10px">
-        <el-input-number v-model="item.start" controls-position="right"></el-input-number>
-        -
-        <el-input-number v-model="item.end" controls-position="right"></el-input-number>
-        <el-button icon="el-icon-minus" circle v-show="index !== 0" @click="label.orderLabelDtoList.splice(index, 1)" style="margin-left: 10px"></el-button>
-        <el-button icon="el-icon-plus" circle @click="handleLabelAdd(index)"></el-button>
-      </div>
-      <div style="text-align: center">
-        <el-button type="primary" @click="handleLabelSubmit">{{ $t("修改箱号") }}</el-button>
-      </div>
-    </el-card>
-
-    <h2 v-if="orderSpecialNeeds.length > 0">{{ $t("特殊需求") }}</h2>
     <el-form ref="form" :model="form" label-width="200px">
       <el-form-item :label="$i18n.locale === 'en_US' ? item.labelEn : item.label" v-for="(item, index) in orderSpecialNeeds" :key="item.value" style="width: 600px">
         <el-input-number v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoney" type="number" :min="0" step-strictly :placeholder="$t('请输入') + ($i18n.locale === 'en_US' ? item.labelEn : item.label)"></el-input-number>
@@ -111,7 +93,7 @@
 </template>
 <script>
 import { getCurrencyList } from "@/api/ecw/currency"
-import { getLabelByOrder, getLabelWaitInByOrder, getOrder, getOrderWarehouseIn, getSpecialListByOrderId, listByOrderId, orderWarehouseInFinish, orderWarehouseInUpdateLabel, rollbackDelete, warehousePictureList } from "@/api/ecw/order"
+import { getLabelWaitInByOrder, getOrder, getOrderWarehouseIn, getSpecialListByOrderId, listByOrderId, orderWarehouseInFinish, orderWarehouseInUpdateLabel, rollbackDelete, warehousePictureList } from "@/api/ecw/order"
 import orderBaseInfo from "@/components/OrderBaseInfo"
 import WarehouseAreaDialog from "@/components/WarehouseAreaDialog"
 import { DICT_TYPE } from "@/utils/dict"
@@ -229,39 +211,6 @@ export default {
         return arr.indexOf(state) == -1
       }
     },
-    handleLabelSubmit() {
-      orderWarehouseInUpdateLabel({
-        ...this.label,
-        orderId: this.orderId
-      }).then((r) => {
-        if (r.code === 0) {
-          this.$message.success(r.msg || this.$t("修改标签箱号成功"))
-        }
-      })
-    },
-
-    // 箱号标签回显
-    getLabelByOrder() {
-      getLabelByOrder(this.orderId).then((r) => {
-        if (r.code === 0 && !!r.data && r.data.length > 0) {
-          this.label.orderLabelDtoList = r.data
-        } else {
-          // 没有历史数据，查默认值
-          getLabelWaitInByOrder(this.orderId).then((r) => {
-            console.log(r)
-            if (r.code === 0 && !!r.data) {
-              this.label.orderLabelDtoList = [r.data]
-            }
-          })
-        }
-      })
-    },
-    handleLabelAdd(index) {
-      this.label.orderLabelDtoList.splice(index + 1, 0, {
-        end: "",
-        start: ""
-      })
-    },
     getTowSum() {
       // let sumVolume = 0
       // let sumWeight = 0
@@ -279,7 +228,6 @@ export default {
           this.getTowSum()
         })
         .then(() => {
-          this.getLabelByOrder()
           this.getWarehousePictureList()
         })
     },