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

src/api/business/purchase/purchase-order.js

@@ -27,10 +27,28 @@ const create = (data) => {
   });
 }
 
+// 采购订单提交
+const submit = (data) => {
+  return request({
+    url: `/pu/order/submit`,
+    method: "post",
+    data,
+  });
+}
+
 // 采购订单编辑
 const edit = (data) => {
   return request({
-    url: `/pu/order/item`,
+    url: `/pu/order`,
+    method: "put",
+    data,
+  });
+}
+
+// 采购订单修订
+const revision = (data) => {
+  return request({
+    url: `/pu/order/revision`,
     method: "put",
     data,
   });
@@ -44,12 +62,23 @@ const remove = (data) => {
   });
 }
 
+// 采购订单-询价
+const getPrice = (data) => {
+  return request({
+    url: `/pu/order/getPrice`,
+    method: "post",
+    data,
+  });
+}
 
 export default {
   list,
   details,
   create,
+  submit,
   edit,
+  revision,
   remove,
+  getPrice,
 
 }

src/components/Refers/refers.vue

@@ -80,6 +80,7 @@ export default {
       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();

src/components/input-dialog/components/ALLOCATION_PARAM.js

@@ -1,24 +1,22 @@
 // 货位
 export default [
   // 树
-  // {
-  //   key: "warehouse",
-  //   title: "仓库ID",
-  //   type: "Input",
-  //   search: true,
-  // },
-  // {
-  //   key: "warehouse_name",
-  //   title: "仓库名称",
-  //   type: "Input",
-  //   search: true,
-  // },
-  // {
-  //   key: "",
-  //   title: "备注",
-  // },
-  // {
-  //   key: "",
-  //   title: "助记码",
-  // },
+  {
+    key: "id",
+    title: "ID",
+    type: "Input",
+    search: true,
+  },
+  {
+    key: "code",
+    title: "编码",
+    type: "Input",
+    search: true,
+  },
+  {
+    key: "name",
+    title: "货位",
+    type: "Input",
+    search: true,
+  },
 ];

src/components/input-dialog/components/SUPPLIERCONTACTS_PARAM.js

@@ -2,19 +2,19 @@
 export default [
   {
     key: "id",
-    title: " 供应商联系人ID",
+    title: "ID",
     type: "Input",
     search: true,
   },
   {
     key: "code",
-    title: " 供应商联系人编码",
+    title: "编码",
     type: "Input",
     search: true,
   },
   {
     key: "name",
-    title: " 供应商联系人名称",
+    title: "供应商联系人名称",
     type: "Input",
     search: true,
   },

src/components/input-dialog/index.vue

@@ -52,6 +52,15 @@ export default {
   computed: {},
   watch: {},
   methods: {
+    // 处理默认传参
+    handleMakeQueryParams() {
+      const newQueryParams = {}
+      const { source, queryParams } = this.$props;
+      for (let key in queryParams) {
+        newQueryParams[key] = queryParams[key] === key ? source[queryParams[key]] : queryParams[key]
+      }
+      return newQueryParams
+    },
     // 打开弹窗
     handleAsyncOpenDialog() {
       this.$nextTick(() => {
@@ -68,31 +77,20 @@ export default {
       this.$emit("update:source", source);
     },
   },
-  created() {},
-  mounted() {},
-  destroyed() {},
+  created() {
+    this.handleMakeQueryParams()
+  },
+  mounted() { },
+  destroyed() { },
 };
 </script>
 <template>
-  <el-input
-    v-model="value"
-    :size="size"
-    :readonly="readonly"
-    :disabled="disabled"
-    :clearable="clearable"
-    :placeholder="placeholder"
-    style="width: 100%; cursor: pointer"
-    @click.native.stop="handleAsyncOpenDialog"
-  >
+  <el-input v-model="value" :size="size" :readonly="readonly" :disabled="disabled" :clearable="clearable"
+    :placeholder="placeholder" style="width: 100%; cursor: pointer" @click.native.stop="handleAsyncOpenDialog">
     <template #suffix>
       <el-icon class="el-icon-milk-tea"></el-icon>
-      <input-dialog
-        ref="InputDialogFef"
-        :type="type"
-        :title="title"
-        :queryParams="queryParams"
-        @confirm="handleUpdateSource"
-      ></input-dialog>
+      <input-dialog ref="InputDialogFef" :type="type" :title="title" :queryParams="handleMakeQueryParams()"
+        @confirm="handleUpdateSource"></input-dialog>
     </template>
   </el-input>
 </template>

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/MaterialClassDivision/index.vue

@@ -211,14 +211,13 @@
               导出<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="Excel导出">Excel导出</el-dropdown-item>
+              <el-dropdown-item command="Excel导出">Excel导出</el-dropdown-item>。
               <el-dropdown-item command="导出明细">导出明细</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
 
           <el-button type="primary" size="small">同步分配</el-button>
           <el-button type="primary" size="small">删除</el-button>
-          <el-button type="primary" size="small">打印</el-button>
         </div>
         <el-table 
           :data="tableList" 

src/views/purchase/PurchaseDemandList/add.vue

@@ -604,7 +604,8 @@ export default {
       referCondition: {
         type: 'ORG_PARAM',
         isPage: true,
-        title: '选择组织'
+        title: '选择组织',
+        pkOrg: '',
       },
       referConditionMx: {
         type: 'DEPT_PARAM',
@@ -701,7 +702,7 @@ export default {
         materialClassifyFour: null,
         materialClassifyFourName: null,
         materialCode: null,
-        materialId: null,
+        material: null,
         materialName: null,
         specification: null,
         unit: null,
@@ -860,6 +861,8 @@ export default {
       this.referCondition.type = type
       this.referCondition.isPage = isPage
       this.referCondition.title = title
+      // 选择货位时要传入组织id
+      this.referCondition.pkOrg = this.basicForm.org
       this.$refs.refer.init(this.referCondition)
     },
     selectionsToInput(selection) {
@@ -937,7 +940,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/deliveryAddress/index.vue

@@ -179,7 +179,6 @@
           <el-button type="primary" size="small">停用</el-button>
           <el-button type="primary" size="small">同步NC</el-button>
           <el-button type="primary" size="small">删除</el-button>
-          <el-button type="primary" size="small">打印</el-button>
         </div>
         <el-table 
           :data="tableList" 

src/views/purchase/purchase-order/add/column.js

@@ -170,12 +170,15 @@ export const Columns = [
       dataMapping: {
         goodsAllocation: "code",
         goodsAllocationName: "name",
+      },
+      queryParams: {
+        pkOrg: 'puOrg',
       }
     },
     width: 200,
   },
   { key: "isSendSrm", title: "是否同步SRM", type: "Checkbox", },
-  { key: "isInvoice", title: "发票标识", type: "Input", },
+  { key: "isInvoice", title: "发票标识", type: "Checkbox", },
   { key: "supplierOrderNo", title: "供应商订单号", type: "Input", },
   { key: "rebateMoney", title: "订单使用返利金额", type: "Input", },
   { key: "deductionMoney", title: "订单抵扣余款金额", type: "Input", },
@@ -207,7 +210,7 @@ export const Columns = [
     },
     width: 200,
   },
-  { key: "isUrgency", title: "紧急程度", type: "Input", },
+  { key: "isUrgency", title: "紧急程度", type: "Checkbox", },
   { key: "isSendWms", title: "已同步WMS", type: "Checkbox", },
   // { key: "agent", title: "代理人", type: "Input", }, // 建议删除
   // { key: "agentName", title: "代理人名称", },
@@ -223,7 +226,7 @@ export const Columns = [
   //   // type: "InputDialog",
   // },
   { key: "supplierPersonalName", title: "供应商业务员名称", type: "Input", },
-  { key: "isDeliver", title: "是否发货", type: "Input", },
+  { key: "isDeliver", title: "是否发货", type: "Checkbox", },
   {
     key: "retReason",
     title: "退换原因",
@@ -237,14 +240,14 @@ export const Columns = [
     },
   },
   {
-    key: "processType",
+    key: "processTypeName",
     title: "处理方式",
     type: "InputDialog",
     config: {
       componentName: "PROCESSTYPE_PARAM",
       dataMapping: {
         processType: "code",
-        // processTypeName: "name",
+        processTypeName: "name",
       },
     },
   },
@@ -276,7 +279,7 @@ export const Columns = [
   { key: "isArrivalReson", title: "到货超期原因", type: "Input", },
   { key: "midOrderNo", title: "中台采购订单号", type: "Input", },
   { key: "marketingCode", title: "销售订单号", type: "Input", },
-  { key: "isArrival", title: "到货超期", type: "Input", },
+  { key: "isArrival", title: "到货超期", type: "Checkbox", },
   { key: "createByName", title: "创建人名称", type: "Input", },
   { key: "updateByName", title: "更新人名称", type: "Input", },
   { key: "flowId", title: "OA流程ID", type: "Input", },
@@ -287,7 +290,12 @@ export const Columns = [
     type: "DatePicker",
     config: { type: "date" },
   },
-  { key: "approveTime", title: "提交时间", },
+  {
+    key: "approveTime",
+    title: "提交时间",
+    type: "DatePicker",
+    config: { type: "date" },
+  },
 
 ];
 
@@ -410,7 +418,7 @@ export const TabColumns = [
       { key: "materialClassifyThreeName", title: "物料三级分类名称", type: "Input", },
       // { key: "materialClassifyFour", title: "物料四级分类",type: "Input", },
       { key: "materialClassifyFourName", title: "物料四级分类名称", type: "Input", },
-      { key: "price", title: "无税单价" }
+      { key: "price", title: "无税单价", type: "Input", }
     ]
   },
   {

src/views/purchase/purchase-order/add/index.vue

@@ -1,6 +1,5 @@
 <script>
 import orderApi from "@/api/business/purchase/purchase-order";
-import { arr2obj } from "@/utils/data-transform";
 import { initColumns, initDicts, initRules, initParams } from "@/utils/init";
 import { Columns, TabColumns } from "./column";
 
@@ -10,9 +9,15 @@ const NewTabColumns = TabColumns.map((element) => ({
   tableColumns: initColumns(element.tableColumns),
 }));
 
+const SelectColumns = NewColumns.filter(column => column.type === 'Select')
+NewTabColumns.forEach(column => {
+  SelectColumns.push(...column.tableColumns.filter(cColumn => cColumn.type === 'Select'))
+});
+
+
 export default {
-  name: "AddPurchaseContractDrawer",
-  dicts: initDicts(NewColumns),
+  name: "AddPurchaseOrderDrawer",
+  dicts: initDicts(SelectColumns),
   components: {
     DrInputDialog: () => import("@/components/input-dialog/index.vue"),
   },
@@ -32,11 +37,6 @@ export default {
       tabColumns: NewTabColumns,
 
       tabName: "puOrderItemList",
-      // tabTableParams: {
-      //   puOrderItemList: [],
-      //   puOrderExecuteList: [],
-      // },
-      // currentComponent: { name: "", title: "", value: "", row: {}, source: {} },
     };
   },
   computed: {},
@@ -55,12 +55,14 @@ export default {
     setVisible(prop) {
       this.visible = prop;
     },
+    // 增行
     addTableRow(prop) {
       const arr = this.tabColumns.find(
         (element) => element.key === this.tabName
       ).tableColumns;
       prop.push(initParams(arr, "key", "value"));
     },
+    // 删行
     delTableRow(prop, index) {
       prop.splice(index, 1);
     },
@@ -86,7 +88,7 @@ export default {
       } finally {
         // this.setVisible(false);
       }
- 
+
 
 
     },
@@ -155,7 +157,7 @@ export default {
               <dr-input-dialog v-if="column.type === 'InputDialog'" v-model="params[column.key]"
                 :placeholder="column.placeholder" :clearable="column.clearable" :disabled="column.disabled"
                 :readonly="column.readonly" :title="column.title" :type="column.config.componentName"
-                :data-mapping="column.config.dataMapping" :source.sync="params">
+                :data-mapping="column.config.dataMapping" :query-params="column.config.queryParams" :source.sync="params">
               </dr-input-dialog>
               <el-input v-if="column.type === 'Textarea'" v-model="params[column.key]" type="textarea"
                 :placeholder="column.placeholder" :clearable="column.clearable" :disabled="column.disabled"
@@ -223,15 +225,24 @@ export default {
                   </dr-input-dialog>
                   <el-input-number v-if="cColumn.type === 'InputNumber'" v-model="scope.row[cColumn.key]"
                     :controls-position="cColumn.config.controlsPosition" :placeholder="cColumn.placeholder"
-                    :clearable="cColumn.clearable" :disabled="cColumn.disabled" size="mini"
-                    style="width: 100%"></el-input-number>
-                  <el-input v-if="column.type === 'InputDialog'" v-model="params[column.key]"
+                    :clearable="cColumn.clearable" :disabled="cColumn.disabled" size="mini" style="width: 100%">
+                  </el-input-number>
+                  <el-select v-if="cColumn.type === 'Select'" v-model="params[cColumn.key]"
+                    :placeholder="column.placeholder" :clearable="cColumn.clearable" :disabled="cColumn.disabled"
+                    style="width: 100%">
+                    <el-option v-for="item in dict.type[cColumn.config.optionsName]" :key="item.value" :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                  <el-checkbox v-else-if="cColumn.type === 'Checkbox'" v-model="params[cColumn.key]" true-label="Y"
+                    false-label="N"></el-checkbox>
+                  <!-- <el-input v-if="column.type === 'InputDialog'" v-model="params[column.key]"
                     :placeholder="column.placeholder" :clearable="column.clearable" :disabled="column.disabled"
                     :readonly="column.readonly" style="width: 100%; cursor: pointer">
                     <template #suffix>
                       <el-icon class="el-icon-thumb"></el-icon>
                     </template>
-                  </el-input>
+                  </el-input> -->
                 </template>
               </el-table-column>
               <el-table-column fixed="right" label="操作" width="120">

src/views/purchase/purchase-order/column.js

@@ -75,4 +75,105 @@ export const TableColumns = [
       { key: "midOrderNo", title: "中台采购订单号" }
 ];
 
+export const TabColumns = [
+   {
+     title: '物料信息',
+     key: 'puOrderItemList',
+     tableColumns: [
+       { key: "rowNo", title: "行号" },
+       { key: "orderId", title: "采购订单ID" },
+       { key: "material", title: "物料" },
+       { key: "materialName", title: "物料名称" },
+       { key: "materialCode", title: "物料编码" },
+       { key: "materialClassify", title: "物料分类" },
+       { key: "materialManufacturersCode", title: "厂家物料编码" },
+       { key: "specification", title: "规格" },
+       { key: "model", title: "型号" },
+       { key: "isMedcine", title: "医药物料" },
+       { key: "manufacturer", title: "生产厂家代理人" },
+       { key: "isDrug", title: "物料药品属性" },
+       { key: "unit", title: "单位" },
+       { key: "qty", title: "数量" },
+       { key: "taxPrice", title: "含税单价" },
+       { key: "money", title: "价税合计" },
+       { key: "tax", title: "税率" },
+       { key: "taxDeductMoneya", title: "折扣金额" },
+       { key: "arrivalQty", title: "已到货数量" },
+       { key: "unarrivedQty", title: "未到货数量" },
+       { key: "notaxMoney", title: "无税金额" },
+       { key: "priceSource", title: "价格目录ID" },
+       { key: "isStorage", title: "入库关闭" },
+       { key: "isInvoice", title: "开票关闭" },
+       { key: "isArrival", title: "到货关闭" },
+       { key: "isPayment", title: "付款关闭" },
+       { key: "isGift", title: "赠品" },
+       { key: "warehouse", title: "收货仓库" },
+       { key: "place", title: "收货地点" },
+       { key: "address", title: "收货地址" },
+       { key: "productBatch", title: "产品批号" },
+       { key: "manufactureDate", title: "生产日期" },
+       { key: "efficacyLoseDate", title: "有效期至/失效日期" },
+       { key: "approvalNumber", title: "批准文号" },
+       { key: "registration", title: "注册证号" },
+       { key: "storageCondition", title: "存储条件" },
+       { key: "carriageCondition", title: "运输条件" },
+       { key: "isBatchLock", title: "批号锁定标识" },
+       { key: "isReplenishment", title: "补单标识" },
+       { key: "isUrgency", title: "紧急标识" },
+       { key: "originalQty", title: "原始数量" },
+       { key: "originalMoney", title: "原始金额" },
+       { key: "directProductBatch", title: "直运产品批号" },
+       { key: "discountRule", title: "折扣规则编码" },
+       { key: "reservedQty", title: "预留数量" },
+       { key: "reservedPeriod", title: "预留周期" },
+       { key: "taxDeductClassify", title: "扣税类别" },
+       { key: "exchangeRate", title: "折本汇率" },
+       { key: "source", title: "上游单据号" },
+       { key: "sourceId", title: "上游单据ID" },
+       { key: "demandCode", title: "采购需求单号" },
+       { key: "arrivalDatePlan", title: "计划到货日期" },
+       { key: "priceType", title: "价格类型" },
+       { key: "isDistributionPrice", title: "配送价" },
+       // { key: "tenantId", title: "租户号" },
+       // { key: "revision", title: "乐观锁" },
+       { key: "createByName", title: "创建人名称" },
+       { key: "updateByName", title: "更新人名称" },
+       // { key: "delFlag", title: "删除标记" },
+       // { key: "materialClassifyOne", title: "物料一级分类" },
+       { key: "materialClassifyOneName", title: "物料一级分类名称" },
+       // { key: "materialClassifyTwo", title: "物料二级分类" },
+       { key: "materialClassifyTwoName", title: "物料二级分类名称" },
+       // { key: "materialClassifyThree", title: "物料三级分类" },
+       { key: "materialClassifyThreeName", title: "物料三级分类名称" },
+       // { key: "materialClassifyFour", title: "物料四级分类" },
+       { key: "materialClassifyFourName", title: "物料四级分类名称" },
+       { key: "price", title: "无税单价" }
+     ]
+   },
+   {
+     title: '执行结果',
+     key: 'puOrderExecuteList',
+     tableColumns: [
+       // { key: "id", title: "主键" },
+       { key: "orderId", title: "采购订单ID" },
+       { key: "rowno", title: "行号" },
+       { key: "material", title: "物料" },
+       { key: "materialName", title: "物料名称" },
+       { key: "specification", title: "规格" },
+       { key: "qty", title: "数量" },
+       { key: "stroageQty", title: "累计到货主数量" },
+       { key: "stockQty", title: "累计入库主数量" },
+       { key: "invoiceQty", title: "累计开票主数量" },
+       { key: "rollbackQty", title: "累计退货主数量" },
+       { key: "backStockQty", title: "累计退库主数量" },
+       { key: "floatQty", title: "未到货数量" },
+       // { key: "tenantId", title: "租户号" },
+       // { key: "revision", title: "乐观锁" },
+       { key: "createByName", title: "创建人名称" },
+       { key: "updateByName", title: "更新人名称" },
+       // { key: "delFlag", title: "删除标记" }
+     ]
+   },
+ ];
+
 export const SearchColumns = TableColumns.filter((element) => element.search);

src/views/purchase/purchase-order/edit/index.vue

@@ -8,10 +8,15 @@ const NewTabColumns = TabColumns.map((element) => ({
   ...element,
   tableColumns: initColumns(element.tableColumns),
 }));
+// 
+const SelectColumns = NewColumns.filter(column => column.type === 'Select')
+NewTabColumns.forEach(column => {
+  SelectColumns.push(...column.tableColumns.filter(cColumn => cColumn.type === 'Select'))
+});
 
 export default {
-  name: "EditPurchaseContractDrawer",
-  dicts: initDicts(NewColumns),
+  name: "EditPurchaseOrderDrawer",
+  dicts: initDicts(SelectColumns),
   components: {
     DrInputDialog: () => import("@/components/input-dialog/index.vue"),
   },
@@ -24,28 +29,25 @@ export default {
       rules: initRules(NewColumns),
       params: {
         ...initParams(NewColumns),
-        contractItemList: [],
-        contractClauseList: [],
-        contractExpenseList: [],
-        contractAgreementList: [],
-        contractApplyOrgList: [],
+        puOrderItemList: [],
+        puOrderExecuteList: [],
       },
 
       tabColumns: NewTabColumns,
-      tabName: "contractItemList",
+      tabName: "puOrderItemList",
     };
   },
   computed: {},
   watch: {
     "params.contractType": function (newProp) {
       this.tabColumns = NewTabColumns.filter((element) =>
-        newProp === "1" ? element.key !== "contractItemList" : element
+        newProp === "1" ? element.key !== "puOrderItemList" : element
       );
       this.tabName = this.tabColumns[0].key;
     },
     tabName: function (newProp) {
       const { id } = this.params;
-      this.fetchTable(id, newProp);
+      // this.fetchTable(id, newProp);
     },
   },
   methods: {
@@ -58,7 +60,8 @@ export default {
         this.loading = true;
         const { code, msg, data } = await orderApi.details(prop);
         if (code === 200) {
-          this.params = data;
+          this.params = { ...this.params, ...data };
+          console.log(this.params, 'this.params----------');
           this.$notify.success({ title: msg });
         } else {
           this.$notify.warning({ title: msg });
@@ -70,22 +73,22 @@ export default {
       }
     },
     // 查询详情关联TABLE
-    async fetchTable(prop, name) {
-      try {
-        this.loading = true;
-        const { code, msg, rows } = await itemTableList({ id: prop }, name);
-        if (code === 200) {
-          this.params[name] = rows;
-          this.$notify.success({ title: msg });
-        } else {
-          this.$notify.warning({ title: msg });
-        }
-      } catch (err) {
-        this.$notify.error({ title: "error", message: err });
-      } finally {
-        this.loading = false;
-      }
-    },
+    // async fetchTable(prop, name) {
+    //   try {
+    //     this.loading = true;
+    //     const { code, msg, rows } = await itemTableList({ id: prop }, name);
+    //     if (code === 200) {
+    //       this.params[name] = rows;
+    //       this.$notify.success({ title: msg });
+    //     } else {
+    //       this.$notify.warning({ title: msg });
+    //     }
+    //   } catch (err) {
+    //     this.$notify.error({ title: "error", message: err });
+    //   } finally {
+    //     this.loading = false;
+    //   }
+    // },
     // 新增行
     addTableRow(prop) {
       const arr = this.tabColumns.find(
@@ -103,39 +106,37 @@ export default {
       this.params = initParams(this.columns, "key", "value");
     },
     // 保存
-    handleSava() {
-      this.setVisible(false);
-    },
-    // 保存并新增
-    async handleSubmit() {
+    async handleSava() {
+
       try {
-        const createById = this.params.buyer;
-        const createByName = this.params.buyerName;
-        const updateById = this.$store.state.user.id;
-        const updateByName = this.$store.state.user.name;
-        const { code, msg } = await edit({
-          createById,
-          createByName,
-          updateById,
-          updateByName,
-          ...this.params,
-        });
+        this.loading = true;
+        const { code, msg } = await (this.handleIsRevise(this.params.status) ?
+          orderApi.revision(this.params)
+          : orderApi.edit(this.params)
+        )
         if (code === 200) {
-          this.$notify.success({ title: msg });
           this.setVisible(false);
+          this.$notify.success({ title: msg });
         } else {
           this.$notify.warning({ title: msg });
         }
       } catch (err) {
         this.$notify.error({ title: "error", message: err });
       } finally {
-        // this.setVisible(false);
+        this.loading = false;
       }
+
+    },
+    beforeOpen() {
+    },
+    // 判断修订还是编辑
+    handleIsRevise(status) {
+      return status == '2';
     },
-    beforeOpen() { },
   },
   created() {
     console.log("ADD CREATED");
+    console.log(this.params, 'this.params');
   },
   mounted() { },
   destroyed() { },
@@ -155,7 +156,7 @@ export default {
             justify-content: space-between;
             align-items: center;
           ">
-          <h3>编辑</h3>
+          <h3>{{ handleIsRevise(params.status) ? '修订' : '编辑' }}</h3>
           <div style="text-align: right">
             <el-button :size="size" @click="handleCancel">取 消</el-button>
             <el-button :size="size" type="danger" @click="handleSava">更 新</el-button>
@@ -165,18 +166,21 @@ export default {
           <el-col v-for="(column, index) in columns" :key="index" :span="column.span || 6">
             <el-form-item :prop="column.key" :label="column.title">
               <el-input v-if="column.type === 'Input'" v-model="params[column.key]" :placeholder="column.placeholder"
-                :clearable="column.clearable" :disabled="column.disabled" style="width: 100%"></el-input>
+                :clearable="column.clearable" :disabled="column.disabled" style="width: 100%">
+              </el-input>
               <dr-input-dialog v-if="column.type === 'InputDialog'" v-model="params[column.key]"
                 :placeholder="column.placeholder" :clearable="column.clearable" :disabled="column.disabled"
-                :readonly="column.readonly" :title="column.title" :type="column.config.componentName"
-                :data-mapping="column.config.dataMapping" :source.sync="params">
+                :readonly="column.readonly" :query-params="column.config.queryParams" :title="column.title"
+                :type="column.config.componentName" :data-mapping="column.config.dataMapping" :source.sync="params">
               </dr-input-dialog>
               <el-input v-if="column.type === 'Textarea'" v-model="params[column.key]" type="textarea"
                 :placeholder="column.placeholder" :clearable="column.clearable" :disabled="column.disabled"
-                style="width: 100%"></el-input>
+                style="width: 100%">
+              </el-input>
               <el-input-number v-if="column.type === 'InputNumber'" v-model="params[column.key]"
                 :controls-position="column.config.controlsPosition" :placeholder="column.placeholder"
-                :clearable="column.clearable" :disabled="column.disabled" style="width: 100%"></el-input-number>
+                :clearable="column.clearable" :disabled="column.disabled" style="width: 100%">
+              </el-input-number>
               <el-select v-if="column.type === 'Select'" v-model="params[column.key]" :placeholder="column.placeholder"
                 :clearable="column.clearable" :disabled="column.disabled" style="width: 100%">
                 <el-option v-for="item in dict.type[column.config.optionsName]" :key="item.value" :label="item.label"
@@ -196,7 +200,9 @@ export default {
                 :placeholder="column.placeholder" :clearable="column.clearable" :disabled="column.disabled"
                 :picker-options="column.pickerOptions" style="width: 100%">
               </el-date-picker>
-              <el-checkbox v-else-if="column.type === 'Checkbox'" v-model="params[column.key]" true-label="Y" false-label="N"></el-checkbox>
+              <el-checkbox v-else-if="column.type === 'Checkbox'" v-model="params[column.key]" :disabled="column.disabled"
+                true-label="Y" false-label="N">
+              </el-checkbox>
               <el-upload v-if="column.type === 'Upload'" :file-list="params[column.key]" :disabled="column.disabled" drag
                 action="https://sy.derom.com/document-center/fastdfs/upload" multiple>
                 <i class="el-icon-upload"></i>
@@ -232,17 +238,27 @@ export default {
                     {{ scope.row[cColumn.key] }}</span>
                   <el-input v-if="cColumn.type === 'Input'" v-model="scope.row[cColumn.key]"
                     :placeholder="cColumn.placeholder" :clearable="cColumn.clearable" :disabled="cColumn.disabled"
-                    :size="size" style="width: 100%"></el-input>
+                    :size="size" style="width: 100%">
+                  </el-input>
                   <dr-input-dialog v-if="cColumn.type === 'InputDialog'" v-model="scope.row[cColumn.key]"
                     :placeholder="cColumn.placeholder" :clearable="cColumn.clearable" :disabled="cColumn.disabled"
                     :readonly="cColumn.readonly" :title="cColumn.title" :type="cColumn.config.componentName"
                     :data-mapping="cColumn.config.dataMapping" :source.sync="scope.row" :size="size">
                   </dr-input-dialog>
-                  <el-checkbox v-else-if="column.type === 'Checkbox'" v-model="params[column.key]" true-label="Y" false-label="N"></el-checkbox>
+                  <el-select v-if="cColumn.type === 'Select'" v-model="params[cColumn.key]"
+                    :placeholder="column.placeholder" :clearable="cColumn.clearable" :disabled="cColumn.disabled"
+                    style="width: 100%">
+                    <el-option v-for="item in dict.type[cColumn.config.optionsName]" :key="item.value" :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                  <el-checkbox v-else-if="cColumn.type === 'Checkbox'" v-model="params[cColumn.key]" true-label="Y"
+                    false-label="N">
+                  </el-checkbox>
                   <el-input-number v-if="cColumn.type === 'InputNumber'" v-model="scope.row[cColumn.key]"
                     :controls-position="cColumn.config.controlsPosition" :placeholder="cColumn.placeholder"
-                    :clearable="cColumn.clearable" :disabled="cColumn.disabled" :size="size"
-                    style="width: 100%"></el-input-number>
+                    :clearable="cColumn.clearable" :disabled="cColumn.disabled" :size="size" style="width: 100%">
+                  </el-input-number>
                 </template>
               </el-table-column>
               <el-table-column fixed="right" label="操作" width="120">

src/views/purchase/purchase-order/index.vue

@@ -1,10 +1,10 @@
 <!-- 采购订单修订—— 列表 -->
 <script>
-import { TableColumns, SearchColumns } from "./column";
+import { TableColumns, SearchColumns, TabColumns } from "./column";
 import orderApi from "@/api/business/purchase/purchase-order";
 import { initPage, initLayout, initPageSizes, initParams } from "@/utils/init";
 export default {
-  name: "PuchaseTask",
+  name: "PuchaseOrder",
   components: {
     AddDrawer: () => import('./add/index.vue'),
     SeeDrawer: () => import('./see/index.vue'),
@@ -12,107 +12,107 @@ export default {
   },
   data() {
 
-    const tabColumns = [
-      {
-        title: '物料信息',
-        key: 'first',
-        tableColumns: [
-          { key: "rowNo", title: "行号" },
-          { key: "orderId", title: "采购订单ID" },
-          { key: "material", title: "物料" },
-          { key: "materialName", title: "物料名称" },
-          { key: "materialCode", title: "物料编码" },
-          { key: "materialClassify", title: "物料分类" },
-          { key: "materialManufacturersCode", title: "厂家物料编码" },
-          { key: "specification", title: "规格" },
-          { key: "model", title: "型号" },
-          { key: "isMedcine", title: "医药物料" },
-          { key: "manufacturer", title: "生产厂家代理人" },
-          { key: "isDrug", title: "物料药品属性" },
-          { key: "unit", title: "单位" },
-          { key: "qty", title: "数量" },
-          { key: "taxPrice", title: "含税单价" },
-          { key: "money", title: "价税合计" },
-          { key: "tax", title: "税率" },
-          { key: "taxDeductMoneya", title: "折扣金额" },
-          { key: "arrivalQty", title: "已到货数量" },
-          { key: "unarrivedQty", title: "未到货数量" },
-          { key: "notaxMoney", title: "无税金额" },
-          { key: "priceSource", title: "价格目录ID" },
-          { key: "isStorage", title: "入库关闭" },
-          { key: "isInvoice", title: "开票关闭" },
-          { key: "isArrival", title: "到货关闭" },
-          { key: "isPayment", title: "付款关闭" },
-          { key: "isGift", title: "赠品" },
-          { key: "warehouse", title: "收货仓库" },
-          { key: "place", title: "收货地点" },
-          { key: "address", title: "收货地址" },
-          { key: "productBatch", title: "产品批号" },
-          { key: "manufactureDate", title: "生产日期" },
-          { key: "efficacyLoseDate", title: "有效期至/失效日期" },
-          { key: "approvalNumber", title: "批准文号" },
-          { key: "registration", title: "注册证号" },
-          { key: "storageCondition", title: "存储条件" },
-          { key: "carriageCondition", title: "运输条件" },
-          { key: "isBatchLock", title: "批号锁定标识" },
-          { key: "isReplenishment", title: "补单标识" },
-          { key: "isUrgency", title: "紧急标识" },
-          { key: "originalQty", title: "原始数量" },
-          { key: "originalMoney", title: "原始金额" },
-          { key: "directProductBatch", title: "直运产品批号" },
-          { key: "discountRule", title: "折扣规则编码" },
-          { key: "reservedQty", title: "预留数量" },
-          { key: "reservedPeriod", title: "预留周期" },
-          { key: "taxDeductClassify", title: "扣税类别" },
-          { key: "exchangeRate", title: "折本汇率" },
-          { key: "source", title: "上游单据号" },
-          { key: "sourceId", title: "上游单据ID" },
-          { key: "demandCode", title: "采购需求单号" },
-          { key: "arrivalDatePlan", title: "计划到货日期" },
-          { key: "priceType", title: "价格类型" },
-          { key: "isDistributionPrice", title: "配送价" },
-          // { key: "tenantId", title: "租户号" },
-          // { key: "revision", title: "乐观锁" },
-          { key: "createByName", title: "创建人名称" },
-          { key: "updateByName", title: "更新人名称" },
-          // { key: "delFlag", title: "删除标记" },
-          // { key: "materialClassifyOne", title: "物料一级分类" },
-          { key: "materialClassifyOneName", title: "物料一级分类名称" },
-          // { key: "materialClassifyTwo", title: "物料二级分类" },
-          { key: "materialClassifyTwoName", title: "物料二级分类名称" },
-          // { key: "materialClassifyThree", title: "物料三级分类" },
-          { key: "materialClassifyThreeName", title: "物料三级分类名称" },
-          // { key: "materialClassifyFour", title: "物料四级分类" },
-          { key: "materialClassifyFourName", title: "物料四级分类名称" },
-          { key: "price", title: "无税单价" }
-        ]
-      },
-      {
-        title: '执行结果',
-        key: 'second',
-        tableColumns: [
-          // { key: "id", title: "主键" },
-          { key: "orderId", title: "采购订单ID" },
-          { key: "rowno", title: "行号" },
-          { key: "material", title: "物料" },
-          { key: "materialName", title: "物料名称" },
-          { key: "specification", title: "规格" },
-          { key: "qty", title: "数量" },
-          { key: "stroageQty", title: "累计到货主数量" },
-          { key: "stockQty", title: "累计入库主数量" },
-          { key: "invoiceQty", title: "累计开票主数量" },
-          { key: "rollbackQty", title: "累计退货主数量" },
-          { key: "backStockQty", title: "累计退库主数量" },
-          { key: "floatQty", title: "未到货数量" },
-          // { key: "tenantId", title: "租户号" },
-          // { key: "revision", title: "乐观锁" },
-          { key: "createByName", title: "创建人名称" },
-          { key: "updateByName", title: "更新人名称" },
-          // { key: "delFlag", title: "删除标记" }
-        ]
-      },
-    ];
-    const initTabColumns = () => tabColumns;
+    // const tabColumns = [
+    //   {
+    //     title: '物料信息',
+    //     key: 'first',
+    //     tableColumns: [
+    //       { key: "rowNo", title: "行号" },
+    //       { key: "orderId", title: "采购订单ID" },
+    //       { key: "material", title: "物料" },
+    //       { key: "materialName", title: "物料名称" },
+    //       { key: "materialCode", title: "物料编码" },
+    //       { key: "materialClassify", title: "物料分类" },
+    //       { key: "materialManufacturersCode", title: "厂家物料编码" },
+    //       { key: "specification", title: "规格" },
+    //       { key: "model", title: "型号" },
+    //       { key: "isMedcine", title: "医药物料" },
+    //       { key: "manufacturer", title: "生产厂家代理人" },
+    //       { key: "isDrug", title: "物料药品属性" },
+    //       { key: "unit", title: "单位" },
+    //       { key: "qty", title: "数量" },
+    //       { key: "taxPrice", title: "含税单价" },
+    //       { key: "money", title: "价税合计" },
+    //       { key: "tax", title: "税率" },
+    //       { key: "taxDeductMoneya", title: "折扣金额" },
+    //       { key: "arrivalQty", title: "已到货数量" },
+    //       { key: "unarrivedQty", title: "未到货数量" },
+    //       { key: "notaxMoney", title: "无税金额" },
+    //       { key: "priceSource", title: "价格目录ID" },
+    //       { key: "isStorage", title: "入库关闭" },
+    //       { key: "isInvoice", title: "开票关闭" },
+    //       { key: "isArrival", title: "到货关闭" },
+    //       { key: "isPayment", title: "付款关闭" },
+    //       { key: "isGift", title: "赠品" },
+    //       { key: "warehouse", title: "收货仓库" },
+    //       { key: "place", title: "收货地点" },
+    //       { key: "address", title: "收货地址" },
+    //       { key: "productBatch", title: "产品批号" },
+    //       { key: "manufactureDate", title: "生产日期" },
+    //       { key: "efficacyLoseDate", title: "有效期至/失效日期" },
+    //       { key: "approvalNumber", title: "批准文号" },
+    //       { key: "registration", title: "注册证号" },
+    //       { key: "storageCondition", title: "存储条件" },
+    //       { key: "carriageCondition", title: "运输条件" },
+    //       { key: "isBatchLock", title: "批号锁定标识" },
+    //       { key: "isReplenishment", title: "补单标识" },
+    //       { key: "isUrgency", title: "紧急标识" },
+    //       { key: "originalQty", title: "原始数量" },
+    //       { key: "originalMoney", title: "原始金额" },
+    //       { key: "directProductBatch", title: "直运产品批号" },
+    //       { key: "discountRule", title: "折扣规则编码" },
+    //       { key: "reservedQty", title: "预留数量" },
+    //       { key: "reservedPeriod", title: "预留周期" },
+    //       { key: "taxDeductClassify", title: "扣税类别" },
+    //       { key: "exchangeRate", title: "折本汇率" },
+    //       { key: "source", title: "上游单据号" },
+    //       { key: "sourceId", title: "上游单据ID" },
+    //       { key: "demandCode", title: "采购需求单号" },
+    //       { key: "arrivalDatePlan", title: "计划到货日期" },
+    //       { key: "priceType", title: "价格类型" },
+    //       { key: "isDistributionPrice", title: "配送价" },
+    //       // { key: "tenantId", title: "租户号" },
+    //       // { key: "revision", title: "乐观锁" },
+    //       { key: "createByName", title: "创建人名称" },
+    //       { key: "updateByName", title: "更新人名称" },
+    //       // { key: "delFlag", title: "删除标记" },
+    //       // { key: "materialClassifyOne", title: "物料一级分类" },
+    //       { key: "materialClassifyOneName", title: "物料一级分类名称" },
+    //       // { key: "materialClassifyTwo", title: "物料二级分类" },
+    //       { key: "materialClassifyTwoName", title: "物料二级分类名称" },
+    //       // { key: "materialClassifyThree", title: "物料三级分类" },
+    //       { key: "materialClassifyThreeName", title: "物料三级分类名称" },
+    //       // { key: "materialClassifyFour", title: "物料四级分类" },
+    //       { key: "materialClassifyFourName", title: "物料四级分类名称" },
+    //       { key: "price", title: "无税单价" }
+    //     ]
+    //   },
+    //   {
+    //     title: '执行结果',
+    //     key: 'second',
+    //     tableColumns: [
+    //       // { key: "id", title: "主键" },
+    //       { key: "orderId", title: "采购订单ID" },
+    //       { key: "rowno", title: "行号" },
+    //       { key: "material", title: "物料" },
+    //       { key: "materialName", title: "物料名称" },
+    //       { key: "specification", title: "规格" },
+    //       { key: "qty", title: "数量" },
+    //       { key: "stroageQty", title: "累计到货主数量" },
+    //       { key: "stockQty", title: "累计入库主数量" },
+    //       { key: "invoiceQty", title: "累计开票主数量" },
+    //       { key: "rollbackQty", title: "累计退货主数量" },
+    //       { key: "backStockQty", title: "累计退库主数量" },
+    //       { key: "floatQty", title: "未到货数量" },
+    //       // { key: "tenantId", title: "租户号" },
+    //       // { key: "revision", title: "乐观锁" },
+    //       { key: "createByName", title: "创建人名称" },
+    //       { key: "updateByName", title: "更新人名称" },
+    //       // { key: "delFlag", title: "删除标记" }
+    //     ]
+    //   },
+    // ];
+    const initTabColumns = () => TabColumns;
     return {
       loading: false,
       isSimpleSearch: true,
@@ -125,12 +125,11 @@ export default {
       tableColumns: TableColumns,
       tableData: [],
       tabColumns: initTabColumns(),
-      tabName: "first",
+      tabName: "puOrderItemList",
       tabTableDatas: {
-        first: [],
-        second: [],
+        puOrderItemList: [],
+        puOrderExecuteList: [],
       },
-      checkedData: {}
     };
   },
   computed: {
@@ -202,8 +201,9 @@ export default {
     },
     // 重置操作
     handleResetList() {
+
       this.page = initPage();
-      this.params = initParams();
+      this.params = initParams(SearchColumns);
       this.fetchList(this.params, this.page);
     },
     handleTabClick() { },
@@ -232,10 +232,10 @@ export default {
       try {
         const { code, msg, data } = await orderApi.details(row.id);
         if (code === 200) {
-          this.checkedData = data;
           // 物料信息:puOrderItemList   执行结果:puOrderExecuteList
-          this.tabTableDatas.first = data.puOrderItemList;
-          this.tabTableDatas.second = data.puOrderExecuteList;
+          for (const key in this.tabTableDatas) {
+            this.tabTableDatas[key] = data[key];
+          }
           this.$notify.success({ title: msg });
         } else {
           this.$notify.warning({ title: msg });
@@ -247,10 +247,10 @@ export default {
       }
     },
     // 删除操作
-    async handleDeleteList(prop) {
+    async handleDeleteList(row) {
       try {
         this.loading = true;
-        const { id } = prop;
+        const { id } = row;
         console.log(id, 'id');
         const { code, msg } = await orderApi.remove(id);
         if (code === 200) {
@@ -265,6 +265,10 @@ export default {
         this.loading = false;
       }
     },
+    // 提交
+    async handleSubmit(row) {
+
+    }
 
   },
 };
@@ -273,8 +277,8 @@ export default {
 <template>
   <el-card v-loading="loading" style="width: calc(100% - 24px); height: 100%; margin: 10px" :body-style="{ padding: 0 }">
     <SeeDrawer ref="seeDrawerFef"></SeeDrawer>
-    <AddDrawer ref="addDrawerFef" @close="handleResetList"></AddDrawer>
-    <EditDrawer ref="editDrawerFef" @close="handleResetList"></EditDrawer>
+    <AddDrawer ref="addDrawerFef" @close="handleRefreshList"></AddDrawer>
+    <EditDrawer ref="editDrawerFef" @close="handleRefreshList"></EditDrawer>
 
     <el-form size="mini" label-position="right" label-width="100px" :model="params" style="padding: 20px 0 0 0">
       <el-row :gutter="24">
@@ -306,11 +310,10 @@ export default {
         <el-button-group style="margin-left: 10px">
           <el-button size="mini" type="danger" @click="handleOpenAddDrawer">新增</el-button>
           <el-button size="mini">复制</el-button>
-          <el-button size="mini">提交</el-button>
+
         </el-button-group>
 
         <el-button-group style="margin-left: 10px">
-          <!-- <el-button size="mini" :disabled="checkedData.status != '2'">修订</el-button> -->
           <el-button size="mini">退回</el-button>
         </el-button-group>
 
@@ -331,10 +334,13 @@ export default {
       </el-table-column>
       <el-table-column fixed="right" label="操作" width="120">
         <template slot-scope="scope">
-          <el-button @click.stop="handleOpenSeeDrawer(scope.row)" type="text" size="small">查看</el-button>
+          <!-- <el-button @click.stop="handleOpenSeeDrawer(scope.row)" type="text" size="small">查看</el-button> -->
           <el-button type="text" size="small" @click.stop="handleOpenEditDrawer(scope.row)">
             {{ scope.row.status == '2' ? '修订' : '编辑' }}</el-button>
+          <!-- 0=自由态，1=审批中，2=已审核，3=已驳回 -->
           <el-button type="text" size="small" @click.stop="handleDeleteList(scope.row)">删除</el-button>
+          <el-button v-if="scope.row.status == '0' || scope.row.status == '3'" type="text" size="mini"
+            @click.stop="handleSubmit(scope.row)">提交</el-button>
         </template>
       </el-table-column>
 
@@ -344,11 +350,6 @@ export default {
       :layout="layout">
     </el-pagination>
 
-    <!-- <el-card :body-style="{
-      padding: '20px',
-      display: 'flex',
-      'flex-wrap': 'wrap',
-    }" style="margin: 10px"> -->
     <el-tabs v-model="tabName" @tab-click="handleTabClick" style="width: 100%;padding: 20px 10px">
       <el-tab-pane v-for="(column, index) in tabColumns" :key="index" :label="column.title" :name="column.key">
         <el-table :data="tabTableDatas[column.key]" style="width: 100%" highlight-current-row>
@@ -359,7 +360,6 @@ export default {
         </el-table>
       </el-tab-pane>
     </el-tabs>
-    <!-- </el-card> -->
 
   </el-card>
 </template>

src/views/purchase/purchase-order/see/index.vue

@@ -12,12 +12,15 @@ import orderApi from "@/api/business/purchase/purchase-order";
 const NewColumns = initColumns(Columns, { disabled: true, readonly: true });
 const NewTabColumns = TabColumns.map((element) => ({
   ...element,
-  tableColumns: initColumns(element.tableColumns),
+  tableColumns: initColumns(element.tableColumns, {
+    disabled: true,
+    readonly: true,
+  }),
 }));
 
 
 export default {
-  name: "SeePurchaseContractDrawer",
+  name: "SeePurchaseOrderDrawer",
   dicts: initDicts(NewColumns),
   data() {
     return {
@@ -107,7 +110,8 @@ export default {
                 </el-option>
               </el-select>
               <el-checkbox v-else-if="column.type === 'Checkbox'" v-model="params[column.key]" true-label="Y"
-                false-label="N"></el-checkbox>
+                false-label="N" :disabled="column.disabled" :readonly="column.readonly">
+              </el-checkbox>
 
               <el-date-picker v-else-if="column.type === 'DatePicker'" v-model="params[column.key]"
                 :type="column.config.type" :placeholder="column.placeholder" :clearable="column.clearable"
@@ -148,21 +152,21 @@ export default {
                   </el-tag>
                   <el-input v-if="cColumn.type === 'Input'" v-model="scope.row[cColumn.key]"
                     :placeholder="cColumn.placeholder" :clearable="cColumn.clearable" :disabled="cColumn.disabled"
-                    size="mini" style="width: 100%"></el-input>
+                    :readonly="cColumn.readonly" size="mini" style="width: 100%"></el-input>
                   <el-input-number v-if="cColumn.type === 'InputNumber'" v-model="scope.row[cColumn.key]"
                     :controls-position="cColumn.config.controlsPosition" :placeholder="cColumn.placeholder"
-                    :clearable="cColumn.clearable" :disabled="cColumn.disabled" size="mini"
+                    :clearable="cColumn.clearable" :disabled="cColumn.disabled" :readonly="cColumn.readonly" size="mini"
                     style="width: 100%"></el-input-number>
                   <el-input v-if="column.type === 'InputDialog'" v-model="params[column.key]"
-                    :placeholder="column.placeholder" :clearable="column.clearable" :disabled="column.disabled"
-                    :readonly="column.readonly" style="width: 100%; cursor: pointer"
+                    :placeholder="column.placeholder" :clearable="column.clearable" :disabled="cColumn.disabled"
+                    :readonly="cColumn.readonly" style="width: 100%; cursor: pointer"
                     @click.native.stop="openAsyncInputDialog(column, params)">
                     <template #suffix>
                       <el-icon class="el-icon-thumb"></el-icon>
                     </template>
                   </el-input>
                   <el-checkbox v-else-if="column.type === 'Checkbox'" v-model="params[column.key]" true-label="Y"
-                    false-label="N"></el-checkbox>
+                    :disabled="cColumn.disabled" false-label="N"></el-checkbox>
                 </template>
               </el-table-column>
               <!-- <el-table-column fixed="right" label="操作" width="120">

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,159 @@
         </el-col>
       </el-row>
 
+      <el-tabs style="margin-top: 10px;" type="border-card">
+        <el-tab-pane label="物料信息">
+          <div class="btn_grooup">
+            <el-button type="primary" size="small" @click="addLine">增行</el-button>
+          </div>
+          <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 +408,7 @@
                 style="width: 200px"
               />
             </el-form-item>
-         </el-col>
+          </el-col>
         <el-col :span="1.5">
             <el-form-item label="制单日期">
               <el-input
@@ -269,7 +419,7 @@
                 style="width: 200px"
               />
             </el-form-item>
-         </el-col>
+          </el-col>
         <el-col :span="1.5">
             <el-form-item label="审批人">
               <el-input
@@ -280,7 +430,7 @@
                 style="width: 200px"
               />
             </el-form-item>
-         </el-col>
+          </el-col>
         <el-col :span="1.5">
             <el-form-item label="审批日期">
               <el-input
@@ -291,7 +441,7 @@
                 style="width: 200px"
               />
             </el-form-item>
-         </el-col>
+          </el-col>
       </el-row>
 
       <el-divider content-position="left">审计信息</el-divider>
@@ -306,7 +456,7 @@
                 style="width: 200px"
               />
             </el-form-item>
-         </el-col>
+          </el-col>
         <el-col :span="1.5">
             <el-form-item label="创建时间">
               <el-input
@@ -317,7 +467,7 @@
                 style="width: 200px"
               />
             </el-form-item>
-         </el-col>
+          </el-col>
         <el-col :span="1.5">
             <el-form-item label="最后修改人">
               <el-input
@@ -328,7 +478,7 @@
                 style="width: 200px"
               />
             </el-form-item>
-         </el-col>
+          </el-col>
         <el-col :span="1.5">
             <el-form-item label="最后修改时间">
               <el-input
@@ -339,158 +489,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 +511,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',
@@ -619,6 +620,11 @@ export default {
         }
       })
     },
+    addLine() {},
+    delLine(index) {
+      // console.log('删除行:', index)
+      // this.basicForm.puDemandItemList.splice(index, 1)
+    },
   }
 }
 </script>

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本地