@logwire/logwire-wms-pda-ui 3.4.0 → 3.5.2

package/src/views/wms/components/consoleAndPick/createOrderPage.vue

@@ -13,154 +13,503 @@
       class="lw-global-page-box"
     >
 
-      <div class="lw-global-model-box lw-global-model-box-3px">
-        <lw-search-cell-popup
+      <div
+        class="lw-global-model-box"
+        :class="{'lw-global-model-box-3px':!owner.id}"
+        :style="{'padding-top':owner.id ?'3px':''}"
+      >
+
+        <lw-search-select-popup-module
+          ref="owner"
+          :api="$lwApi.common.searchOwner"
           :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.yuhjuoyu','货主')"
           :get-focus.sync="owner.focus"
+          v-model="owner.id"
           :create-rule="$lwScanRule.create('指定整托拣选-创建出库单-货主','OWNER')"
           rule-key="owner"
           required
-          :api-fn="k=>ownerCustomerApi('owner',k)"
-          label-key="code,name"
-          :disabled="inputDisabled"
-          :init-val="owner.initVal"
           input-align="right"
-          @confirm="item=>ownerCustomerPopupConfirm('owner',item)"
-          @clear="ownerCustomerPopupClear('owner')"
+          :disabled="inputDisabled || !!skuList.pageTotal || !!customer.id"
+          :show-border="!!owner.id"
+          @confirm="ownerConfirm"
+          @clear="ownerClear"
         />
 
-        <lw-search-cell-popup
-          :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.gdizxsnv','客户')"
-          :get-focus.sync="customer.focus"
-          :create-rule="$lwScanRule.create('指定整托拣选-创建出库单-客户','CUSTOMER')"
-          rule-key="customer"
-          required
-          :api-fn="k=>ownerCustomerApi('customer',k)"
-          label-key="code,name"
-          :init-val="customer.initVal"
-          input-align="right"
-          @confirm="item=>ownerCustomerPopupConfirm('customer',item)"
-          @clear="ownerCustomerPopupClear('customer')"
-        />
+        <template v-if="owner.id">
+
+          <lw-search-select-popup-module
+            ref="customer"
+            :api="getCustomerData"
+            :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.gdizxsnv','客户')"
+            v-model="customer.id"
+            :get-focus.sync="customer.focus"
+            :create-rule="$lwScanRule.create('指定整托拣选-创建出库单-客户','CUSTOMER')"
+            rule-key="customer"
+            required
+            input-align="right"
+            @confirm="item=>searchCellSelectPopupConfirm('customer',item)"
+            @clear="searchCellSelectPopupClear('customer')"
+          />
 
-        <lw-cell-popup-radio
-          :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.doxdxscl','订单类型')"
-          v-model="type"
-          dict-key="OutboundPlanOrderType"
-          required
+          <lw-cell-popup-radio
+            :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.doxdxscl','订单类型')"
+            v-model="type"
+            dict-key="OutboundPlanOrderType"
+            required
 
-        />
+          />
 
-        <lw-cell-popup-date
-          :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.sikueuiv','计划出库时间')"
-          v-model="planTime"
-          type="datetime"
-        />
+          <lw-cell-popup-date
+            :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.sikueuiv','计划出库时间')"
+            v-model="planTime"
+            type="datetime"
+          />
 
-        <lw-input
-          :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.eodxrrmz','外部单号')"
-          v-model="extSoNo"
-          :create-rule="$lwScanRule.create('指定整托拣选-创建出库单-外部单号','ASN')"
-          rule-key="extSoNo"
-          required
-          input-align="right"
-          @confirm="extSoNoConfirm"
-        />
+          <lw-input
+            :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.eodxrrmz','外部单号')"
+            v-model="extSoNo"
+            :create-rule="$lwScanRule.create('指定整托拣选-创建出库单-外部单号','ASN')"
+            rule-key="extSoNo"
+            required
+            input-align="right"
+            @confirm="address.focus=true"
+          />
 
-        <lw-cell-popup-radio
-          v-if="showBackCell"
-          :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.xftskuiu','退货方式')"
-          v-model="back.value"
-          dict-key="OutboundReturnMethod"
-        />
 
