调拨单修改

src/api/purchase/basic.js

@@ -45,4 +45,12 @@ export function getRefer(data) {
     method: 'post',
     data: data
   })
+}
+// 查询批次号参照
+export function getBatchRefer(data) {
+  return request({
+    url: `/pu/allot/queryPatchCode?pageSize=${data.pageSize}&pageNum=${data.pageNo}`,
+    method: 'post',
+    data: data
+  })
 }

src/components/Refers/batchRefer.vue

@@ -0,0 +1,171 @@
+<template>
+  <div>
+    <el-dialog :title="reciveForm.title" width="1000px" :close-on-click-modal="false" :append-to-body="true" v-dialogDrag
+      class="userDialog" :visible.sync="visible">
+      <el-container style="height: 500px">
+        <el-container>
+          <el-header style="text-align: left; font-size: 12px; height: 30px">
+            <el-form size="small" :inline="true" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()"
+              @submit.native.prevent>
+              <el-form-item prop="param" label="名称/编号">
+                <el-input size="small" v-model="searchForm.search" placeholder="输入名称/编号查询" clearable></el-input>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
+                <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
+              </el-form-item>
+            </el-form>
+          </el-header>
+          <el-main>
+            <el-table :data="dataList" v-loading="loading" size="small" border ref="contractTable"
+              @select="handleSelectionChange" @row-click="rowSelect" height="calc(100% - 40px)" style="width: 100%">
+              <el-table-column type="selection" header-align="center" align="center" width="50">
+              </el-table-column>
+              <el-table-column prop="id" header-align="center" align="center" sortable="custom" min-width="90" label="id">
+              </el-table-column>
+              <el-table-column prop="name" header-align="center" align="center" sortable="custom" min-width="90"
+                label="名称">
+              </el-table-column>
+            </el-table>
+            <el-pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
+              :current-page="searchForm.pageNo" :page-sizes="[5, 10, 15, 20]" :page-size="searchForm.pageSize"
+              :total="total" layout="total, sizes, prev, pager, next, jumper">
+            </el-pagination>
+          </el-main>
+        </el-container>
+      </el-container>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="visible = false" icon="el-icon-circle-close">关闭</el-button>
+        <el-button size="small" type="primary" icon="el-icon-circle-check" @click="doSubmit()">确定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getBatchRefer } from '@/api/purchase/basic'
+export default {
+  data() {
+    return {
+      searchForm: {
+        search: '',
+        pageNo: 1,
+        pageSize: 10,
+      },
+      reciveForm: {},
+      dataListAllSelections: [], // 所有选中的数据包含跨页数据
+      idKey: "id", // 标识列表数据中每一行的唯一键的名称(需要按自己的数据改一下)
+      dataList: [],
+      total: 0,
+      orders: [],
+      loading: false,
+      visible: false,
+    };
+  },
+  props: {
+    selectData: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+    // 是否启用单选
+    single: {
+      type: Boolean,
+      default: false
+    }
+  },
+  methods: {
+    init(val) {
+      this.visible = true;
+      console.log("🚀 ~ file: refers.vue:79 ~ init ~ init(val):", val)
+      this.reciveForm = val
+      this.searchForm.search = ''
+      this.$nextTick(() => {
+        this.dataListAllSelections = JSON.parse(JSON.stringify(this.selectData));
+        this.resetSearch();
+      });
+    },
+    // 获取数据列表
+    refreshList() {
+      this.loading = true;
+      let params = { ...this.searchForm, ...this.reciveForm }
+      getBatchRefer(params).then(res => {
+        console.log('res', res)
+        this.dataList = res.rows;
+        this.total = res.total
+        this.loading = false;
+        this.$nextTick(() => {
+          this.setSelectRow();
+        });
+      });
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.searchForm.pageSize = val;
+      this.refreshList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.searchForm.pageNo = val;
+      this.refreshList();
+    },
+    // 排序
+    resetSearch() {
+      this.$refs['searchForm'].resetFields();
+      this.searchForm.pageNo = 1;
+      this.refreshList();
+    },
+    // 表格选中数据
+    rowSelect(row, column, event) {
+      this.$refs.contractTable.clearSelection();
+      this.$refs.contractTable.toggleRowSelection(row);
+      this.dataListAllSelections = this.single ? [row] : selection
+    },
+    // 选中数据
+    handleSelectionChange(selection, row) {
+      if (this.single && selection.length > 1) {
+        this.$refs.contractTable.clearSelection();
+        this.$refs.contractTable.toggleRowSelection(row);
+      }
+      this.dataListAllSelections = this.single ? [row] : selection
+    },
+    // 设置选中的方法
+    setSelectRow() {
+      this.$refs.contractTable.clearSelection();
+      if (!this.dataListAllSelections || this.dataListAllSelections.length <= 0) {
+        return;
+      }
+      for (let i = 0; i < this.dataList.length; i++) {
+        if (this.dataListAllSelections.some(item => item[this.idKey] == this.dataList[i][this.idKey])) {
+          // 设置选中，记住table组件需要使用ref="table"
+          this.$refs.contractTable.toggleRowSelection(this.dataList[i], true);
+        }
+      }
+    },
+    doSubmit() {
+      this.visible = false;
+      console.log('选择的数据？', this.dataListAllSelections)
+      this.$emit("doSubmit", this.dataListAllSelections);
+    },
+  },
+};
+</script>
+<style lang="scss">
+.userDialog {
+  .el-dialog__body {
+    padding: 10px 0px 0px 10px;
+    color: #606266;
+    font-size: 14px;
+    word-break: break-all;
+  }
+
+  .el-main {
+    padding: 20px 20px 5px 20px;
+
+    .el-pagination {
+      margin-top: 5px;
+    }
+  }
+}
+</style>

