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/views/ecw/box/indexAir.vue

 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="88px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="108px">
       <el-form-item :label="$t('自编号')" prop="selfNo">
         <el-input v-model="queryParams.selfNo" :placeholder="$t('请输入自编号')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -38,7 +38,7 @@
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BOX_AIR_SHIPMENT_STATE)" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-row>
+      <!-- <el-row> -->
         <el-form-item :label="$t('时间')" prop="date">
           <el-select v-model="queryParams.dateType" :placeholder="$t('请选择时间类型')" clearable size="small">
             <el-option v-for="item in dateTypes" :key="item.value" :label="item.label" :value="item.value" />
@@ -86,14 +86,11 @@
           <supplierSelect v-model="queryParams.shipperId" :companyType="'5'" :placeholder="$t('请选择订舱代理')" :allSupplier="allSupplier" clearable multiple collapse-tags />
         </el-form-item>
         <el-form-item :label="$t('航空公司')" v-show="showSearch">
-          <supplierSelect v-model="queryParams.airlineCompanyId"  :placeholder="$t('请选择航空公司')" company-type="10" :allSupplier="allSupplier" clearable multiple collapse-tags />
+          <supplierSelect v-model="queryParams.airlineCompanyIdList"  :placeholder="$t('请选择航空公司')" company-type="10" :allSupplier="allSupplier" clearable multiple collapse-tags />
         </el-form-item>
         <el-form-item :label="$t('代理公司Agent')" v-show="showSearch">
           <supplierSelect v-model="queryParams.agentIdList"  :placeholder="$t('请选择代理公司')" company-type="1" :allSupplier="allSupplier" clearable multiple collapse-tags />
         </el-form-item>
-        <el-form-item :label="$t('预计起飞时间')" prop="flyTime" v-show="showSearch">
-          <el-date-picker type="datetimerange" :start-placeholder="$t('预计起飞开始日期')" :end-placeholder="$t('预计起飞结束日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.flyBeginTime"></el-date-picker>
-        </el-form-item>
         <el-form-item :label="$t('报关方式')" prop="dcCustomsType" v-show="showSearch">
           <el-select v-model="queryParams.dcCustomsType" :placeholder="$t('请选择报关方式')" clearable  multiple collapse-tags>
             <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CUSTOMS_TYPE)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
@@ -102,11 +99,16 @@
         <el-form-item :label="$t('报关公司')" v-show="showSearch">
           <supplierSelect v-model="queryParams.dcCompanyId" :companyType="'2'" :placeholder="$t('请选择报关公司')" :allSupplier="allSupplier" clearable  multiple collapse-tags />
         </el-form-item>
-        <el-form-item :label="$t('放行时间')" v-show="showSearch">
-          <el-date-picker type="datetimerange" :start-placeholder="$t('放行开始日期')" :end-placeholder="$t('放行结束日期')" v-model="queryParams.dcPassBeginTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
-        </el-form-item>
-
-      </el-row>
+        <el-row>
+          <el-form-item :label="$t('预计起飞时间')" prop="flyTime" v-show="showSearch">
+            <el-date-picker type="datetimerange" :start-placeholder="$t('预计起飞开始日期')" :end-placeholder="$t('预计起飞结束日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.flyBeginTime"></el-date-picker>
+          </el-form-item>
+          <el-form-item :label="$t('放行时间')" v-show="showSearch">
+            <el-date-picker type="datetimerange" :start-placeholder="$t('放行开始日期')" :end-placeholder="$t('放行结束日期')" v-model="queryParams.dcPassBeginTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+          </el-form-item>
+        </el-row>
+
+      <!-- </el-row> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('重置') }}</el-button>

src/views/ecw/box/indexSea.vue

@@ -6,7 +6,7 @@
       ref="queryForm"
       size="small"
       :inline="true"
-      label-width="68px"
+      label-width="104px"
     >
       <el-form-item :label="$t('运输方式')" prop="transportType">
         <el-select
@@ -76,55 +76,6 @@
           <el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
-
-      <el-form-item label="" prop="dateType">
-        <el-select
-          v-model="queryParams.dateType"
-          :placeholder="$t('请选择时间类型')"
-          clearable
-          size="small"
-        >
-          <el-option
-            v-for="item in dateTypes"
-            :key="item.value"
-            :label="$l(item, 'label')"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="" prop="dateRangeCreateTime">
-        <el-date-picker
-          v-model="queryParams.dateRangeCreateTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="datetimerange"
-          range-separator="-"
-          :start-placeholder="$t('开始日期')"
-          :end-placeholder="$t('结束日期')"
-          clearable
-        />
-      </el-form-item>
-
-      <el-form-item :label="$t('状态')" prop="boxStatusList">
-        <el-select
-          v-model="queryParams.boxStatusList"
-          :placeholder="$t('请选择状态')"
-          clearable
-          multiple
-          size="small"
-        >
-          <el-option
-            v-for="dict in this.getDictDatas(
-              DICT_TYPE.BOX_ORDER_SHIPMENT_STATE
-            )"
-            :key="dict.value"
-            :label="$l(dict, 'label')"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-
       <el-form-item :label="$t('国家')" prop="countryId">
         <el-select
           v-model="queryParams.countryId"
@@ -141,7 +92,6 @@
           </el-option>
         </el-select>
       </el-form-item>
-
       <el-form-item :label="$t('提单制作')" prop="ladingBillStatus">
         <el-select
           v-model="queryParams.ladingBillStatus"