-        <lw-input
-          :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.lxhzbtsv','备注')"
-          v-model="remark"
-          :show-bottom-border="false"
-          input-align="right"
-          type="textarea"
-          :rows="4"
-        />
+          <lw-input
+            :title="$lwLanguage.get('', '目的地编码')"
+            v-model="address.code"
+            :get-focus.sync="address.focus"
+            input-align="right"
+            :create-rule="$lwScanRule.create('指定整托拣选-创建出库单-目的地编码','ADDRESS')"
+            rule-key="address"
+            @confirm="checkSkuListAndFocus"
+          >
+            <template #button>
+              <van-icon
+                name="arrow"
+                color="#cdcdcd"
+                size="18px"
+                @click="address.show = true"
+              />
+            </template>
+
+          </lw-input>
+
+          <lw-input
+            :title="$lwLanguage.get('','目的地名称')"
+            v-model="address.name"
+            input-align="right"
+            @confirm="checkSkuListAndFocus"
+          />
+
+          <lw-cell-popup-radio
+            v-if="showBackCell"
+            :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.xftskuiu','退货方式')"
+            v-model="back.value"
+            dict-key="OutboundReturnMethod"
+          />
+
+          <lw-input
+            :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.lxhzbtsv','备注')"
+            v-model="remark"
+            input-align="right"
+            type="textarea"
+            :rows="4"
+          />
+
+          <div
+            v-if="showNeedDeliverySwitch"
+            class="lw-global-row-end lw-global-flex-between"
+          >
+            <div class="lw-global-title">
+              {{ $lwLanguage.get('', '必须装车发运') }}
+            </div>
+
+            <van-switch
+              v-model="needLoadShip"
+              :disabled="!!soId"
+              size="18px"
+              @change="needLoadShipChange"
+            />
+          </div>
+        </template>
 
       </div>
 
+      <!-- 发运单信息录入 -->
       <div
-        style="padding-bottom: 3px"
+        v-if="showDeliveryInfo && !soId && needLoadShip"
         class="lw-global-model-box"
-        v-for="(i,k) in skuList"
-        :key="k"
+        :style="{'padding-bottom': dispatchAdd ? '3px': ''}"
       >
 
-        <div class="lw-global-flex-between">
 
-          <div class="lw-global-value-bold">
-            {{
-              $lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.pfsfpqla','商品') + (k + 1)
-            }}
+        <div
+          class="lw-global-flex-between"
+          :class="[
+            dispatchAdd ? 'lw-global-row-start' : ''
+          ]"
+        >
+          <div class="lw-global-title">
+            {{ $lwLanguage.get('', '新增发运单') }}
           </div>
 
-          <van-icon
-            name="delete"
-            size="18"
-            color="#d50000"
-            @click="delSku(k)"
+          <van-switch
+            v-model="dispatchAdd"
+            size="18px"
+            @change="dispatchAddChange"
           />
         </div>
-        <lw-search-cell-popup
-          :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.grrwqosq','商品编码')"
-          :get-focus.sync="i.skuFocus"
-          :create-rule="$lwScanRule.create('指定整托拣选-创建出库单-商品编码','SKU')"
-          rule-key="skuCode"
-          required
-          show-bottom-border
-          :api-fn="s=>skuCodeConfirm(s,k)"
-          label-key="code,name"
-          :init-auto-select="false"
-          :init-val="i.initVal"
-          @confirm="item=>selectPopupConfirm(item,k)"
-          @clear="selectPopupClear(k)"
-        />
-        <lw-title-value-cell
-          :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.lbbzndee','可用库存数')"
-          :value="$lwCheckVal(i.abQty)"
-          val-bold
-        />
-        <lw-input
-          :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.zrrojbff','出库数量')"
-          v-model="i.skuQty"
-          :get-focus.sync="i.qtyFocus"
-          type="digit"
-          required
-          :show-bottom-border="false"
-        />
 
-      </div>
+        <template v-if="dispatchAdd">
+          <lw-cell-popup-date
+            :title="$lwLanguage.get('','计划发运时间')"
+            v-model="dispatchData.planDeliveryTime"
+            type="datetime"
+            required
+            init-default-time
+          />
+
+          <lw-input
+            :title="$lwLanguage.get('','承运商编码')"
+            v-model="dispatchData.carrierCode"
+            input-align="right"
+          >
+            <template #button>
+              <van-icon
+                name="arrow"
+                color="#cdcdcd"
+                size="18px"
+                @click="carrierCodeSelectPopupShow = true"
+              />
+            </template>
+
+          </lw-input>
+
+          <lw-input
+            :title="$lwLanguage.get('','承运商名称')"
+            v-model="dispatchData.carrierName"
+            input-align="right"
+          />
+
+          <lw-input
+            :title="$lwLanguage.get('','承运商联系人')"
+            v-model="dispatchData.carrierContact"
+            input-align="right"
+          />
+
+          <lw-input
+            :title="$lwLanguage.get('','承运商电话')"
+            v-model="dispatchData.carrierPhone"
+            input-align="right"
+            type="digit"
+          />
+
+          <lw-car-plate
+            :title="$lwLanguage.get('','车牌号')"
+            v-model="dispatchData.carrierPlateNum"
+            :api-param="{
+              carrierCode:dispatchData.carrierCode,
+              ownerId:owner.id
+            }"
+          />
+
+          <lw-car-plate
+            :title="$lwLanguage.get('','拖车号')"
+            v-model="dispatchData.carrierCarriageNum"
+            :api-param="{
+              carrierCode:dispatchData.carrierCode,
+              ownerId:owner.id
+            }"
+          />
+
+          <lw-input
+            :title="$lwLanguage.get('','司机')"
+            v-model="dispatchData.carrierDriver"
+            input-align="right"
+          >
+            <template #button>
+              <van-icon
+                name="arrow"
+                color="#cdcdcd"
+                size="18px"
+                @click="carrierDriverSelectPopupShow = true"
+              />
+            </template>
+
+          </lw-input>
+
+          <lw-input
+            :title="$lwLanguage.get('','司机电话')"
+            v-model="dispatchData.carrierDriverPhone"
+            type="digit"
+            input-align="right"
+          />
+
+          <lw-input
+            :title="$lwLanguage.get('','运输计划单号')"
+            v-model="dispatchData.transportPlanNo"
+            input-align="right"
+          />
+
+          <lw-input
+            :title="$lwLanguage.get('','承运商运单号')"
+            v-model="dispatchData.carrierDeliveryNo"
+            input-align="right"
+          />
+
+          <lw-input
+            :title="$lwLanguage.get('','外部运单号')"
+            v-model="dispatchData.extDeliveryNo"
+            input-align="right"
+            :show-bottom-border="false"
+          />
+        </template>
+
 