src/views/purchase/transferOrder/add.vue

@@ -233,11 +233,11 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="物料名称" align="center" prop="materialName"/>
-          <el-table-column label="调拨出库单号" align="center" prop="deliveryCode"/>
-          <el-table-column label="调拨入库单号" align="center" prop="storageCode"/>
+          <el-table-column label="物料名称" align="center" prop="materialName" width="200px"/>
+          <el-table-column label="调拨出库单号" align="center" prop="deliveryCode" width="200px"/>
+          <el-table-column label="调拨入库单号" align="center" prop="storageCode" width="200px"/>
           <el-table-column label="规格" align="center" prop="specification"/>
-          <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer"/>
+          <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer" width="200px"/>
           <el-table-column label="产地" align="center" prop="originPlaceName"/>
           <el-table-column label="型号" align="center" prop="model"/>
           <el-table-column label="单位" align="center" prop="unitName"/>
@@ -260,8 +260,16 @@
           </el-table-column>
           <el-table-column label="税率" align="center" prop="rate"/>
           <!-- <el-table-column label="调入仓库" align="center" prop="storageWarehouseName"/> -->
-          <el-table-column label="批次号" align="center" prop="patchNo"/>
-          <el-table-column label="产品批号" align="center" prop="producBatch"/>
+          <el-table-column label="批次号" align="center" prop="patchNo" width="150px"/>
+          <el-table-column label="产品批号" align="center" prop="producBatch" width="230px">
+            <template slot-scope="scope">
+              <el-form-item class="hang">
+                <el-input readonly size="small" v-model="scope.row.producBatch">
+                  <el-button size="small" :disabled="sonDisable" slot="append" icon="el-icon-more" @click="chooseBatch(scope.$index)"></el-button>
+                </el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
           <el-table-column label="生产日期" align="center" prop="manufactureDate" width="230px">
             <template slot-scope="scope">
               <el-form-item class="hang">
@@ -275,15 +283,15 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate"/>
-          <el-table-column label="批准文号" align="center" prop="ratifyCode"/>
-          <el-table-column label="注册证号" align="center" prop="registration"/>
-          <el-table-column label="商品名" align="center" prop="productCode"/>
-          <el-table-column label="通用名" align="center" prop="commonCode"/>
+          <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
+          <el-table-column label="批准文号" align="center" prop="ratifyCode" width="200px"/>
+          <el-table-column label="注册证号" align="center" prop="registration" width="200px"/>
+          <el-table-column label="商品名" align="center" prop="productCode" width="150px"/>
+          <el-table-column label="通用名" align="center" prop="commonCode" width="150px"/>
           <el-table-column label="剂型" align="center" prop="drug"/>
-          <el-table-column label="调入调出结算规则明细" align="center" prop="ruleDetail"/>
-          <el-table-column label="上市许可持有人" align="center" prop="marketingApprovalPersonal"/>
-          <el-table-column label="生产许可证号/经营许可证号/备案凭证号" align="center" prop="production"/>
+          <el-table-column label="调入调出结算规则明细" align="center" prop="ruleDetail" width="200px"/>
+          <el-table-column label="上市许可持有人" align="center" prop="marketingApprovalPersonal" width="200px"/>
+          <el-table-column label="生产许可证号/经营许可证号/备案凭证号" align="center" prop="production" width="260px"/>
           <el-table-column label="pi码" align="center" prop="pi">
             <template slot-scope="scope">
               <el-form-item class="hang">
@@ -293,9 +301,9 @@
           </el-table-column>
           <!-- <el-table-column label="无税金额" align="center" prop="code"/> -->
           <!-- <el-table-column label="备注" align="center" prop="code"/> -->
-          <el-table-column label="类别" align="center" prop="classify"/>
-          <el-table-column label="客户物料码" align="center" prop="customerLogistic"/>
-          <el-table-column label="客户物料名称" align="center" prop="customerLogisticName"/>
+          <el-table-column label="类别" align="center" prop="classify" width="150px"/>
+          <el-table-column label="客户物料码" align="center" prop="customerLogistic" width="150px"/>
+          <el-table-column label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
           <el-table-column
             fixed="right"
             label="操作"
@@ -315,34 +323,34 @@
           max-height="480"
           >
           <el-table-column label="行号" align="center" prop="rowno"/>
-          <el-table-column label="调拨出库单号" align="center" prop="deliveryCode"/>
-          <el-table-column label="调拨入库单号" align="center" prop="storageCode"/>
-          <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer"/>
-          <el-table-column label="产地" align="center" prop="originPlace"/>
-          <el-table-column label="类别" align="center" prop="classify"/>
-          <el-table-column label="调出仓库" align="center" prop="deliveryWarehouseName"/>
-          <el-table-column label="调入仓库" align="center" prop="storageWarehouseName"/>
+          <el-table-column label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
+          <el-table-column label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
+          <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
+          <el-table-column label="产地" align="center" prop="originPlace" width="150px"/>
+          <el-table-column label="类别" align="center" prop="classify" width="150px"/>
+          <el-table-column label="调出仓库" align="center" prop="deliveryWarehouseName" width="150px"/>
+          <el-table-column label="调入仓库" align="center" prop="storageWarehouseName" width="150px"/>
           <!-- <el-table-column label="收货利润中心" align="center" prop="code"/>
           <el-table-column label="发货利润中心" align="center" prop="code"/> -->
