feat: 修改

src/views/supply/pickup/components/pickup_form.vue

@@ -162,7 +162,7 @@
       </el-form>
     </div>
 
-    <div class="mymain-container">
+    <div class="mymain-container" v-if="logisticsNumber === '001' && mainForm.pickupWay == 2 && flag">
       <div class="table">
         <el-table
           ref="table"
@@ -171,15 +171,14 @@
           element-loading-text="Loading"
           border
           fit
-          height="520"
           highlight-current-row
           stripe
+          height="520px"
           @select="handleSelect"
           @select-all="handleSelectAll"
-        >
+          >
           <el-table-column align="center" type="selection" width="55" />
-
-          <template v-if="logisticsNumber === '001' && mainForm.pickupWay == 2">
+          <template>
             <el-table-column align="left" label="仓库" prop="invoiceId" min-width="160" show-overflow-tooltip>
               <template v-slot="{ row }">
                 <el-select
@@ -288,7 +287,6 @@
               />
             </template>
           </el-table-column>
-
           <el-table-column
             align="left"
             label="工程登录编号"
@@ -301,7 +299,6 @@
               <span>{{ scope.row.refEnginRecordNo }}</span>
             </template>
           </el-table-column>
-
           <el-table-column align="left" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip />
           <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip />
           <el-table-column align="left" label="单据日期" prop="orderTime" min-width="120" show-overflow-tooltip>
@@ -309,9 +306,7 @@
               {{ scope.row.orderTime | dateToDayFilter }}
             </template>
           </el-table-column>
-
           <el-table-column align="left" label="发货申请单" prop="invoiceId" min-width="160" show-overflow-tooltip />
-
           <el-table-column align="left" label="销售订单号" min-width="160" show-overflow-tooltip>
             <template v-if="scope.row" slot-scope="scope">
               <CopyButton
@@ -338,10 +333,8 @@
           <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip />
           <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="160" show-overflow-tooltip />
           <el-table-column align="left" label="物料编码" prop="materialCode" min-width="160" show-overflow-tooltip />
-
           <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip />
-
-          <el-table-column v-if="flag && mainForm.pickupWay == '2'" fixed="right" label="操作" width="250">
+          <el-table-column fixed="right" label="操作" width="250">
             <template slot-scope="scope">
               <el-button type="text" size="small" @click="handLogistics(scope.row)">物流信息</el-button>
               <el-button type="text" size="small" @click="getListCostBillV2(scope.row)">物流费用</el-button>
@@ -351,6 +344,282 @@
         </el-table>
       </div>
     </div>