-      <div
-        style="margin: 20px 0"
-        class="lw-global-flex-center"
-      >
-        <van-icon
-          size="30px"
-          name="add"
-          color="#D50000"
-          @click="addSku"
-        />
       </div>
 
+      <template v-if="showSkuTab">
+
+        <lw-tab-box
+          v-if="soId"
+          style="margin-top: 10px"
+          @change="tabChange"
+        >
+          <van-tabs
+            type="card"
+            animated
+            v-model="tabActive"
+          >
+
+            <van-tab
+              name="add"
+              :title="$lwLanguage.get('', '添加商品')"
+            >
+            </van-tab>
+
+            <van-tab
+              name="list"
+              :title="$lwLanguage.get('', '商品列表')"
+            >
+
+              <div
+                v-for="(i,k) in skuList.data"
+                :key="k"
+                class="lw-global-model-box"
+              >
+                <lw-sku-info-module
+                  :sku-name="i.skuName"
+                  :sku-code="i.skuCode"
+                >
+
+                  <van-icon
+                    size="18px"
+                    name="edit"
+                    color="rgb(0, 68, 208)"
+                    @click="skuListEdit(i)"
+                  />
+                </lw-sku-info-module>
+
+                <div class="lw-global-flex-between">
+
+                  <lw-title-value-cell
+                    style="flex: 1"
+                    :title="$lwLanguage.get('', '计划')"
+                    :value="i.skuQtyLabel"
+                    :is-row="false"
+                    val-red
+                    val-bold
+                  />
+
+
+                  <van-icon
+                    style="flex-shrink: 0"
+                    size="18px"
+                    color="#d50000"
+                    name="delete-o"
+                    @click="skuListDel(i)"
+                  />
+                </div>
+
+              </div>
+              <lw-pagination
+                v-model="skuList.pageNum"
+                :page-total="skuList.pageTotal"
+                :page-size.sync="skuList.pageSize"
+                @change="getSkuListData"
+              />
+              <lw-not-data v-if="!skuList.pageTotal"/>
+
+            </van-tab>
+          </van-tabs>
+        </lw-tab-box>
+
+        <template v-if="tabActive === 'add' && owner.id">
+
+          <div
+            style="padding-bottom: 3px"
+            class="lw-global-model-box"
+            v-for="(i,k) in addSkuList"
+            :key="k"
+          >
+
+            <div class="lw-global-flex-between lw-global-row-start">
+
+              <div class="lw-global-value-bold">
+                {{
+                  $lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.pfsfpqla', '商品') + (k + 1)
+                }}
+              </div>
+
+              <van-icon
+                name="delete"
+                size="18"
+                color="#d50000"
+                @click="delSku(k)"
+              />
+            </div>
+            <lw-search-select-popup-module
+              :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.grrwqosq','商品编码')"
+              :get-focus.sync="i.skuFocus"
+              :create-rule="$lwScanRule.create('指定整托拣选-创建出库单-商品编码','SKU')"
+              rule-key="skuCode"
+              required
+              show-bottom-border
+              :owner-id="owner.id"
+              :api="skuCodeConfirm"
+              @confirm="item=>selectPopupConfirm(item,k)"
+              @clear="selectPopupClear(k)"
+            />
+
+            <template v-if="i.showQty">
+              <lw-title-value-cell
+                :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.lbbzndee','可用库存数')"
+                :value="$lwCheckVal(i.abQty)"
+                val-bold
+              />
+              <lw-get-qty-by-type
+                :ref="i.qtyRef"
+                :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.zrrojbff','出库数量')"
+                :sku-id="i.skuId"
+                :show-bottom-border="false"
+                init-focus
+              />
+
+            </template>
+
+          </div>
+
+          <div
+            style="margin: 20px 0"
+            class="lw-global-flex-center"
+          >
+            <van-icon
+              size="30px"
+              name="add"
+              color="#D50000"
+              @click="addSku"
+            />
+          </div>
+        </template>
+
+      </template>
+
 
     </div>
 