-          <el-table-column label="调入业务员" align="center" prop="businessPersonalName"/>
-          <el-table-column label="产品批号" align="center" prop="productBatch"/>
-          <el-table-column label="生产日期" align="center" prop="manufactureDate"/>
-          <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate"/>
-          <el-table-column label="批准文号" align="center" prop="ratifyCode"/>
-          <el-table-column label="注册证号" align="center" prop="registration"/>
-          <el-table-column label="商品名" align="center" prop="productCode"/>
-          <el-table-column label="通用名" align="center" prop="commonCode"/>
-          <el-table-column label="剂型" align="center" prop="drug"/>
-          <el-table-column label="收货客户" align="center" prop="customerName"/>
-          <el-table-column label="收货地址" align="center" prop="addressaddress"/>
-          <el-table-column label="收货地区" align="center" prop="area"/>
-          <el-table-column label="收货地点" align="center" prop="place"/>
-          <el-table-column label="计划发货日期" align="center" prop="deliveryDate"/>
-          <el-table-column label="计划到货日期" align="center" prop="strageDate"/>
-          <el-table-column label="运输方式" align="center" prop="transportation"/>
-          <el-table-column label="备注" align="center" prop="remark"/>
-          <el-table-column label="客户物料编码" align="center" prop="customerLogistic"/>
-          <el-table-column label="客户物料名称" align="center" prop="customerLogisticName"/>
+          <el-table-column label="调入业务员" align="center" prop="businessPersonalName" width="150px"/>
+          <el-table-column label="产品批号" align="center" prop="productBatch" width="150px"/>
+          <el-table-column label="生产日期" align="center" prop="manufactureDate" width="150px"/>
+          <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
+          <el-table-column label="批准文号" align="center" prop="ratifyCode" width="150px"/>
+          <el-table-column label="注册证号" align="center" prop="registration" width="150px"/>
+          <el-table-column label="商品名" align="center" prop="productCode" width="150px"/>
+          <el-table-column label="通用名" align="center" prop="commonCode" width="150px"/>
+          <el-table-column label="剂型" align="center" prop="drug" width="150px"/>
+          <el-table-column label="收货客户" align="center" prop="customerName" width="150px"/>
+          <el-table-column label="收货地址" align="center" prop="addressaddress" width="150px"/>
+          <el-table-column label="收货地区" align="center" prop="area" width="150px"/>
+          <el-table-column label="收货地点" align="center" prop="place" width="150px"/>
+          <el-table-column label="计划发货日期" align="center" prop="deliveryDate" width="150px"/>
+          <el-table-column label="计划到货日期" align="center" prop="strageDate" width="150px"/>
+          <el-table-column label="运输方式" align="center" prop="transportation" width="150px"/>
+          <el-table-column label="备注" align="center" prop="remark" width="150px"/>
+          <el-table-column label="客户物料编码" align="center" prop="customerLogistic" width="150px"/>
+          <el-table-column label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
           </el-table>
         </el-tab-pane>
 
@@ -353,30 +361,30 @@
           max-height="480"
           >
           <el-table-column label="行号" align="center" prop="rowno"/>
-          <el-table-column label="调拨出库单号" align="center" prop="deliveryCode"/>
-          <el-table-column label="调拨入库单号" align="center" prop="storageCode"/>
-          <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer"/>
-          <el-table-column label="产地" align="center" prop="originPlace"/>
-          <el-table-column label="类别" align="center" prop="classify"/>
+          <el-table-column label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
+          <el-table-column label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
+          <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
+          <el-table-column label="产地" align="center" prop="originPlace" width="150px"/>
+          <el-table-column label="类别" align="center" prop="classify" width="150px"/>
           <!-- <el-table-column label="税率" align="center" prop="code"/> -->
           <!-- <el-table-column label="无税单价" align="center" prop="code"/> -->
           <!-- <el-table-column label="含税单价" align="center" prop="code"/> -->
-          <el-table-column label="产品批号" align="center" prop="productBatch"/>
-          <el-table-column label="生产日期" align="center" prop="manufactureDate"/>
-          <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate"/>
-          <el-table-column label="批准文号" align="center" prop="ratifyCode"/>
-          <el-table-column label="注册证号" align="center" prop="registration"/>
-          <el-table-column label="商品名" align="center" prop="productCode"/>
-          <el-table-column label="通用名" align="center" prop="commonCode"/>
-          <el-table-column label="剂型" align="center" prop="drug"/>
+          <el-table-column label="产品批号" align="center" prop="productBatch" width="150px"/>
+          <el-table-column label="生产日期" align="center" prop="manufactureDate" width="150px"/>
+          <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
+          <el-table-column label="批准文号" align="center" prop="ratifyCode" width="150px"/>
+          <el-table-column label="注册证号" align="center" prop="registration" width="150px"/>
+          <el-table-column label="商品名" align="center" prop="productCode" width="150px"/>
+          <el-table-column label="通用名" align="center" prop="commonCode" width="150px"/>
+          <el-table-column label="剂型" align="center" prop="drug" width="150px"/>
           <!-- <el-table-column label="询价无税价" align="center" prop="code"/> -->
           <!-- <el-table-column label="询价含税价" align="center" prop="code"/> -->
           <!-- <el-table-column label="税额" align="center" prop="code"/> -->
           <!-- <el-table-column label="加价率" align="center" prop="code"/> -->
           <!-- <el-table-column label="无税金额" align="center" prop="code"/> -->
           <!-- <el-table-column label="价税合计" align="center" prop="code"/> -->
-          <el-table-column label="客户物料码" align="center" prop="customerLogistic"/>
-          <el-table-column label="客户物料名称" align="center" prop="customerLogisticName"/>
+          <el-table-column label="客户物料码" align="center" prop="customerLogistic" width="150px"/>
+          <el-table-column label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
           </el-table>
         </el-tab-pane>
 