+    <div class="mymain-container" v-else-if="(logisticsNumber === '001' && mainForm.pickupWay == 2) && !flag">
+      <div class="table">
+        <el-table
+          ref="table"
+          v-loading="listLoading"
+          :data="deliverList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+          height="520px"
+          @select="handleSelect"
+          @select-all="handleSelectAll"
+          >
+          <el-table-column align="center" type="selection" width="55" />
+          <template>
+            <el-table-column align="left" label="仓库" prop="invoiceId" min-width="160" show-overflow-tooltip>
+              <template v-slot="{ row }">
+                <el-select
+                  v-model="row.warehouseFlag"
+                  value-key=""
+                  placeholder=""
+                  :disabled="flag"
+                  filterable
+                  size="mini"
+                  @change="storeChange($event, row)"
+                >
+                  <el-option v-for="item in storeList" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="收货客户" prop="orderTime" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-input
+                  v-if="!(scope.row.orderType === 'TRADE' || scope.row.orderType === 'HOME')"
+                  v-model="scope.row.receivingName"
+                  :disabled="flag || scope.row.warehouseFlag == 0 || scope.row.warehouseFlag == null"
+                  size="mini"
+                  @input="handleInput($event, scope.row.invoiceId, 1)"
+                />
+                <template v-else>
+                  <template v-if="listItem">
+                    <el-input
+                      v-model="scope.row.receivingName"
+                      :disabled="flag || scope.row.warehouseFlag == 0 || scope.row.warehouseFlag == null"
+                      size="mini"
+                    />
+                  </template>
+                  <template v-else>
+                    <el-input
+                      v-model="scope.row.refLinkman"
+                      :disabled="flag || scope.row.warehouseFlag == 0 || scope.row.warehouseFlag == null"
+                      size="mini"
+                    />
+                  </template>
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="电话" prop="orderTime" min-width="150" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-input
+                  v-if="!(scope.row.orderType === 'TRADE' || scope.row.orderType === 'HOME')"
+                  v-model="scope.row.phone"
+                  :disabled="flag || scope.row.warehouseFlag == 0 || scope.row.warehouseFlag == null"
+                  size="mini"
+                  @input="handleInput($event, scope.row.invoiceId, 2)"
+                />
+                <template v-else>
+                  <template v-if="listItem">
+                    <el-input
+                      v-model="scope.row.phone"
+                      :disabled="flag || scope.row.warehouseFlag == 0 || scope.row.warehouseFlag == null"
+                      size="mini"
+                    />
+                  </template>
+                  <template v-else>
+                    <el-input
+                      v-model="scope.row.refPhone"
+                      :disabled="flag || scope.row.warehouseFlag == 0 || scope.row.warehouseFlag == null"
+                      size="mini"
+                    />
+                  </template>
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="收货地址" prop="orderTime" min-width="200" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-input
+                  v-if="!(scope.row.orderType === 'TRADE' || scope.row.orderType === 'HOME')"
+                  v-model="scope.row.address"
+                  :disabled="flag || scope.row.warehouseFlag == 0 || scope.row.warehouseFlag == null"
+                  size="mini"
+                  @input="handleInput($event, scope.row.invoiceId, 3)"
+                />
+                <template v-else>
+                  <template v-if="listItem">
+                    <el-input
+                      v-model="scope.row.address"
+                      :disabled="flag || scope.row.warehouseFlag == 0 || scope.row.warehouseFlag == null"
+                      size="mini"
+                    />
+                  </template>
+                  <template v-else>
+                    <el-input
+                      v-model="scope.row.refInstallAddress"
+                      :disabled="flag || scope.row.warehouseFlag == 0 || scope.row.warehouseFlag == null"
+                      size="mini"
+                    />
+                  </template>
+                </template>
+              </template>
+            </el-table-column>
+          </template>
+          <el-table-column align="left" label="经销商订单" prop="customerOrderId" min-width="160" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.customerOrderId"
+                placeholder="请输入"
+                size="mini"
+                clearable
+                @input="handleOrderIdChange($event, scope.row)"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="left"
+            label="工程登录编号"
+            prop="refEnginRecordNo"
+            min-width="160"
+            show-overflow-tooltip
+          >
+            <template v-if="scope.row" slot-scope="scope">
+              <CopyButton :copy-text="scope.row.refEnginRecordNo" />
+              <span>{{ scope.row.refEnginRecordNo }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip />
+          <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip />
+          <el-table-column align="left" label="单据日期" prop="orderTime" min-width="120" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.orderTime | dateToDayFilter }}
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="发货申请单" prop="invoiceId" min-width="160" show-overflow-tooltip />
+          <el-table-column align="left" label="销售订单号" min-width="160" show-overflow-tooltip>
+            <template v-if="scope.row" slot-scope="scope">
+              <CopyButton
+                :copy-text="
+                  scope.row.orderType === 'TRADE' ||
+                  scope.row.orderType === 'HOME' ||
+                  scope.row.orderType === 'REQUISITION_TRADE' ||
+                  scope.row.orderType === 'REQUISITION_HOME'
+                    ? scope.row.enginOrderNo
+                    : scope.row.mainOrderId
+                "
+              />
+              <span>{{
+                scope.row.orderType === 'TRADE' ||
+                scope.row.orderType === 'HOME' ||
+                scope.row.orderType === 'REQUISITION_TRADE' ||
+                scope.row.orderType === 'REQUISITION_HOME'
+                  ? scope.row.enginOrderNo
+                  : scope.row.mainOrderId
+              }}</span>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column align="left" label="工程编号" prop="enginOrderNo" min-width="140" show-overflow-tooltip></el-table-column> -->
+          <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip />
+          <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="160" show-overflow-tooltip />
+          <el-table-column align="left" label="物料编码" prop="materialCode" min-width="160" show-overflow-tooltip />
+          <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip />
+        </el-table>
+      </div>
+    </div>
+    <div class="mymain-container" v-else-if="logisticsNumber !== '001' && (mainForm.pickupWay == 2 && flag)">
+      <div class="table">
+        <el-table
+          ref="table"
+          v-loading="listLoading"
+          :data="deliverList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+          height="520px"
+          @select="handleSelect"
+          @select-all="handleSelectAll"
+          >
+          <el-table-column align="center" type="selection" width="55" />
+          <el-table-column align="left" label="经销商订单" prop="customerOrderId" min-width="160" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.customerOrderId"
+                placeholder="请输入"
+                size="mini"
+                clearable
+                @input="handleOrderIdChange($event, scope.row)"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="left"
+            label="工程登录编号"
+            prop="refEnginRecordNo"
+            min-width="160"
+            show-overflow-tooltip
+          >
+            <template v-if="scope.row" slot-scope="scope">
+              <CopyButton :copy-text="scope.row.refEnginRecordNo" />
+              <span>{{ scope.row.refEnginRecordNo }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip />
+          <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip />
+          <el-table-column align="left" label="单据日期" prop="orderTime" min-width="120" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.orderTime | dateToDayFilter }}
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="发货申请单" prop="invoiceId" min-width="160" show-overflow-tooltip />
+          <el-table-column align="left" label="销售订单号" min-width="160" show-overflow-tooltip>
+            <template v-if="scope.row" slot-scope="scope">
+              <CopyButton
+                :copy-text="
+                  scope.row.orderType === 'TRADE' ||
+                  scope.row.orderType === 'HOME' ||
+                  scope.row.orderType === 'REQUISITION_TRADE' ||
+                  scope.row.orderType === 'REQUISITION_HOME'
+                    ? scope.row.enginOrderNo
+                    : scope.row.mainOrderId
+                "
+              />
+              <span>{{
+                scope.row.orderType === 'TRADE' ||
+                scope.row.orderType === 'HOME' ||
+                scope.row.orderType === 'REQUISITION_TRADE' ||
+                scope.row.orderType === 'REQUISITION_HOME'
+                  ? scope.row.enginOrderNo
+                  : scope.row.mainOrderId
+              }}</span>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column align="left" label="工程编号" prop="enginOrderNo" min-width="140" show-overflow-tooltip></el-table-column> -->
+          <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip />
+          <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="160" show-overflow-tooltip />
+          <el-table-column align="left" label="物料编码" prop="materialCode" min-width="160" show-overflow-tooltip />
+          <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip />
+          <el-table-column fixed="right" label="操作" width="250">
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click="handLogistics(scope.row)">物流信息</el-button>
+              <el-button type="text" size="small" @click="getListCostBillV2(scope.row)">物流费用</el-button>
+              <el-button type="text" size="small" @click="getListCodeV2(scope.row)">出库条码</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button v-if="!flag" type="primary" :loading="formLoading" @click="clickSubmitForm"