-    <lw-bottom-bar>
+    <lw-bottom-bar v-if="owner.id">
 
-      <lw-button @click="confirmCreate">
-        {{ $lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.ohrkeshv','保存') }}
+      <lw-button
+        v-if="soId"
+        type="last"
+        @click="actionPick"
+      >
+        {{ $lwLanguage.get('', '执行拣选') }}
+      </lw-button>
+
+      <lw-button
+        v-if="tabActive==='add'"
+        @click="confirmCreate"
+      >
+        {{ $lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.ohrkeshv', '保存') }}
       </lw-button>
 
     </lw-bottom-bar>
 
+    <!-- 商品编辑弹框 -->
+    <lw-popup
+      :title="$lwLanguage.get('', '编辑商品')"
+      v-model="editPopup.show"
+    >
 
+      <lw-search-select-popup-module
+        ref="editSku"
+        v-model="editPopup.skuId"
+        :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.grrwqosq','商品编码')"
+        :get-focus.sync="editPopup.skuFocus"
+        :create-rule="$lwScanRule.create('指定整托拣选-创建出库单-商品编码','SKU')"
+        rule-key="skuCode"
+        required
+        show-bottom-border
+        :owner-id="owner.id"
+        :api="skuCodeConfirm"
+        @confirm="editPopupSkuConfirm"
+        @clear="editPopupSkuClear"
+      />
+      <lw-title-value-cell
+        :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.lbbzndee','可用库存数')"
+        :value="$lwCheckVal(editPopup.abQty)"
+        val-bold
+      />
+      <lw-get-qty-by-type
+        v-if="editPopup.showQty"
+        :title="$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.zrrojbff','出库数量')"
+        ref="editPopupQty"
+        :sku-id="editPopup.skuId"
+        :init-qty="editPopup.qty"
+        init-focus
+      />
+
+      <template #button>
+
+        <lw-button @click="editPopupConfirm">
+          {{ $lwLanguage.get('', '保存') }}
+        </lw-button>
+
+      </template>
+
+    </lw-popup>
+
+    <!-- 目的地编码弹框 -->
+    <lw-much-data-select-popup-module
+      :title="$lwLanguage.get('','目的地编码')"
+      v-model="address.show"
+      :create-rule="$lwScanRule.create('指定整托拣选-创建出库单-目的地编码','ADDRESS')"
+      rule-key="address"
+      :api="getAddressList"
+      @confirm="item=>searchCellSelectPopupConfirm('address',item)"
+    />
+
+
+    <!-- 承运商弹框 -->
+    <lw-much-data-select-popup-module
+      :title="$lwLanguage.get('','承运商')"
+      v-model="carrierCodeSelectPopupShow"
+      :api="getCarrierList"
+      @confirm="carrierConfirm"
+    />
+
+
+    <!-- 司机弹框 -->
+    <lw-much-data-select-popup-module
+      :title="$lwLanguage.get('','司机')"
+      v-model="carrierDriverSelectPopupShow"
+      :api="getDriverList"
+      :label-key="['code','name','phone']"
+      @confirm="driverConfirm"
+    />
   </div>
 </template>
 
@@ -170,11 +519,10 @@ import {
   projectWmsOutboundPDAGetReturnTypes,
   projectWmsOutboundPDAQuerySkuInvAbQty,
   projectWmsOutboundPDASoCreate,
+  projectWmsOutboundPDASoQueryLinePage,
   projectWmsOutboundPDASoQueryUpdateInfo,
   projectWmsOutboundPDASoSubmitUpdateInfo,
-  wmsMobileGetOwnerSku,
-  wmsMobileGetWarehouseCustomer,
-  wmsMobileGetWarehouseOwner
+  wmsMobileQueryCompanyList,
 } from "../../api/outbound/pickConsole/orderPick";
 
 export default {
@@ -182,11 +530,58 @@ export default {
   props: {
     // 执行任务的路径
     actionPath: String,
+
+    // 是否显示必须装车发运开关
+    showNeedDeliverySwitch: {
+      type: Boolean,
+      default: true
+    },
+
+    // 是否显示发运单信息
+    showDeliveryInfo: {
+      type: Boolean,
+      default: true
+    },
+
+    // 是否显示商品tab
+    showSkuTab: {
+      type: Boolean,
+      default: true
+    },
+    operateType: String
   },
   data() {
     return {
+
+      // 初始化结束标识
       initOver: false,
 
+      // 出库单id
+      soId: '',
+      tabActive: 'add',
+
+      // 增加的商品列表
+      addSkuList: [],
+      // 商品列表
+      skuList: {
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
+        data: []
+      },
+
+      // 编辑商品弹框
+      editPopup: {
+        show: false,
+        skuId: '',
+        soLineId: '',
+        skuFocus: false,
+        skuInitData: {},
+        abQty: '',
+        qty: '',
+        showQty: false,
+      },
+
       navTitle: '',
 
       owner: {
@@ -194,45 +589,59 @@ export default {
         code: '',
         name: '',
         id: '',
-
-        initVal: null
       },
-
       customer: {
         focus: false,
         code: '',
         name: '',
         id: '',
-
-        initVal: null
       },
-
       type: '',
       planTime: '',
       extSoNo: '',
+      address: {
+        focus: false,
+        code: '',
+        id: '',
+        name: '',
+        show: false,
+      },
+      // 选择承运商弹框
+      carrierCodeSelectPopupShow: false,
+      // 选择司机弹框
+      carrierDriverSelectPopupShow: false,
+
       remark: '',
+
       // 退货
       back: {
         value: '',
         list: []
       },
 
-      skuList: [],
-      // 编辑时使用
-      oldSkuList: [],
-
-      skuPopup: {
-        show: false,
-        index: '',
-        search: '',
-        list: [],
-        result: ''
+      // 装车发运数据
+      needLoadShip: false,
+      dispatchAdd: false,
+      dispatchData: {
+        carrierCode: '',
+        carrierName: '',
+        carrierContact: '',
+        carrierPhone: '',
+        carrierPlateNum: '',
+        carrierCarriageNum: '',
+        carrierDriver: '',
+        carrierDriverPhone: '',
+        transportPlanNo: '',
+        carrierDeliveryNo: '',
+        extDeliveryNo: '',
+        planDeliveryTime: ''
       }
+
     }
   },
   computed: {
     inputDisabled() {
-      return this.skuList.some(item => item.skuCode)
+      return this.addSkuList.some(item => item.skuCode)
     },
     // 是否显示退货方式
     showBackCell() {
@@ -240,6 +649,7 @@ export default {
     }
   },
   created() {
+    this.soId = this.$route.query.soId || ''
     this.init()
   },
   methods: {
@@ -247,45 +657,53 @@ export default {
     async init() {
       projectWmsOutboundPDAGetReturnTypes().then(res => this.back.list = res || [])
 
-      if (this.$route.query.soId) {
+      if (this.soId) {
         await this.getEditData()
       } else {
-        this.navTitle = this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.fwkkyudh','创建出库订单')
+        this.navTitle = this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.fwkkyudh', '创建出库订单')
       }
       this.initOver = true
+
+      this.$nextTick(() => {
+        if (this.$route.query.soId) {
+          this.$refs.owner.initEchoData(true)
+          this.$refs.customer.formatDataAndDisabled({
+            code: this.customer.code,
+            name: this.customer.name,
+          })
+        }
+      })
+    },
+
+    // 获取客户数据
+    getCustomerData(data) {
+      return wmsMobileQueryCompanyList({
+        ...data,
+        ownerId: this.owner.id
+      })
     },
 
     // 获取编辑数据
     async getEditData() {
-      this.navTitle = this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.ztrauljn','修改出库订单')
+      this.navTitle = this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.ztrauljn', '修改出库订单')
 
       try {
         const res = await projectWmsOutboundPDASoQueryUpdateInfo({
-          soId: this.$route.query.soId
+          soId: this.soId
         })
 
-        const {ownerCode, ownerName, customerCode, customerName} = res
+        this.owner.code = res.ownerCode
+        this.owner.name = res.ownerName
+        this.owner.id = res.ownerId
+        this.owner.focus = false
 
-        this.owner = {
-          code: ownerCode,
-          name: ownerName,
-          id: res.ownerId,
-          focus: false,
-          initVal: {
-            code: ownerCode,
-            name: ownerName
-          }
-        }
+        this.customer.code = res.customerCode
+        this.customer.name = res.customerName
+        this.customer.id = res.customerId
 
-        this.customer = {
-          code: customerCode,
-          name: customerName,
-          focus: false,
-          initVal: {
-            code: customerCode,
-            name: customerName
-          }
-        }
+        this.address.code = res.destinationCode
+        this.address.name = res.destinationName
+        this.address.id = res.destinationId
 
         this.type = res.type
         this.planTime = res.planShipTime
@@ -293,73 +711,36 @@ export default {
         this.remark = res.remark
         this.back.value = res.returnMethod
 
-        this.skuList = res.skuList.map(item => {
-          return {
-            ...item,
-            initVal: {
-              code: item.skuCode,
-              name: item.skuName
-            },
-            txCode: 'U'
-          }
-        })
 
-        this.oldSkuList = res.skuList
+        this.needLoadShip = this.showNeedDeliverySwitch && res.needLoadShip
+
+        this.showSkuTab && this.getSkuListData()
       } catch {
         history.go(-1)
       }
     },
 
-    // 货主、客户 - 获取数据API
-    ownerCustomerApi(type, keyword) {
-      return type === 'owner' ?
-        wmsMobileGetWarehouseOwner({keyword}) :
-        wmsMobileGetWarehouseCustomer({keyword})
-
-    },
-
-    // 货主、客户 - 选择弹框 - 确认
-    ownerCustomerPopupConfirm(type, item) {
-      this[type].code = item.code
-      this[type].id = item.id
-      this[type].name = item.name
-
-      if (type === 'owner') {
-        this.customer.focus = true
-        !this.skuList.length && this.addSku()
-      }
 
-    },
-    // 货主、客户 - 选择弹框 - 清空
-    ownerCustomerPopupClear(type) {
-      this[type].code = ''
-      this[type].name = ''
-      this[type].id = ''
-
-      if (type === 'owner') {
-        this.skuList = []
-      }
-    },
     // 校验单头数据是否填写完整
     checkOrderInfo() {
 
       if (!this.owner.id) {
         this.owner.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.aofuajos','请选择货主')
+          this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.aofuajos', '请选择货主')
         )
         return false
       }
       if (!this.customer.code) {
         this.customer.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.irsfctlr','请选择客户')
+          this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.irsfctlr', '请选择客户')
         )
         return false
       }
       const msg = {
-        type: this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.xdqoumzx','请选择订单类型'),
-        extSoNo: this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.jgzswggr','请输入外部单号'),
+        type: this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.xdqoumzx', '请选择订单类型'),
+        extSoNo: this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.jgzswggr', '请输入外部单号'),
       }
 
       for (const i in msg) {
@@ -373,10 +754,41 @@ export default {
 
     },
 
-    // 外部单号输入确认
-    extSoNoConfirm() {
-      if (this.skuList.length) {
-        const firstSku = this.skuList[0]
+    // 货主选择弹框 - 确认
+    ownerConfirm(item) {
+      this.searchCellSelectPopupConfirm('owner', item)
+      this.customer.focus = true
+      !this.addSkuList.length && this.addSku()
+    },
+    // 货主选择弹框 - 清空
+    ownerClear() {
+      this.searchCellSelectPopupClear('owner')
+      this.searchCellSelectPopupClear('customer')
+      this.searchCellSelectPopupClear('address')
+      this.type = ''
+      this.planTime = ''
+      this.extSoNo = ''
+      this.remark = ''
+      this.addSkuList = []
+    },
+
+    // 搜索行选择弹框 - 确认
+    searchCellSelectPopupConfirm(type, item) {
+      this[type].code = item.code
+      this[type].id = item.id
+      this[type].name = item.name
+    },
+    // 搜索行选择弹框 - 清空
+    searchCellSelectPopupClear(type) {
+      this[type].code = ''
+      this[type].name = ''
+      this[type].id = ''
+    },
+
+    // 检查是否存在商品信息，并获取焦点
+    checkSkuListAndFocus() {
+      if (this.showSkuTab && this.addSkuList.length) {
+        const firstSku = this.addSkuList[0]
         if (firstSku.skuCode) {
           firstSku.qtyFocus = true
         } else {
@@ -385,6 +797,59 @@ export default {
       }
     },
 
+    // 获取地址信息
+    getAddressList(data) {
+      return this.$lwApi.common.getAddressList({
+        ...data,
+        ownerId: this.customer.id,
+        queryNullOwner: true
+      })
+    },
+
+    // 承运商编码确认
+    carrierConfirm(item) {
+      this.dispatchData.carrierCode = item.code
+      this.dispatchData.carrierName = item.name
+      this.dispatchData.carrierContact = item.contact
+      this.dispatchData.carrierPhone = item.phone
+    },
+    // 必须装车发运开关变化
+    needLoadShipChange(val) {
+      if (!val) {
+        this.dispatchAdd = false
+        this.dispatchAddChange(val)
+      }
+    },
+    // 新增发运单开关变化
+    dispatchAddChange(val) {
+      if (!val) {
+        for (const k in this.dispatchData) {
+          this.dispatchData[k] = ''
+        }
+      }
+    },
+
+    // 获取承运商数据
+    getCarrierList(data) {
+      return this.$lwApi.common.searchCarrier({
+        ...data,
+        ownerId: this.owner.id
+      })
+    },
+    // 获取司机数据
+    getDriverList(data) {
+      return this.$lwApi.common.getDriverList({
+        ...data,
+        carrierCode: this.dispatchData.carrierCode,
+        ownerId: this.owner.id
+      })
+    },
+    // 司机确认
+    driverConfirm(item) {
+      this.dispatchData.carrierDriver = item.code
+      this.dispatchData.carrierDriverPhone = item.phone
+    },
+
 
     // 增加商品
     async addSku() {
@@ -392,18 +857,19 @@ export default {
       if (!this.owner.id) {
         this.owner.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.aofuajos','请选择货主')
+          this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.aofuajos', '请选择货主')
         )
         return
       }
 
-      this.skuList.push({
+      this.addSkuList.push({
         skuCode: '',
         skuFocus: true,
         skuName: '',
         skuQty: '',
         abQty: '',
-        qtyFocus: false,
+        qtyRef: Date.now(),
+        showQty: false,
         skuId: '',
         txCode: 'I'
       })
@@ -411,121 +877,250 @@ export default {
     },
     // 删除商品
     delSku(index) {
-      this.skuList.splice(index, 1)
+      this.addSkuList.splice(index, 1)
     },
 
 
     // 搜索商品
-    skuCodeConfirm(keyword) {
-      return wmsMobileGetOwnerSku({
-        ownerId: this.owner.id,
-        keyword
+    skuCodeConfirm(data) {
+      return this.$lwApi.common.searchSku({
+        ...data,
+        ownerId: this.owner.id
       })
     },
     // 商品选择弹框 - 确认选择
     selectPopupConfirm(item, index) {
-
-      // const {code, name, id} = item
-      /*this.skuList[index].skuCode = code
-      this.skuList[index].skuName = name
-      this.skuList[index].skuId = id*/
-
       projectWmsOutboundPDAQuerySkuInvAbQty({
         ownerId: this.owner.id,
         skuId: item.id
       }).then(res => {
-        this.skuList[index].skuCode = res.skuCode
-        this.skuList[index].skuName = res.skuName
-        this.skuList[index].skuId = res.skuId
-        this.skuList[index].abQty = res.abQty
-        this.skuList[index].qtyFocus = true
+        this.addSkuList[index].skuCode = res.skuCode
+        this.addSkuList[index].skuName = res.skuName
+        this.addSkuList[index].skuId = res.skuId
+        this.addSkuList[index].abQty = res.abQty
+        this.addSkuList[index].showQty = true
       })
 
     },
     // 商品选择弹框 - 清除商品
     selectPopupClear(index) {
-      this.skuList[index].skuCode = ''
-      this.skuList[index].skuName = ''
-      this.skuList[index].skuId = ''
-      this.skuList[index].skuQty = ''
-      this.skuList[index].abQty = ''
+      this.addSkuList[index].skuCode = ''
+      this.addSkuList[index].skuName = ''
+      this.addSkuList[index].skuId = ''
+      this.addSkuList[index].skuQty = ''
+      this.addSkuList[index].abQty = ''
     },
 
-    // 创建出库订单
-    async confirmCreate() {
+    // tab切换
+    tabChange() {
+      if (this.tabActive === 'list' && !this.skuList.pageTotal) {
+        this.getSkuListData()
+      }
+    },
 
-      if (!this.checkOrderInfo()) return
+    // 商品列表 - 获取数据
+    getSkuListData() {
+      projectWmsOutboundPDASoQueryLinePage({
+        pageSize: this.skuList.pageSize,
+        pageNum: this.skuList.pageNum,
+        soId: this.soId
+      }).then(res => {
+        this.skuList.data = res.datas
+        this.skuList.pageTotal = res.total || 0
+      })
+    },
+    // 商品列表 - 删除
+    skuListDel(item) {
+      this.$lwDialog.confirm({
+        type: 'warning',
+        title: this.$lwLanguage.get('', '提示'),
+        message: this.$lwLanguage.get('', '确认删除商品{name}?', {name: item.skuName}),
+      }).then(async () => {
+        await this.submitSoData([{...item, txCode: 'D'}])
+        this.$lwToast.success(
+          this.$lwLanguage.get('', '已删除')
+        )
+        this.getSkuListData()
+      })
+    },
+    // 商品列表 - 编辑 - 打开弹框
+    skuListEdit(item) {
+      this.editPopup.skuInitData = {
+        code: item.skuCode,
+        name: item.skuName
+      }
+      this.editPopup.abQty = item.abnQty
+      this.editPopup.qty = item.skuQty
+      this.editPopup.skuId = item.skuId
+      this.editPopup.soLineId = item.soLineId
+      this.editPopup.show = true
+      this.editPopup.showQty = true
+      this.$nextTick(() => this.$refs.editSku.initEchoData(true))
+    },
+    // 商品列表 - 编辑 - 商品选择确认
+    editPopupSkuConfirm(item) {
+      this.editPopup.showQty = false
+      projectWmsOutboundPDAQuerySkuInvAbQty({
+        ownerId: this.owner.id,
+        skuId: item.id
+      }).then(res => {
+        this.editPopup.skuId = res.skuId
+        this.editPopup.abQty = res.abQty
+        this.editPopup.showQty = true
+      })
+    },
+    // 商品列表 - 编辑 - 商品删除
+    editPopupSkuClear() {
+      this.editPopup.skuId = ''
+      this.editPopup.abQty = ''
+      this.editPopup.skuFocus = true
+      this.editPopup.qty = ''
+      this.editPopup.showQty = false
+    },
+    // 商品列表 - 编辑 - 商品保存
+    async editPopupConfirm() {
+      const {skuId, soLineId} = this.editPopup
 
-      if (!this.skuList.length) {
+      if (!skuId) {
+        this.editPopup.skuFocus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '商品信息不能为空')
+        )
+        return
+      }
+      const skuQty = this.$refs.editPopupQty?.getQty() || 0
+      if (!skuQty) {
+        this.editPopup.skuFocus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.ifphsyjt','请添加商品信息')
+          this.$lwLanguage.get('', '出库数量不能为空，且应当是大于0的正整数')
         )
         return
       }
 
-      for (let i = 0; i < this.skuList.length; i++) {
-        if (!this.skuList[i].skuCode) {
-          this.$lwShowErrorMsg(
-            this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.pqwhxqsb','商品{num}，商品信息不能为空', {num: i + 1})
-          )
-          return
+      await this.submitSoData([{
+        skuId,
+        skuQty,
+        txCode: 'U',
+        soLineId
+      }])
+
+      this.$lwToast.success(
+        this.$lwLanguage.get('', '操作成功')
+      )
+      this.getSkuListData()
+      this.editPopup.show = false
+    },
+
+    // 执行拣选
+    actionPick() {
+      if (this.$route.query.soId) {
+        history.go(-1)
+        return
+      }
+
+      this.$router.push({
+        path: this.actionPath,
+        query: {
+          lwOrderId: this.soId,
+          lwBackStep: '2'
         }
-        if (!Number(this.skuList[i].skuQty || 0)) {
-          this.$lwShowErrorMsg(
-            this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.muzbqnkt','商品{num}，出库数量不能为空且应当是大于0的整数', {num: i + 1})
-          )
-          return
+      })
+    },
+    // 检查商品必填项
+    skuCheck() {
+
+      if (!this.showSkuTab) return true
+
+      if (!this.soId && !this.addSkuList.length) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.ifphsyjt', '请添加商品信息')
+        )
+        return false
+      }
+
+      if (this.addSkuList.length) {
+
+        for (let i = 0; i < this.addSkuList.length; i++) {
+          const item = this.addSkuList[i]
+          if (!item.skuCode) {
+            this.$lwShowErrorMsg(
+              this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.pqwhxqsb', '商品{num}，商品信息不能为空', {num: i + 1})
+            )
+            return false
+          }
+          const skuQty = this.$refs[item.qtyRef][0].getQty()
+          if (!skuQty) {
+            this.$lwShowErrorMsg(
+              this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.muzbqnkt', '商品{num}，出库数量不能为空且应当是大于0的整数', {num: i + 1})
+            )
+            return false
+          }
+          this.addSkuList[i].skuQty = skuQty
         }
       }
 
-      const soId = this.$route.query.soId
-      const api = soId ? projectWmsOutboundPDASoSubmitUpdateInfo : projectWmsOutboundPDASoCreate
+      return true
 
-      let skuList = this.$lwDeepCopy(this.skuList)
+    },
+    // 保存
+    async confirmCreate() {
 
-      if (soId) {
-        const newSku = this.skuList.filter(item => item.soLineId).map(item => item.soLineId)
-        this.oldSkuList.forEach(item => {
-          if (!newSku.includes(item.soLineId)) skuList.push({
-            ...item,
-            txCode: 'D'
-          })
-        })
+      if (!this.checkOrderInfo() || !this.skuCheck()) return
+
+      // 检查运单信息
+      if (this.needLoadShip && this.dispatchAdd && !this.dispatchData.planDeliveryTime) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '计划发运时间不能为空')
+        )
+        return
       }
 
+      await this.submitSoData(this.showSkuTab ? this.addSkuList : [])
+
+      const msg = this.soId ?
+        this.$lwLanguage.get('', '操作成功') :
+        this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.esmoutbc', '订单创建成功')
+
+      this.$lwToast.success(msg)
 
-      const res = await api({
-        soId,
+      this.addSkuList = []
+      this.skuList.pageNum = 1
+      this.getSkuListData()
+    },
+    // 提交出库单数据
+    async submitSoData(skuList) {
+      let api = projectWmsOutboundPDASoSubmitUpdateInfo
+      let param = {
         ownerId: this.owner.id,
         customerCode: this.customer.code,
         customerName: this.customer.name,
+        customerId: this.customer.id,
         type: this.type,
         planShipTime: this.planTime,
         extSoNo: this.extSoNo,
         remark: this.remark,
+        returnMethod: this.back.value,
+        soId: this.soId,
         skuList,
-        returnMethod: this.back.value
-      })
-
-      const msg = soId ?
-        this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.ijdsqdyw','订单修改成功') :
-        this.$lwLanguage.get('wms_project.pda.wms.components.consoleAndPick.createOrderPage.esmoutbc','订单创建成功')
-
-      this.$lwToast.success(msg)
-
-      if (soId) {
-        history.go(-1)
-        return
+        destinationCode: this.address.code,
+        destinationName: this.address.name,
+        destinationId: this.address.id,
+        operateType: this.operateType
       }
 
-      this.$router.push({
-        path: this.actionPath,
-        query: {
-          lwOrderId: res.id,
-          lwBackStep: '2'
+      if (!this.soId) {
+        api = projectWmsOutboundPDASoCreate
+        param = {
+          ...param,
+          needLoadShip: this.needLoadShip,
+          ...this.dispatchData
         }
-      })
-    },
+      }
+
+      const res = await api(param)
+      this.soId = res.id
+      this.needLoadShip = res.needLoadShip
+    }
 
   }
 }