Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

src/views/purchase/MaterialClassDivision/add.vue

@@ -84,9 +84,10 @@
 
           <el-col :span="1.5">
             <el-form-item label="物料编码">
-              <el-input :disabled="disable" style="width: 200px" size="small" readonly v-model="basicForm.material">
+              <el-input :disabled="disable" style="width: 200px" size="small" readonly v-model="basicForm.materialCode">
                   <el-button slot="append" icon="el-icon-more" @click="test01"></el-button>
               </el-input>
+              <el-input v-show="false" style="width: 200px" size="small" v-model="basicForm.material"></el-input>
             </el-form-item>
           </el-col>
 
@@ -307,6 +308,7 @@ export default {
         materialClassifyThreeName: '',
         materialClassifyFourName: '',
         material: '',
+        materialCode: '',
         materialName: '',
         manufacturer: '',
         org: '',
@@ -400,7 +402,8 @@ export default {
     selectionsToInput (selections) {
       console.log('父组件拿到的：', selections)
       this.selectData = selections
-      this.basicForm.material = selections[0].code
+      this.basicForm.material = selections[0].id
+      this.basicForm.materialCode = selections[0].code
       this.basicForm.materialName = selections[0].name
     },
     // 显示物料编码列表
@@ -431,6 +434,7 @@ export default {
     acceptStaff (selections) {
       this.staffOptions = selections
       this.basicForm.orderPersonal = selections[0].code
+      this.basicForm.orderPersonalName = selections[0].name
       this.getStaffDetails(selections[0].id)
     },
     // 订单员显示列表
@@ -451,6 +455,7 @@ export default {
     acceptStaff2 (selections) {
       this.staff2Options = selections
       this.basicForm.buyer = selections[0].code
+      this.basicForm.buyerName = selections[0].name
       this.getStaffDetails2(selections[0].id)
     },
     // 采购员显示列表

src/views/purchase/PurchaseDemandList/add.vue

@@ -701,7 +701,7 @@ export default {
         materialClassifyFour: null,
         materialClassifyFourName: null,
         materialCode: null,
-        materialId: null,
+        material: null,
         materialName: null,
         specification: null,
         unit: null,
@@ -937,7 +937,7 @@ export default {
       this.basicForm.puDemandItemList[this.tableIndex].businessDept = selection[0].businessDepartment
       this.basicForm.puDemandItemList[this.tableIndex].businessDeptName = selection[0].businessDepartmentName
       this.basicForm.puDemandItemList[this.tableIndex].materialCode = selection[0].code
-      this.basicForm.puDemandItemList[this.tableIndex].materialId = selection[0].id
+      this.basicForm.puDemandItemList[this.tableIndex].material = selection[0].id
       this.basicForm.puDemandItemList[this.tableIndex].materialName = selection[0].name
       this.basicForm.puDemandItemList[this.tableIndex].materialClassifyOneName = selection[0].oneClass
       this.basicForm.puDemandItemList[this.tableIndex].materialClassifyTwoName = selection[0].twoClass

src/views/purchase/PurchaseDemandList/index.vue

@@ -195,6 +195,36 @@
       </el-card>
     </div>
 
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px">
+      <el-upload
+      ref="upload"
+      :limit="1"
+      accept=".xlsx, .xls"
+      :headers="upload.headers"
+      :action="upload.url + '?updateSupport=' + upload.updateSupport"
+      :disabled="upload.isUploading"
+      :on-progress="handleFileUploadProgress"
+      :on-success="handleFileSuccess"
+      :auto-upload="false"
+      drag
+      >
+      <i class="el-icon-upload"></i>
+      <div class="el-upload__text">
+        将文件拖到此处，或
+        <em>点击上传</em>
+      </div>
+      <div class="el-upload__tip" slot="tip">
+        <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+      </div>
+      <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="submitFileForm">确 定</el-button>
+      <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
     <Add v-model="isList" v-if="!isList" :pageStu="page" :disable="disable" :row="rowDetail" @refresh="getList"/>
   
     <Refers ref="refer" @doSubmit="selectionsToInput" :single="true"/>
@@ -202,6 +232,8 @@
 </template>
 
 <script>
+// 导入的token
+import { getToken } from "@/utils/auth";
 import Add from './add.vue'
 import Refers from '@/components/Refers/refers.vue'
 import CollapseTransition from '@/components/MyCollapse/collapse.vue'
@@ -216,6 +248,22 @@ export default {
   dicts: ['sys_processing_mode', 'sys_status', 'sys_bill_source', 'sys_business', 'sys_reserve_ratio', 'sys_period_unit', 'sys_price_type'],
   data() {
     return {
+      // 导入参数
+      upload: {
+        // 是否显示弹出层（导入）
+        open: false,
+        // 弹出层标题（导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/pu/demand/import"
+      },
+      // 下拉收起配置
       expanded: false,
       // 页面配置
       isList: true,
@@ -360,6 +408,26 @@ export default {
           window.URL.revokeObjectURL(href); // 释放blob对象
         })
       }
+      if (command == '数据导入') {
+        this.upload.title = "用户导入"
+        this.upload.open = true
+      }
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+      this.getList(this.queryParams);
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
     },
     handleExport(command) {
       if(command == '选中导出') {

src/views/purchase/transferOrder/add.vue

@@ -4,13 +4,10 @@
       <el-row :gutter="10">
         <el-col :span="1.5">
             <el-form-item label="订单类型">
-              <el-input
-                v-model="basicForm.billType"
-                size="small"
-                placeholder=""
-                clearable
-                style="width: 200px"
-              />
+              <el-select v-model="basicForm.billType" size="small" style="width: 200px" clearable>
+                <el-option v-for="dict in dict.type.sys_order_type" :key="dict.value" :label="dict.label" :value="dict.value">
+                </el-option>
+              </el-select>
             </el-form-item>
          </el-col>
         <el-col :span="1.5">
@@ -18,7 +15,6 @@
               <el-input
                 v-model="basicForm.code"
                 size="small"
-                placeholder=""
                 clearable
                 style="width: 200px"
               />
@@ -26,13 +22,14 @@
          </el-col>
         <el-col :span="1.5">
             <el-form-item label="单据日期">
-              <el-input
+              <el-date-picker
                 v-model="basicForm.billDate"
                 size="small"
-                placeholder=""
+                type="date"
                 clearable
-                style="width: 200px"
-              />
+                value-format="yyyy-MM-dd"
+                style="width: 200px">
+              </el-date-picker>
             </el-form-item>
          </el-col>
         <el-col :span="1.5">
@@ -246,6 +243,156 @@
         </el-col>
       </el-row>
 
+      <el-tabs style="margin-top: 10px;" type="border-card">
+        <el-tab-pane label="物料信息">
+          <el-table
+          :data="materialInfo" 
+          fit
+          max-height="480"
+          >
+          <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="code"/>
+          <el-table-column label="调拨入库单号" align="center" prop="code"/>
+          <el-table-column label="规格" align="center" prop="code"/>
+          <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="unit"/>
+          <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="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="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>
+        </el-tab-pane>
+
+        <el-tab-pane label="收发货信息">
+          <el-table
+          :data="receiveInfo" 
+          fit
+          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="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>
+        </el-tab-pane>
+
+        <el-tab-pane label="价格费用">
+          <el-table
+          :data="priceList" 
+          fit
+          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="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="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>
+        </el-tab-pane>
+
+        <el-tab-pane label="执行结果">
+          <el-table
+          :data="resultList" 
+          fit
+          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="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="customerLogistic"/>
+          <el-table-column label="客户物料名称" align="center" prop="customerLogisticName"/>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
+
       <el-divider content-position="left">表尾信息</el-divider>
       <el-row :gutter="10">
         <el-col :span="1.5">
@@ -258,7 +405,7 @@
                 style="width: 200px"
               />
             </el-form-item>
-         </el-col>
+          </el-col>
         <el-col :span="1.5">
             <el-form-item label="制单日期">
               <el-input
@@ -269,7 +416,7 @@
                 style="width: 200px"
               />
             </el-form-item>
-         </el-col>
+          </el-col>
         <el-col :span="1.5">
             <el-form-item label="审批人">
               <el-input
@@ -280,7 +427,7 @@
                 style="width: 200px"
               />
             </el-form-item>
-         </el-col>
+          </el-col>
         <el-col :span="1.5">
             <el-form-item label="审批日期">
               <el-input
@@ -291,7 +438,7 @@
                 style="width: 200px"
               />
             </el-form-item>
-         </el-col>
+          </el-col>
       </el-row>
 
       <el-divider content-position="left">审计信息</el-divider>
@@ -306,7 +453,7 @@
                 style="width: 200px"
               />
             </el-form-item>
-         </el-col>
+          </el-col>
         <el-col :span="1.5">
             <el-form-item label="创建时间">
               <el-input
@@ -317,7 +464,7 @@
                 style="width: 200px"
               />
             </el-form-item>
-         </el-col>
+          </el-col>
         <el-col :span="1.5">
             <el-form-item label="最后修改人">
               <el-input
@@ -328,7 +475,7 @@
                 style="width: 200px"
               />
             </el-form-item>
-         </el-col>
+          </el-col>
         <el-col :span="1.5">
             <el-form-item label="最后修改时间">
               <el-input
@@ -339,158 +486,8 @@
                 style="width: 200px"
               />
             </el-form-item>
-         </el-col>
+          </el-col>
       </el-row>
-
-        <el-tabs style="margin-top: 10px;" type="border-card">
-          <el-tab-pane label="物料信息">
-            <el-table
-            :data="materialInfo" 
-            fit
-            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="code"/>
-            <el-table-column label="调拨入库单号" align="center" prop="code"/>
-            <el-table-column label="规格" align="center" prop="code"/>
-            <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="unit"/>
-            <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="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="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>
-          </el-tab-pane>
-
-          <el-tab-pane label="收发货信息">
-            <el-table
-            :data="receiveInfo" 
-            fit
-            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="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>
-          </el-tab-pane>
-
-          <el-tab-pane label="价格费用">
-            <el-table
-            :data="priceList" 
-            fit
-            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="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="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>
-          </el-tab-pane>
-
-          <el-tab-pane label="执行结果">
-            <el-table
-            :data="resultList" 
-            fit
-            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="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="customerLogistic"/>
-            <el-table-column label="客户物料名称" align="center" prop="customerLogisticName"/>
-            </el-table>
-          </el-tab-pane>
-        </el-tabs>
     </el-form>
 
     <div class="btn_group">
@@ -511,6 +508,7 @@
 import {addOrder, getOrderDetail, editOrder} from '@/api/purchase/transferOrder.js'
 export default {
   name: 'addOder',
+  dicts: ['sys_order_type'],
   props: ['pageStu','row', 'disable'],
   model: {
     prop: 'isList',

src/views/purchase/transferOrder/index.vue

@@ -415,6 +415,7 @@ export default {
   height: calc(100vh - 84px);
   padding: 12px;
   box-sizing: border-box;
+  overflow-y: scroll;
 }
 .btn_grooup {
   margin-bottom: 10px;

vue.config.js

@@ -37,12 +37,12 @@ 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本地