@@ -158,6 +108,59 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="$t('状态')" prop="boxStatusList">
+        <el-select
+          v-model="queryParams.boxStatusList"
+          :placeholder="$t('请选择状态')"
+          clearable
+          multiple
+          size="small"
+        >
+          <el-option
+            v-for="dict in this.getDictDatas(
+              DICT_TYPE.BOX_ORDER_SHIPMENT_STATE
+            )"
+            :key="dict.value"
+            :label="$l(dict, 'label')"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('出单方式')" v-show="showSearch">
+        <el-select v-model="queryParams.cdOutBillType" :placeholder="$t('请选择出单方式')" clearable  multiple collapse-tags>
+          <el-option v-for="item in method" :key="item.value" :label="item.label" :value="item.value"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-row>
+        <el-form-item :label="$t('时间')" prop="dateType">
+          <el-select
+            v-model="queryParams.dateType"
+            :placeholder="$t('请选择时间类型')"
+            clearable
+            size="small"
+          >
+            <el-option
+              v-for="item in dateTypes"
+              :key="item.value"
+              :label="$l(item, 'label')"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+  
+        <el-form-item label="" prop="dateRangeCreateTime">
+          <el-date-picker
+            v-model="queryParams.dateRangeCreateTime"
+            style="width: 240px"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange"
+            range-separator="-"
+            :start-placeholder="$t('开始日期')"
+            :end-placeholder="$t('结束日期')"
+            clearable
+          />
+        </el-form-item>
+      </el-row>
 
       <el-form-item :label="$t('起运港')" v-show="showSearch">
         <dockSelect v-model="queryParams.bigPortIdList" :placeholder="$t('请选择起运港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags />
@@ -171,6 +174,14 @@
       <el-form-item :label="$t('订舱公司')" v-show="showSearch">
         <supplierSelect v-model="queryParams.spaceCompanyIdList" :companyType="'1'" :placeholder="$t('请选择订舱公司')" :allSupplier="allSupplier" clearable multiple collapse-tags />
       </el-form-item>
+      <el-form-item :label="$t('报关方式')" prop="dcCustomsType" v-show="showSearch">
+        <el-select v-model="queryParams.dcCustomsType" :placeholder="$t('请选择报关方式')" clearable  multiple collapse-tags>
+          <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CUSTOMS_TYPE)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('报关公司')" v-show="showSearch">
+        <supplierSelect v-model="queryParams.dcCompanyId" :companyType="'2'" :placeholder="$t('请选择报关公司')" :allSupplier="allSupplier" clearable  multiple collapse-tags />
+      </el-form-item>
       <el-form-item :label="$t('预计驳船时间')" v-show="showSearch">
         <el-date-picker type="datetimerange" :start-placeholder="$t('预计驳船开始日期')" :end-placeholder="$t('预计驳船结束日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.bargeBeginTime"></el-date-picker>
       </el-form-item>
@@ -186,14 +197,6 @@
       <el-form-item :label="$t('截关时间')" v-show="showSearch">
         <el-date-picker type="datetimerange" :start-placeholder="$t('截关开始日期')" :end-placeholder="$t('截关结束日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.cutOffBeginTime"></el-date-picker>
       </el-form-item>
-      <el-form-item :label="$t('报关方式')" prop="dcCustomsType" v-show="showSearch">
-        <el-select v-model="queryParams.dcCustomsType" :placeholder="$t('请选择报关方式')" clearable  multiple collapse-tags>
-          <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CUSTOMS_TYPE)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('报关公司')" v-show="showSearch">
-        <supplierSelect v-model="queryParams.dcCompanyId" :companyType="'2'" :placeholder="$t('请选择报关公司')" :allSupplier="allSupplier" clearable  multiple collapse-tags />
-      </el-form-item>
       <el-form-item :label="$t('放行时间')" v-show="showSearch">
         <el-date-picker type="datetimerange" :start-placeholder="$t('放行开始日期')" :end-placeholder="$t('放行结束日期')" v-model="queryParams.dcPassBeginTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
@@ -203,10 +206,8 @@
       <el-form-item :label="$t('预计到港时间')" v-show="showSearch">
         <el-date-picker type="datetimerange" :start-placeholder="$t('预计到港开始日期')" :end-placeholder="$t('预计到港结束日期')" v-model="queryParams.estBeginTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
-      <el-form-item :label="$t('出单方式')" v-show="showSearch">
-        <el-select v-model="queryParams.cdOutBillType" :placeholder="$t('请选择出单方式')" clearable  multiple collapse-tags>
-          <el-option v-for="item in method" :key="item.value" :label="item.label" :value="item.value"></el-option>
-        </el-select>
+      <el-form-item :label="$t('预计清关时间')" v-show="showSearch">
+        <el-date-picker type="datetimerange" :start-placeholder="$t('预计清关开始日期')" :end-placeholder="$t('预计清关结束日期')" v-model="queryParams.clEstBeginTime" value-format="yyyy-MM-dd"></el-date-picker>
       </el-form-item>
       <el-form-item label="Agent list状态" v-show="showSearch">
         <el-select v-model="queryParams.cdAgentlistType">
@@ -228,9 +229,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('预计清关时间')" v-show="showSearch">
-        <el-date-picker type="datetimerange" :start-placeholder="$t('预计清关开始日期')" :end-placeholder="$t('预计清关结束日期')" v-model="queryParams.clEstBeginTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
-      </el-form-item>
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{

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()
         })
     },