@@ -387,19 +395,19 @@
           max-height="480"
           >
           <el-table-column label="行号" align="center" prop="rowno"/>
-          <el-table-column label="调拨出库单号" align="center" prop="deliveryCode"/>
-          <el-table-column label="调拨入库单号" align="center" prop="storageCode"/>
-          <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer"/>
-          <el-table-column label="产地" align="center" prop="originPlace"/>
-          <el-table-column label="类别" align="center" prop="classify"/>
-          <el-table-column label="产品批号" align="center" prop="productBatch	"/>
-          <el-table-column label="生产日期" align="center" prop="manufactureDate"/>
-          <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate"/>
-          <el-table-column label="批准文号" align="center" prop="ratifyCode"/>
-          <el-table-column label="注册证号" align="center" prop="registration"/>
-          <el-table-column label="商品名" align="center" prop="productCode"/>
-          <el-table-column label="通用名" align="center" prop="commonCode"/>
-          <el-table-column label="剂型" align="center" prop="drug"/>
+          <el-table-column label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
+          <el-table-column label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
+          <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
+          <el-table-column label="产地" align="center" prop="originPlace" width="150px"/>
+          <el-table-column label="类别" align="center" prop="classify" width="150px"/>
+          <el-table-column label="产品批号" align="center" prop="productBatch" width="150px"/>
+          <el-table-column label="生产日期" align="center" prop="manufactureDate" width="150px"/>
+          <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
+          <el-table-column label="批准文号" align="center" prop="ratifyCode" width="150px"/>
+          <el-table-column label="注册证号" align="center" prop="registration" width="150px"/>
+          <el-table-column label="商品名" align="center" prop="productCode" width="150px"/>
+          <el-table-column label="通用名" align="center" prop="commonCode" width="150px"/>
+          <el-table-column label="剂型" align="center" prop="drug" width="150px"/>
           <!-- <el-table-column label="已调出主数量" align="center" prop="code"/>
           <el-table-column label="已调入主数量" align="center" prop="code"/> -->
           <!-- <el-table-column label="调拨在途主数量" align="center" prop="code"/> -->
@@ -408,8 +416,8 @@
           <!-- <el-table-column label="累计退货主数量" align="center" prop="code"/> -->
           <!-- <el-table-column label="调出与调入已结算主数量" align="center" prop="code"/> -->
           <!-- <el-table-column label="调出与调入已结算金额" align="center" prop="code"/> -->
-          <el-table-column label="客户物料码" align="center" prop="customerLogistic"/>
-          <el-table-column label="客户物料名称" align="center" prop="customerLogisticName"/>
+          <el-table-column label="客户物料码" align="center" prop="customerLogistic" width="150px"/>
+          <el-table-column label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
           </el-table>
         </el-tab-pane>
       </el-tabs>
@@ -419,7 +427,7 @@
         <el-col :span="1.5">
             <el-form-item label="制单人">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.createByName"
                 size="small"
                 disabled
                 clearable
@@ -430,7 +438,7 @@
         <el-col :span="1.5">
             <el-form-item label="制单日期">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.createTime"
                 size="small"
                 disabled
                 clearable
@@ -438,7 +446,7 @@
               />
             </el-form-item>
           </el-col>
-        <el-col :span="1.5">
+        <!-- <el-col :span="1.5">
             <el-form-item label="审批人">
               <el-input
                 v-model="basicForm.code"
@@ -459,7 +467,7 @@
                 style="width: 200px"
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
       </el-row>
 
       <el-divider content-position="left">审计信息</el-divider>
@@ -478,7 +486,7 @@
         <el-col :span="1.5">
             <el-form-item label="创建时间">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.createTime"
                 size="small"
                 disabled
                 clearable
@@ -500,7 +508,7 @@
         <el-col :span="1.5">
             <el-form-item label="最后修改时间">
               <el-input
-                v-model="basicForm.code"
+                v-model="basicForm.updateTime"
                 size="small"
                 disabled
                 clearable
@@ -526,6 +534,7 @@
     <Refers ref="refer" @doSubmit="selectionsToInput" :single="true"/>
     <TreeRefers ref="tree" @doSubmit="selectionsToInput2" :single="true"/>
     <popDialog ref="materialRefer" @doSubmit="selectMaterial" :single="true" />
+    <batchRefers ref="batchRefer" @doSubmit="selectBatch" :single="true"/>
   </div>
 </template>
 
@@ -537,6 +546,8 @@ import { getRefer } from '@/api/purchase/basic.js'
 import TreeRefers from '@/components/Refers/treeRefer.vue'
 // 明细行选择物料参照
 import popDialog from '@/components/PopDialog/index.vue'
+// 明细行选择批次号
+import batchRefers from '@/components/Refers/batchRefer.vue'
 
 export default {
   name: 'addOder',
@@ -545,7 +556,8 @@ export default {
   components: {
     Refers,
     TreeRefers,
-    popDialog
+    popDialog,
+    batchRefers
   },
   model: {
     prop: 'isList',
@@ -600,6 +612,12 @@ export default {
         isPage: true,
         title: '',
       },
+      referConditionMx: {
+        orgCode: '',
+        materialCode: '',
+        unitCode: '',
+        warehouseCode: ''
+      },
       options: [{
         value: '0', label: '是',
       }, {
@@ -840,6 +858,18 @@ export default {
       this.materialInfo[this.tableIndex].marketingApprovalPersonal = selection[0].registrant
       this.materialInfo[this.tableIndex].production = selection[0].productionPermit
     },
+    // 明细行选择批次号
+    chooseBatch(index) {
+      this.tableIndex = index
+      this.referConditionMx.orgCode = this.basicForm.deliveryInventoryOrg
+      this.referConditionMx.materialCode = this.materialInfo[this.tableIndex].material
+      this.referConditionMx.unitCode = this.materialInfo[this.tableIndex].unit
+      this.referConditionMx.warehouseCode = this.basicForm.deliveryWarehouse
+      this.$refs.batchRefer.init(this.referConditionMx)
+    },
+    selectBatch(selection) {
+      console.log('选中的批次号', selection)
+    },
   }
 }
 </script>

src/views/purchase/transferOrder/index.vue

@@ -19,10 +19,7 @@
                style="width: 240px"
                size="small"
                 v-model="queryParams.billDate"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期">
+                type="date">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -38,7 +35,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="1.5">
-            <el-form-item label="出货库存组织">
+            <el-form-item label="调入库存组织">
               <el-input
               v-model="queryParams.chkczz"
               size="small"
@@ -56,7 +53,7 @@
           </el-col>
         </el-row>
 
-        <CollapseTransition>
+        <!-- <CollapseTransition>
         <div v-show="expanded">
           <el-row :gutter="10">
             <el-col :span="1.5">
@@ -83,9 +80,9 @@
             </el-col>
           </el-row>
         </div>
-        </CollapseTransition>
+        </CollapseTransition> -->
       </el-form>
-      <el-divider class="lines"><i style="cursor: pointer;" :class="expanded?'el-icon-arrow-up':'el-icon-arrow-down'" @click="drop"></i></el-divider>
+      <!-- <el-divider class="lines"><i style="cursor: pointer;" :class="expanded?'el-icon-arrow-up':'el-icon-arrow-down'" @click="drop"></i></el-divider> -->
 
       <el-card>
         <div class="btn_grooup">
@@ -101,37 +98,35 @@
           ref="multipleTable"
           @row-click="select"
         >
-          <el-table-column label="调出库存" align="center" prop="deliveryInventoryOrgName"/>
-          <el-table-column label="订单类型" align="center" prop="billType"/>
-          <el-table-column label="单据号" align="center" prop="code"/>
-          <el-table-column label="单据日期" align="center" prop="billDate"/>
-          <el-table-column label="调拨方式" align="center" prop="allotType"/>
-          <el-table-column label="调拨出库单号" align="center" prop="deliveryCode"/>
-          <el-table-column label="调拨入库单号" align="center" prop="storageCode"/>
-          <el-table-column label="调拨入库组织" align="center" prop="storageInventoryOrgName"/>
-          <el-table-column label="调出业务员" align="center" prop="businessPersonalName"/>
-          <el-table-column label="调出部门" align="center" prop="deliveryDeptName"/>
+          <el-table-column label="调出库存" align="center" prop="deliveryInventoryOrgName" width="150px"/>
+          <el-table-column label="订单类型" align="center" prop="billType" width="150px"/>
+          <el-table-column label="单据号" align="center" prop="code" width="150px"/>
+          <el-table-column label="单据日期" align="center" prop="billDate" width="150px"/>
+          <el-table-column label="调拨方式" align="center" prop="allotType" width="150px"/>
+          <el-table-column label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
+          <el-table-column label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
+          <el-table-column label="调拨入库组织" align="center" prop="storageInventoryOrgName" width="150px"/>
+          <el-table-column label="调出业务员" align="center" prop="businessPersonalName" width="150px"/>
+          <el-table-column label="调出部门" align="center" prop="deliveryDeptName" width="150px"/>
           <el-table-column label="币种" align="center" prop="currencyName"/>
           <el-table-column label="折本汇率" align="center" prop="rate"/>
-          <el-table-column label="在途归属" align="center" prop="onRouteAffilliation"/>
+          <el-table-column label="在途归属" align="center" prop="onRouteAffilliation" width="150px"/>
           <el-table-column label="总数量" align="center" prop="qty"/>
-          <el-table-column label="结算路径" align="center" prop="accountPath"/>
-          <el-table-column label="客户" align="center" prop="customerName"/>
-          <el-table-column label="调出仓库" align="center" prop="deliveryWarehouseName"/>
-          <el-table-column label="调入仓库" align="center" prop="storageWarehouseName"/>
-          <el-table-column label="物流项目组" align="center" prop="code"/>
-          <el-table-column label="利润中心" align="center" prop="code"/>
-          <el-table-column label="已同步WMS" align="center" prop="code"/>
-          <el-table-column label="备注" align="center" prop="code"/>
-          <el-table-column label="单据状态" align="center" prop="code"/>
-          <el-table-column label="制单人" align="center" prop="code"/>
-          <el-table-column label="制单日期" align="center" prop="code"/>
-          <el-table-column label="审批人" align="center" prop="code"/>
-          <el-table-column label="审批日期" align="center" prop="code"/>
-          <el-table-column label="创建人" align="center" prop="code"/>
-          <el-table-column label="创建时间" align="center" prop="code"/>
-          <el-table-column label="最后修改人" align="center" prop="code"/>
-          <el-table-column label="最后修改时间" align="center" prop="code"/>
+          <el-table-column label="结算路径" align="center" prop="accountPath" width="150px"/>
+          <el-table-column label="客户" align="center" prop="customerName" width="150px"/>
+          <el-table-column label="调出仓库" align="center" prop="deliveryWarehouseName" width="180px"/>
+          <el-table-column label="调入仓库" align="center" prop="storageWarehouseName" width="150px"/>
+          <el-table-column label="物流项目组" align="center" prop="materialProject" width="150px"/>
+          <el-table-column label="利润中心" align="center" prop="liacenterName" width="150px"/>
+          <el-table-column label="已同步WMS" align="center" prop="isSendWms" width="150px"/>
+          <el-table-column label="备注" align="center" prop="remark" width="150px"/>
+          <el-table-column label="单据状态" align="center" prop="status" width="150px"/>
+          <el-table-column label="制单人" align="center" prop="createByName" width="150px"/>
+          <el-table-column label="制单日期" align="center" prop="createTime" width="150px"/>
+          <!-- <el-table-column label="审批人" align="center" prop="code" width="150px"/> -->
+          <!-- <el-table-column label="审批日期" align="center" prop="code" width="150px"/> -->
+          <el-table-column label="最后修改人" align="center" prop="updateByName" width="150px"/>
+          <el-table-column label="最后修改时间" align="center" prop="updateTime" width="150px"/>
           <el-table-column
           fixed="right"
           label="操作"
@@ -163,40 +158,40 @@
             max-height="380"
             >
             <el-table-column label="行号" align="center" prop="rowno"/>
-            <el-table-column label="物料编码" align="center" prop="material"/>
-            <el-table-column label="物料名称" align="center" prop="materialName"/>
-            <el-table-column label="调拨出库单号" align="center" prop="deliveryCode"/>
-            <el-table-column label="调拨入库单号" align="center" prop="storageCode"/>
+            <el-table-column label="物料编码" align="center" prop="material" width="150px"/>
+            <el-table-column label="物料名称" align="center" prop="materialName" width="150px"/>
+            <el-table-column label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
+            <el-table-column label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
             <el-table-column label="规格" align="center" prop="specification"/>
-            <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer"/>
-            <el-table-column label="产地" align="center" prop="originPlace"/>
-            <el-table-column label="型号" align="center" prop="model"/>
-            <el-table-column label="单位" align="center" prop="unitName"/>
+            <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
+            <el-table-column label="产地" align="center" prop="originPlace" width="150px"/>
+            <el-table-column label="型号" align="center" prop="model" width="150px"/>
+            <el-table-column label="单位" align="center" prop="unitName" width="150px"/>
             <!-- <el-table-column label="调出仓库" align="center" prop="deliveryWarehouseName"/> -->
-            <el-table-column label="数量" align="center" prop="qty"/>
-            <el-table-column label="主单位" align="center" prop="mainUnit"/>
-            <el-table-column label="换算率" align="center" prop="equation"/>
-            <el-table-column label="主数量" align="center" prop="mainQty"/>
-            <el-table-column label="税率" align="center" prop="rate"/>
+            <el-table-column label="数量" align="center" prop="qty" width="150px"/>
+            <el-table-column label="主单位" align="center" prop="mainUnit" width="150px"/>
+            <el-table-column label="换算率" align="center" prop="equation" width="150px"/>
+            <el-table-column label="主数量" align="center" prop="mainQty" width="150px"/>
+            <el-table-column label="税率" align="center" prop="rate" width="150px"/>
             <!-- <el-table-column label="调入仓库" align="center" prop="storageWarehouseName"/> -->
-            <el-table-column label="批次号" align="center" prop="patchNo"/>
-            <el-table-column label="产品批号" align="center" prop="producBatch"/>
-            <el-table-column label="生产日期" align="center" prop="manufactureDate"/>
-            <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate"/>
-            <el-table-column label="批准文号" align="center" prop="ratifyCode"/>
-            <el-table-column label="注册证号" align="center" prop="registration"/>
-            <el-table-column label="商品名" align="center" prop="productCode"/>
-            <el-table-column label="通用名" align="center" prop="commonCode"/>
-            <el-table-column label="剂型" align="center" prop="drug"/>
-            <el-table-column label="调入调出结算规则明细" align="center" prop="ruleDetail"/>
-            <el-table-column label="上市许可持有人" align="center" prop="marketingApprovalPersonal"/>
-            <el-table-column label="生产许可证号/经营许可证号/备案凭证号" align="center" prop="production"/>
-            <el-table-column label="pi码" align="center" prop="pi"/>
+            <el-table-column label="批次号" align="center" prop="patchNo" width="150px"/>
+            <el-table-column label="产品批号" align="center" prop="producBatch" width="150px"/>
+            <el-table-column label="生产日期" align="center" prop="manufactureDate" width="150px"/>
+            <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
+            <el-table-column label="批准文号" align="center" prop="ratifyCode" width="150px"/>
+            <el-table-column label="注册证号" align="center" prop="registration" width="150px"/>
+            <el-table-column label="商品名" align="center" prop="productCode" width="150px"/>
+            <el-table-column label="通用名" align="center" prop="commonCode" width="150px"/>
+            <el-table-column label="剂型" align="center" prop="drug" width="150px"/>
+            <el-table-column label="调入调出结算规则明细" align="center" prop="ruleDetail" width="150px"/>
+            <el-table-column label="上市许可持有人" align="center" prop="marketingApprovalPersonal" width="150px"/>
+            <el-table-column label="生产许可证号/经营许可证号/备案凭证号" align="center" prop="production" width="260px"/>
+            <el-table-column label="pi码" align="center" prop="pi" width="150px"/>
             <!-- <el-table-column label="无税金额" align="center" prop="code"/> -->
             <!-- <el-table-column label="备注" align="center" prop="code"/> -->
-            <el-table-column label="类别" align="center" prop="classify"/>
-            <el-table-column label="客户物料码" align="center" prop="customerLogistic"/>
-            <el-table-column label="客户物料名称" align="center" prop="customerLogisticName"/>
+            <el-table-column label="类别" align="center" prop="classify" width="150px"/>
+            <el-table-column label="客户物料码" align="center" prop="customerLogistic" width="150px"/>
+            <el-table-column label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
             </el-table>
           </el-tab-pane>
 
@@ -207,34 +202,34 @@
             max-height="380"
             >
             <el-table-column label="行号" align="center" prop="rowno"/>
-            <el-table-column label="调拨出库单号" align="center" prop="deliveryCode"/>
-            <el-table-column label="调拨入库单号" align="center" prop="storageCode"/>
-            <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer"/>
-            <el-table-column label="产地" align="center" prop="originPlace"/>
-            <el-table-column label="类别" align="center" prop="classify"/>
-            <el-table-column label="调出仓库" align="center" prop="deliveryWarehouseName"/>
-            <el-table-column label="调入仓库" align="center" prop="storageWarehouseName"/>
+            <el-table-column label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
+            <el-table-column label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
+            <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
+            <el-table-column label="产地" align="center" prop="originPlace" width="150px"/>
+            <el-table-column label="类别" align="center" prop="classify" width="150px"/>
+            <el-table-column label="调出仓库" align="center" prop="deliveryWarehouseName" width="150px"/>
+            <el-table-column label="调入仓库" align="center" prop="storageWarehouseName" width="150px"/>
             <!-- <el-table-column label="收货利润中心" align="center" prop="code"/>
             <el-table-column label="发货利润中心" align="center" prop="code"/> -->
-            <el-table-column label="调入业务员" align="center" prop="businessPersonalName"/>
-            <el-table-column label="产品批号" align="center" prop="productBatch"/>
-            <el-table-column label="生产日期" align="center" prop="manufactureDate"/>
-            <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate"/>
-            <el-table-column label="批准文号" align="center" prop="ratifyCode"/>
-            <el-table-column label="注册证号" align="center" prop="registration"/>
-            <el-table-column label="商品名" align="center" prop="productCode"/>
-            <el-table-column label="通用名" align="center" prop="commonCode"/>
-            <el-table-column label="剂型" align="center" prop="drug"/>
-            <el-table-column label="收货客户" align="center" prop="customerName"/>
-            <el-table-column label="收货地址" align="center" prop="addressaddress"/>
-            <el-table-column label="收货地区" align="center" prop="area"/>
-            <el-table-column label="收货地点" align="center" prop="place"/>
-            <el-table-column label="计划发货日期" align="center" prop="deliveryDate"/>
-            <el-table-column label="计划到货日期" align="center" prop="strageDate"/>
-            <el-table-column label="运输方式" align="center" prop="transportation"/>
-            <el-table-column label="备注" align="center" prop="remark"/>
-            <el-table-column label="客户物料编码" align="center" prop="customerLogistic"/>
-            <el-table-column label="客户物料名称" align="center" prop="customerLogisticName"/>
+            <el-table-column label="调入业务员" align="center" prop="businessPersonalName" width="150px"/>
+            <el-table-column label="产品批号" align="center" prop="productBatch" width="150px"/>
+            <el-table-column label="生产日期" align="center" prop="manufactureDate" width="150px"/>
+            <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
+            <el-table-column label="批准文号" align="center" prop="ratifyCode" width="150px"/>
+            <el-table-column label="注册证号" align="center" prop="registration" width="150px"/>
+            <el-table-column label="商品名" align="center" prop="productCode" width="150px"/>
+            <el-table-column label="通用名" align="center" prop="commonCode" width="150px"/>
+            <el-table-column label="剂型" align="center" prop="drug" width="150px"/>
+            <el-table-column label="收货客户" align="center" prop="customerName" width="150px"/>
+            <el-table-column label="收货地址" align="center" prop="addressaddress" width="150px"/>
+            <el-table-column label="收货地区" align="center" prop="area" width="150px"/>
+            <el-table-column label="收货地点" align="center" prop="place" width="150px"/>
+            <el-table-column label="计划发货日期" align="center" prop="deliveryDate" width="150px"/>
+            <el-table-column label="计划到货日期" align="center" prop="strageDate" width="150px"/>
+            <el-table-column label="运输方式" align="center" prop="transportation" width="150px"/>
+            <el-table-column label="备注" align="center" prop="remark" width="150px"/>
+            <el-table-column label="客户物料编码" align="center" prop="customerLogistic" width="150px"/>
+            <el-table-column label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
             </el-table>
           </el-tab-pane>
 
@@ -245,30 +240,30 @@
             max-height="380"
             >
             <el-table-column label="行号" align="center" prop="rowno"/>
-            <el-table-column label="调拨出库单号" align="center" prop="deliveryCode"/>
-            <el-table-column label="调拨入库单号" align="center" prop="storageCode"/>
-            <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer"/>
-            <el-table-column label="产地" align="center" prop="originPlace"/>
-            <el-table-column label="类别" align="center" prop="classify"/>
+            <el-table-column label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
+            <el-table-column label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
+            <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
+            <el-table-column label="产地" align="center" prop="originPlace" width="150px"/>
+            <el-table-column label="类别" align="center" prop="classify" width="150px"/>
             <!-- <el-table-column label="税率" align="center" prop="code"/> -->
             <!-- <el-table-column label="无税单价" align="center" prop="code"/> -->
             <!-- <el-table-column label="含税单价" align="center" prop="code"/> -->
-            <el-table-column label="产品批号" align="center" prop="productBatch"/>
-            <el-table-column label="生产日期" align="center" prop="manufactureDate"/>
-            <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate"/>
-            <el-table-column label="批准文号" align="center" prop="ratifyCode"/>
-            <el-table-column label="注册证号" align="center" prop="registration"/>
-            <el-table-column label="商品名" align="center" prop="productCode"/>
-            <el-table-column label="通用名" align="center" prop="commonCode"/>
-            <el-table-column label="剂型" align="center" prop="drug"/>
+            <el-table-column label="产品批号" align="center" prop="productBatch" width="150px"/>
+            <el-table-column label="生产日期" align="center" prop="manufactureDate" width="150px"/>
+            <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
+            <el-table-column label="批准文号" align="center" prop="ratifyCode" width="150px"/>
+            <el-table-column label="注册证号" align="center" prop="registration" width="150px"/>
+            <el-table-column label="商品名" align="center" prop="productCode" width="150px"/>
+            <el-table-column label="通用名" align="center" prop="commonCode" width="150px"/>
+            <el-table-column label="剂型" align="center" prop="drug" width="150px"/>
             <!-- <el-table-column label="询价无税价" align="center" prop="code"/> -->
             <!-- <el-table-column label="询价含税价" align="center" prop="code"/> -->
             <!-- <el-table-column label="税额" align="center" prop="code"/> -->
             <!-- <el-table-column label="加价率" align="center" prop="code"/> -->
             <!-- <el-table-column label="无税金额" align="center" prop="code"/> -->
             <!-- <el-table-column label="价税合计" align="center" prop="code"/> -->
-            <el-table-column label="客户物料码" align="center" prop="customerLogistic"/>
-            <el-table-column label="客户物料名称" align="center" prop="customerLogisticName"/>
+            <el-table-column label="客户物料码" align="center" prop="customerLogistic" width="150px"/>
+            <el-table-column label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
             </el-table>
           </el-tab-pane>
 
@@ -279,19 +274,19 @@
             max-height="380"
             >
             <el-table-column label="行号" align="center" prop="rowno"/>
-            <el-table-column label="调拨出库单号" align="center" prop="deliveryCode"/>
-            <el-table-column label="调拨入库单号" align="center" prop="storageCode"/>
-            <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer"/>
-            <el-table-column label="产地" align="center" prop="originPlace"/>
-            <el-table-column label="类别" align="center" prop="classify"/>
-            <el-table-column label="产品批号" align="center" prop="productBatch	"/>
-            <el-table-column label="生产日期" align="center" prop="manufactureDate"/>
-            <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate"/>
-            <el-table-column label="批准文号" align="center" prop="ratifyCode"/>
-            <el-table-column label="注册证号" align="center" prop="registration"/>
-            <el-table-column label="商品名" align="center" prop="productCode"/>
-            <el-table-column label="通用名" align="center" prop="commonCode"/>
-            <el-table-column label="剂型" align="center" prop="drug"/>
+            <el-table-column label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
+            <el-table-column label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
+            <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
+            <el-table-column label="产地" align="center" prop="originPlace" width="150px"/>
+            <el-table-column label="类别" align="center" prop="classify" width="150px"/>
+            <el-table-column label="产品批号" align="center" prop="productBatch" width="150px"/>
+            <el-table-column label="生产日期" align="center" prop="manufactureDate" width="150px"/>
+            <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
+            <el-table-column label="批准文号" align="center" prop="ratifyCode" width="150px"/>
+            <el-table-column label="注册证号" align="center" prop="registration" width="150px"/>
+            <el-table-column label="商品名" align="center" prop="productCode" width="150px"/>
+            <el-table-column label="通用名" align="center" prop="commonCode" width="150px"/>
+            <el-table-column label="剂型" align="center" prop="drug" width="150px"/>
             <!-- <el-table-column label="已调出主数量" align="center" prop="code"/>
             <el-table-column label="已调入主数量" align="center" prop="code"/> -->
             <!-- <el-table-column label="调拨在途主数量" align="center" prop="code"/> -->
@@ -300,8 +295,8 @@
             <!-- <el-table-column label="累计退货主数量" align="center" prop="code"/> -->
             <!-- <el-table-column label="调出与调入已结算主数量" align="center" prop="code"/> -->
             <!-- <el-table-column label="调出与调入已结算金额" align="center" prop="code"/> -->
-            <el-table-column label="客户物料码" align="center" prop="customerLogistic"/>
-            <el-table-column label="客户物料名称" align="center" prop="customerLogisticName"/>
+            <el-table-column label="客户物料码" align="center" prop="customerLogistic" width="150px"/>
+            <el-table-column label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
             </el-table>
           </el-tab-pane>
         </el-tabs>

vue.config.js

@@ -37,15 +37,15 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://172.16.100.107:8080/drp-admin`, //测试
-        // target: `http://test-sy.derom.com/drp-admin`, //测试
+        target: `http://test-sy.derom.com/drp-admin`, //测试
         // target: `http://release-sy.derom.com/drp-admin`, //预发
         // target: `http://sy.derom.com/drp-admin`, //生产
         // target: `http://172.16.63.202:8000/drp-admin`, // D本地
         // target: `http://172.16.62.241:8000/drp-admin`, //笑寒本地
-        target: `http://172.16.13.152:8000/drp-admin`, //豪哥本地
+        // target: `http://172.16.13.152:8000/drp-admin`, //豪哥本地
         // target: `http://172.16.13.47:8000/drp-admin`, //石杨本地
         // target: `http://172.16.13.113:8000/drp-admin`, //DWT本地
-        target: `http://172.16.13.77:8000/drp-admin`, //TQ本地
+        // target: `http://172.16.13.77:8000/drp-admin`, //TQ本地
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",