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

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

@@ -1,21 +1,45 @@
 import request from "@/utils/request";
 
-const list = (params) => {
+// 采购订单修订列表
+const orderList = (data) => {
   return request({
-    url: "/pu/order",
+    url: `/pu/order`,
+    method: "post",
+    data,
+  });
+}
+
+// 采购订单详情
+const orderDetails = (params) => {
+  return request({
+    url: `/pu/order/${params.id}`,
     method: "get",
-    params: params,
+    params,
   });
 }
 
-const orderlist = (params) => {
+// 采购订单修订创建
+const orderCreate = (data) => {
   return request({
-    url: "/pu/order",
+    url: `/pu/order/create`,
     method: "post",
-    data: data,
+    data,
+  });
+}
+
+// 参照查询
+const referQuery = (data) => {
+  return request({
+    url: `/refer/query`,
+    method: "post",
+    data,
   });
 }
 
 export default {
-  orderlist,
+  referQuery,
+  orderList,
+  orderDetails,
+  orderCreate,
+
 }

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

@@ -1,7 +1,240 @@
-const columns = [];
+const columns = [
+  // { key: "id", title: "主键",type: "Input", },
+  {
+    key: "puOrg",
+    title: "采购组织",
+    type: "InputDialog",
+    config: {
+      componentName: "Organization",
+      dataMapping: { puOrg: "deptName" },
+    },
+    require: true,
+  },
+  // { key: "puOrgName", title: "采购组织名称", },
+  { key: "billType", title: "订单类型", type: "Input", },
+  // { key: "billTypeName", title: "订单类型名称", },
+  { key: "oaDemandNo", title: "OA需求单号", type: "Input", },
+  { key: "code", title: "订单编号", type: "Input", },
+  {
+    key: "billDate",
+    title: "订单日期",
+    type: "DatePicker",
+    config: { type: "date" },
+  },
+  {
+    key: "supplier",
+    title: "供应商",
+    type: "InputDialog",
+    config: {
+      componentName: "Supplier",
+      dataMapping: { supplier: "name" },
+    },
+    require: true,
+  },
+  // { key: "supplierName", title: "供应商名称", },
+  { key: "paymentAgreement", title: "付款协议", type: "Input", },
+  { key: "finalType", title: "结算方式", type: "Input", },
+  { key: "currency", title: "币种", type: "Input", },
+  // { key: "currencyName", title: "币种名称", },
+  {
+    key: "buyer",
+    title: "采购员",
+    type: "InputDialog",
+    config: {
+      componentName: "User",
+      dataMapping: {
+        buyer: "userName",
+        puDept: "deptName",
+      },
+    },
+    require: true,
+  },
+  // { key: "buyerName", title: "采购员名称", },
+  {
+    key: "puDept",
+    title: "采购部门",
+    type: "InputDialog",
+    config: { componentName: "Department" },
+    require: true,
+  },
+  // { key: "puDeptName", title: "采购部门名称", },
+  { key: "customer", title: "收货客户", type: "Input", },
+  // { key: "customerName", title: "收货客户名称", },
+  {
+    key: "qty",
+    title: "总数量",
+    type: "InputNumber",
+    config: { controlsPosition: "right" },
+  },
+  {
+    key: "originalQty",
+    title: "原始总数量",
+    type: "InputNumber",
+    config: { controlsPosition: "right" },
+  },
+  { key: "money", title: "价税合计", type: "Input", },
+  { key: "originalMoney", title: "原始总金额", type: "Input", },
+  { key: "notaxMoney", title: "无税金额", type: "Input", },
+  { key: "status", title: "单据状态", type: "Input", },
+  { key: "freezeCause", title: "冻结原因", type: "Input", },
+  { key: "isBack", title: "退货", type: "Input", type: "Input", },
+  { key: "isMarketing", title: "已协同生成销售订单", type: "Input", },
+  { key: "isMarketingSource", title: "由销售订单协同生成", type: "Input", },
+  { key: "warehouse", title: "WMS入库仓库", type: "Input", },
+  // { key: "warehouseName", title: "WMS入库仓库名称", },
+  { key: "goodsAllocation", title: "货位", type: "Input", },
+  // { key: "goodsAllocationName", title: "货位名称", },
+  { key: "isSendSrm", title: "是否同步SRM", type: "Checkbox", },
+  { key: "isInvoice", title: "发票标识", type: "Input", },
+  { key: "supplierOrderNo", title: "供应商订单号", type: "Input", },
+  { key: "rebateMoney", title: "订单使用返利金额", type: "Input", },
+  { key: "deductionMoney", title: "订单抵扣余款金额", type: "Input", },
+  { key: "address", title: "收货地址", type: "Input", },
+  { key: "contacts", title: "收货联系人", type: "Input", },
+  { key: "customerDept", title: "客户部门", type: "Input", },
+  // { key: "customerDeptName", title: "客户部门名称", },
+  { key: "supplierContacts", title: "供应商业务联系人", type: "Input", },
+  // { key: "supplierContactsName", title: "供应商业务联系人名称", },
+  { key: "isUrgency", title: "紧急程度", type: "Input", },
+  { key: "isSendWms", title: "已同步WMS", type: "Input", },
+  { key: "agent", title: "代理人", type: "Input", },
+  // { key: "agentName", title: "代理人名称", },
+  { key: "isClose", title: "最终关闭", type: "Input", },
+  { key: "closeTime", title: "最终关闭日期", type: "Input", },
+  { key: "applyPaymentMoney", title: "累计付款申请金额", type: "Input", },
+  { key: "paymentMoney", title: "累计付款金额", type: "Input", },
+  { key: "invoiceMoney", title: "发票金额", type: "Input", },
+  { key: "supplierPersonal", title: "供应商业务员", type: "Input", },
+  // { key: "supplierPersonalName", title: "供应商业务员名称", },
+  { key: "isDeliver", title: "是否发货", type: "Input", },
+  { key: "retReason", title: "退换原因", type: "Input", },
+  { key: "processType", title: "处理方式", type: "Input", },
+  { key: "isEnd", title: "整单关闭标识", type: "Input", },
+  { key: "projectNow", title: "在建工程项目", type: "Input", },
+  { key: "operatingItems", title: "经营性项目", type: "Input", },
+  { key: "isArrivalReson", title: "到货超期原因", type: "Input", },
+  { key: "midOrderNo", title: "中台采购订单号", type: "Input", },
+  { key: "marketingCode", title: "销售订单号", type: "Input", },
+  { key: "isArrival", title: "到货超期", type: "Input", },
+  // { key: "tenantId", title: "租户号", },
+  // { key: "revision", title: "乐观锁", },
+  { key: "createByName", title: "创建人名称", type: "Input", },
+  { key: "updateByName", title: "更新人名称", type: "Input", },
+  // { key: "delFlag", title: "删除标记", },
+  { key: "flowId", title: "OA流程ID", type: "Input", },
+  { key: "approver", title: "审批人", type: "Input", },
+  {
+    key: "approverFinishTime",
+    title: "审批时间",
+    type: "DatePicker",
+    config: { type: "date" },
+  },
+  { key: "approveTime", title: "提交时间", },
+
+];
 
 export const initColumns = () => columns;
 
-const tabColumns = [];
+const tabColumns = [
+  {
+    title: '物料信息',
+    key: 'puOrderItemList',
+    tableColumns: [
+      // { key: "id", title: "主键" },
+      { key: "rowNo", title: "行号", type: "Input", },
+      { key: "orderId", title: "采购订单ID", type: "Input", },
+      { key: "material", title: "物料", type: "Input", },
+      { key: "materialName", title: "物料名称", type: "Input", },
+      { key: "materialCode", title: "物料编码", type: "Input", },
+      { key: "materialClassify", title: "物料分类", type: "Input", },
+      { key: "materialManufacturersCode", title: "厂家物料编码", type: "Input", },
+      { key: "specification", title: "规格", type: "Input", },
+      { key: "model", title: "型号", type: "Input", },
+      { key: "isMedcine", title: "医药物料", type: "Input", },
+      { key: "manufacturer", title: "生产厂家代理人", type: "Input", },
+      { key: "isDrug", title: "物料药品属性", type: "Input", },
+      { key: "unit", title: "单位", type: "Input", },
+      { key: "qty", title: "数量", type: "Input", },
+      { key: "taxPrice", title: "含税单价", type: "Input", },
+      { key: "money", title: "价税合计", type: "Input", },
+      { key: "tax", title: "税率", type: "Input", },
+      { key: "taxDeductMoneya", title: "折扣金额", type: "Input", },
+      { key: "arrivalQty", title: "已到货数量", type: "Input", },
+      { key: "unarrivedQty", title: "未到货数量", type: "Input", },
+      { key: "notaxMoney", title: "无税金额", type: "Input", },
+      { key: "priceSource", title: "价格目录ID", type: "Input", },
+      { key: "isStorage", title: "入库关闭", type: "Input", },
+      { key: "isInvoice", title: "开票关闭", type: "Input", },
+      { key: "isArrival", title: "到货关闭", type: "Input", },
+      { key: "isPayment", title: "付款关闭", type: "Input", },
+      { key: "isGift", title: "赠品", type: "Input", },
+      { key: "warehouse", title: "收货仓库", type: "Input", },
+      { key: "place", title: "收货地点", type: "Input", },
+      { key: "address", title: "收货地址", type: "Input", },
+      { key: "productBatch", title: "产品批号", type: "Input", },
+      { key: "manufactureDate", title: "生产日期", type: "Input", },
+      { key: "efficacyLoseDate", title: "有效期至/失效日期", type: "Input", },
+      { key: "approvalNumber", title: "批准文号", type: "Input", },
+      { key: "registration", title: "注册证号", type: "Input", },
+      { key: "storageCondition", title: "存储条件", type: "Input", },
+      { key: "carriageCondition", title: "运输条件", type: "Input", },
+      { key: "isBatchLock", title: "批号锁定标识", type: "Input", },
+      { key: "isReplenishment", title: "补单标识", type: "Input", },
+      { key: "isUrgency", title: "紧急标识", type: "Input", },
+      { key: "originalQty", title: "原始数量", type: "Input", },
+      { key: "originalMoney", title: "原始金额", type: "Input", },
+      { key: "directProductBatch", title: "直运产品批号", type: "Input", },
+      { key: "discountRule", title: "折扣规则编码", type: "Input", },
+      { key: "reservedQty", title: "预留数量", type: "Input", },
+      { key: "reservedPeriod", title: "预留周期", type: "Input", },
+      { key: "taxDeductClassify", title: "扣税类别", type: "Input", },
+      { key: "exchangeRate", title: "折本汇率", type: "Input", },
+      { key: "source", title: "上游单据号", type: "Input", },
+      { key: "sourceId", title: "上游单据ID", type: "Input", },
+      { key: "demandCode", title: "采购需求单号", type: "Input", },
+      { key: "arrivalDatePlan", title: "计划到货日期", type: "Input", },
+      { key: "priceType", title: "价格类型", type: "Input", },
+      { key: "isDistributionPrice", title: "配送价", type: "Input", },
+      // { key: "tenantId", title: "租户号",type: "Input", },
+      // { key: "revision", title: "乐观锁",type: "Input", },
+      { key: "createByName", title: "创建人名称", type: "Input", },
+      { key: "updateByName", title: "更新人名称", type: "Input", },
+      // { key: "delFlag", title: "删除标记",type: "Input", },
+      // { key: "materialClassifyOne", title: "物料一级分类",type: "Input", },
+      { key: "materialClassifyOneName", title: "物料一级分类名称", type: "Input", },
+      // { key: "materialClassifyTwo", title: "物料二级分类",type: "Input", },
+      { key: "materialClassifyTwoName", title: "物料二级分类名称", type: "Input", },
+      // { key: "materialClassifyThree", title: "物料三级分类",type: "Input", },
+      { key: "materialClassifyThreeName", title: "物料三级分类名称", type: "Input", },
+      // { key: "materialClassifyFour", title: "物料四级分类",type: "Input", },
+      { key: "materialClassifyFourName", title: "物料四级分类名称", type: "Input", },
+      { key: "price", title: "无税单价" }
+    ]
+  },
+  {
+    title: '执行结果',
+    key: 'puOrderExecuteList',
+    tableColumns: [
+      // { key: "id", title: "主键",type: "Input", },
+      { key: "orderId", title: "采购订单ID", type: "Input", },
+      { key: "rowno", title: "行号", type: "Input", },
+      { key: "material", title: "物料", type: "Input", },
+      { key: "materialName", title: "物料名称", type: "Input", },
+      { key: "specification", title: "规格", type: "Input", },
+      { key: "qty", title: "数量", type: "Input", },
+      { key: "stroageQty", title: "累计到货主数量", type: "Input", },
+      { key: "stockQty", title: "累计入库主数量", type: "Input", },
+      { key: "invoiceQty", title: "累计开票主数量", type: "Input", },
+      { key: "rollbackQty", title: "累计退货主数量", type: "Input", },
+      { key: "backStockQty", title: "累计退库主数量", type: "Input", },
+      { key: "floatQty", title: "未到货数量", type: "Input", },
+      // { key: "tenantId", title: "租户号",type: "Input", },
+      // { key: "revision", title: "乐观锁",type: "Input", },
+      { key: "createByName", title: "创建人名称", type: "Input", },
+      { key: "updateByName", title: "更新人名称", type: "Input", },
+      // { key: "delFlag", title: "删除标记" }
+    ]
+  },
+];
 
 export const initTabColumns = () => tabColumns;

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

@@ -1,5 +1,5 @@
 <script>
-import { add } from "@/api/business/purchase/purchase-contract";
+import orderApi from "@/api/business/purchase/purchase-order";
 import { arr2obj } from "@/utils/data-transform";
 import {
   initDicts,
@@ -20,13 +20,10 @@ export default {
       rules: initRules(initColumns()),
       params: initParams(initColumns()),
       tabColumns: initTabColumns(),
-      tabName: "PuContractItem",
+      tabName: "puOrderItemList",
       tabTableParams: {
-        PuContractItem: [],
-        PuContractClause: [],
-        PuContractExpense: [],
-        PuContractAgreement: [],
-        PuContractApplyOrg: [],
+        puOrderItemList: [],
+        puOrderExecuteList: [],
       },
       currentComponent: { name: "", title: "", value: "", row: {}, source: {} },
     };
@@ -34,6 +31,7 @@ export default {
   computed: {},
   watch: {},
   methods: {
+    handleClick() { },
     beforeOpen() {
       const { deptName, nickName, orgName } = this.$store.state.user;
       this.params.puOrg = orgName;
@@ -137,8 +135,10 @@ export default {
         <el-row>
           <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>
+
               <el-input v-if="column.type === 'InputDialog'" v-model="params[column.key]"
                 :placeholder="column.placeholder" :clearable="column.clearable" :disabled="column.disabled"
                 style="width: 100%" @blur="openAsyncInputDialog(column, params, 'change')"
@@ -149,18 +149,25 @@ export default {
                     "></el-icon>
                 </template>
               </el-input>
+
               <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>
+
+              <el-checkbox v-if="column.type === 'Checkbox'" v-model="params[column.key]" true-label="0"
+                false-label="2"></el-checkbox>
+
               <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>
+
               <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"
                   :value="item.value">
                 </el-option>
               </el-select>
+
               <el-select v-if="column.type === 'TagSelect'" v-model="params[column.key]" multiple clearable collapse-tags
                 :placeholder="column.placeholder" :clearable="column.clearable" :disabled="column.disabled"
                 style="width: 100%">
@@ -170,10 +177,12 @@ export default {
                 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
+
               <el-date-picker v-if="column.type === 'DatePicker'" v-model="params[column.key]" :type="column.config.type"
                 :placeholder="column.placeholder" :clearable="column.clearable" :disabled="column.disabled"
                 :picker-options="column.pickerOptions" style="width: 100%">
               </el-date-picker>
+
               <el-upload v-if="column.type === 'Upload'" :file-list="params[column.key]" :disabled="column.disabled" drag
                 action="https://jsonplaceholder.typicode.com/posts/" multiple>
                 <i class="el-icon-upload"></i>
@@ -206,10 +215,12 @@ export default {
                   <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>
+
                   <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="cColumn.type === 'InputDialog'" v-model="scope.row[cColumn.key]"
                     :placeholder="cColumn.placeholder" :clearable="cColumn.clearable" :disabled="cColumn.disabled"
                     size="mini" style="width: 100%" @blur="openAsyncInputDialog(cColumn, scope.row, 'change')"
@@ -220,6 +231,9 @@ export default {
                         "></el-icon>
                     </template>
                   </el-input>
+
+                  <el-checkbox v-if="cColumn.type === 'Checkbox'" v-model="scope.row[cColumn.key]" true-label="0"
+                    false-label="2"></el-checkbox>
                 </template>
               </el-table-column>
             </el-table>

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

@@ -1,14 +1,14 @@
 <!-- 采购订单修订—— 列表 -->
 <script>
 import orderApi from "@/api/business/purchase/purchase-order";
-import AddPurchaseContractDrawer from "./add/index.vue";
-import SeePurchaseContractDrawer from "./see-purchase-order.vue";
+import AddPurchaseOrderDrawer from "./add/index.vue";
+import SeePurchaseOrderDrawer from "./see-purchase-order.vue";
 // import DirectSourcingTable from "./direct-sourcing.vue";
 export default {
   name: "PuchaseTask",
   components: {
-    AddPurchaseContractDrawer,
-    SeePurchaseContractDrawer,
+    AddPurchaseOrderDrawer,
+    SeePurchaseOrderDrawer,
     // DirectSourcingTable,
   },
   data() {
@@ -18,19 +18,26 @@ export default {
       );
     };
     const searchColumns = [
-      { title: "合同名称", key: "contractName", type: "Input" },
+      { key: "puOrg", title: "采购组织", type: "Input" },
+      { key: "billDate", title: "订单日期", type: "DatePicker" },
+      { key: "code", title: "订单编号", type: "Input" },
+      { key: "status", title: "单据状态", type: "Input" },
+      { key: "buyerName", title: "采购员", type: "Input" },
+      { key: "supplierName", title: "供应商名称", type: "Input" },
+
     ];
     const initSearchColumns = () => searchColumns;
     const initSearchParams = () => arr2Obj(initSearchColumns(), "key", "value");
     const tableColumns = [
       // { key: "id", title: "主键" },
-      { key: "puOrg", title: "采购组织" },
+      // { key: "puOrg", title: "采购组织" },
+      { key: "puOrgName", title: "采购组织名称" },
       { key: "billType", title: "订单类型" },
       { key: "code", title: "订单编号" },
       { key: "billDate", title: "订单日期" },
-      { key: "supplier", title: "供应商" },
-      // { key: "supplierName", title: "供应商名称" },
-      // { key: "paymentAgreement", title: "付款协议" },
+      // { key: "supplier", title: "供应商" },
+      { key: "supplierName", title: "供应商名称" },
+      { key: "paymentAgreement", title: "付款协议" },
       // { key: "currency", title: "币种" },
       { key: "currencyName", title: "币种名称" },
       // { key: "buyer", title: "采购员" },
@@ -39,15 +46,14 @@ export default {
       { key: "puDeptName", title: "采购部门名称" },
       // { key: "customer", title: "收货客户" },
       { key: "customerName", title: "收货客户名称" },
-      // { key: "isDeliver", title: "是否发货" },
-      // { key: "isArrival", title: "到货超期" },
+      { key: "isDeliver", title: "是否发货" },
+      { key: "isArrival", title: "到货超期" },
       { key: "isBack", title: "退货" },
       // { key: "freezeCause", title: "冻结原因" },
       { key: "qty", title: "总数量" },
       { key: "money", title: "总数量" },
-      { key: "status", title: "单据状态" },
-      // { key: "isMarketing", title: "已协同生成销售订单" },
-      // { key: "isMarketingSource", title: "由销售订单协同生成" },
+      { key: "isMarketing", title: "已协同生成销售订单" },
+      { key: "isMarketingSource", title: "由销售订单协同生成" },
       // { key: "personal", title: "人员" },
       { key: "personalName", title: "人员名称" },
       // { key: "isSendSrm", title: "是否同步SRM" },
@@ -55,7 +61,7 @@ export default {
       { key: "rebateMoney", title: "订单使用返利金额" },
       { key: "deductionMoney", title: "订单抵扣余款金额" },
       // { key: "warehouse", title: "WMS入库仓库" },
-      { key: "warehouseName", title: "WMS入库仓库名称" },
+      { key: "warehouseName", title: "收货仓库" }, //WMS入库仓库名称
       // { key: "goodsAllocation", title: "货位" },
       { key: "goodsAllocationName", title: "货位名称" },
       // { key: "customerDept", title: "客户部门" },
@@ -63,29 +69,144 @@ export default {
       // { key: "supplierContacts", title: "供应商业务联系人" },
       { key: "supplierContactsName", title: "供应商业务联系人名称" },
       { key: "isUrgency", title: "紧急程度" },
-      // { key: "agent", title: "代理人" },
+      // { key: "agent", title: "代理人" }, // 建议删除
       { key: "agentName", title: "代理人名称" },
       { key: "isClose", title: "最终关闭" },
       { key: "applyPaymentMoney", title: "累计付款申请金额" },
       { key: "paymentMoney", title: "累计付款金额" },
       { key: "invoiceMoney", title: "发票金额" },
-      { key: "createByName", title: "创建人名称" },
-      { key: "approver", title: "审批人" },
-      { key: "approverFinishTime", title: "审批时间" },
-      { key: "marketingCode", title: "销售订单号" },
       // { key: "supplierPersonal", title: "供应商业务员" },
-      // { key: "supplierPersonalName", title: "供应商业务员名称" },
+      { key: "supplierPersonalName", title: "供应商业务员名称" },
+      { key: "marketingCode", title: "销售订单号" },
       // { key: "tenantId", title: "租户号" },
       // { key: "revision", title: "乐观锁" },
-      // { key: "updateByName", title: "更新人名称" },
+      { key: "createByName", title: "创建人名称" },
+      { key: "updateByName", title: "更新人名称" },
       // { key: "delFlag", title: "删除标记" },
-      // { key: "flowId", title: "OA流程ID" },
-      // { key: "approveTime", title: "提交时间" }
+      { key: "flowId", title: "OA流程ID" },
+      { key: "approver", title: "审批人" },
+      { key: "approverFinishTime", title: "审批时间" },
+      { key: "approveTime", title: "提交时间" },
       { key: "createTime", title: "制单日期/创建时间" },
       { key: "remark", title: "备注" },
-      { key: "updateTime", title: "最后修改时间" }
+      { key: "updateTime", title: "最后修改时间" },
+      { key: "status", title: "单据状态" },
+      { key: "oaDemandNo", title: "OA需求单号" },
+      { key: "address", title: "收货地址" },
+      { key: "contacts", title: "收获联系人" },
+      { key: "isSendWms", title: "已同步WMS" },
+      { key: "retReason", title: "退换原因" },
+      { key: "closeTime", title: "最终关闭日期" },
+      { key: "processType", title: "处理方式" },
+      { key: "isEnd", title: "整单关闭标识" },
+      { key: "projectNow", title: "在建工程项目" },
+      { key: "operatingItems", title: "经营性项目" },
+      { key: "isArrivalReson", title: "到货超期原因" },
+      { key: "midOrderNo", title: "中台采购订单号" }
     ];
     const initTableColumns = () => tableColumns;
+    const tabColumns = [
+      {
+        title: '物料信息',
+        key: 'first',
+        tableColumns: [
+          // { key: "id", title: "主键" },
+          { 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,
@@ -97,7 +218,13 @@ export default {
         ...initSearchParams(),
       },
       tableColumns: initTableColumns(),
-      tableData: [{ puOrg: 1 }],
+      tableData: [{ puOrgName: 1 }],
+      tabColumns: initTabColumns(),
+      tabName: "first",
+      tabTableDatas: {
+        first: [],
+        second: [],
+      },
       page: { pageNum: 1, pageSize: 25 },
       total: 0,
       pageSizes: [25, 50, 100],
@@ -126,7 +253,7 @@ export default {
     async fetchTaskList() {
       this.loading = true;
       try {
-        const { code, msg, rows, total } = await orderApi.orderlist({
+        const { code, msg, rows, total } = await orderApi.orderList({
           ...this.page,
           ...this.searchParams,
         });
@@ -151,6 +278,7 @@ export default {
     },
     handleSizeChange() { },
     handleCurrentChange() { },
+    handleClick() { },
     handleOpenAddDrawer() {
       const { setVisible } = this.$refs.addDrawerFef;
       setVisible(true);
@@ -171,8 +299,8 @@ export default {
 
 <template>
   <el-card v-loading="loading" style="width: calc(100% - 24px); height: 100%; margin: 10px" :body-style="{ padding: 0 }">
-    <AddPurchaseContractDrawer ref="addDrawerFef"></AddPurchaseContractDrawer>
-    <SeePurchaseContractDrawer ref="seeDrawerFef"></SeePurchaseContractDrawer>
+    <AddPurchaseOrderDrawer ref="addDrawerFef"></AddPurchaseOrderDrawer>
+    <SeePurchaseOrderDrawer ref="seeDrawerFef"></SeePurchaseOrderDrawer>
 
     <el-form size="mini" label-position="right" label-width="85px" :model="searchParams" style="padding: 20px 0 0 0">
       <el-row :gutter="24">
@@ -202,8 +330,6 @@ export default {
       <el-col :span="24" style="text-align: right;margin: 0 10px 0 0">
         <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 size="mini">复制</el-button>
           <el-button size="mini">提交</el-button>
         </el-button-group>
@@ -230,7 +356,7 @@ export default {
       <el-table-column fixed="right" label="操作" width="120">
         <template slot-scope="scope">
           <el-button @click="handleOpenSeeDrawer(scope.row)" type="text" size="small">查看</el-button>
-          <el-button type="text" size="small">编辑</el-button>
+          <el-button type="text" size="small" @click="handleOpenAddDrawer(scope.row)">编辑</el-button>
           <el-button type="text" size="small">删除</el-button>
         </template>
       </el-table-column>
@@ -245,17 +371,18 @@ export default {
       padding: '20px',
       display: 'flex',
       'flex-wrap': 'wrap',
-    }" style="margin: 10px">
-      <el-tabs v-model="tabName" @tab-click="handleClick" style="width: 100%">
-        <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%">
-            <el-table-column v-for="(cColumn, cIndex) in column.tableColumns" :key="cIndex" :prop="cColumn.key"
-              :label="cColumn.title">
-            </el-table-column>
-          </el-table>
-        </el-tab-pane>
-      </el-tabs>
-    </el-card> -->
+    }" style="margin: 10px"> -->
+    <el-tabs v-model="tabName" @tab-click="handleClick" 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%">
+          <el-table-column type="index" width="50" label="序号"></el-table-column>
+          <el-table-column width="100" v-for="(cColumn, cIndex) in column.tableColumns" :key="cIndex" :prop="cColumn.key"
+            :label="cColumn.title">
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+    <!-- </el-card> -->
 
   </el-card>
 </template>

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

@@ -9,80 +9,82 @@ export default {
       );
     };
     const columns = [
-      { key: "puOrg", title: "采购组织", type: "TagSelect", require: true },
-      { key: "code", title: "合同编码", type: "Input" },
-      { key: "contractName", title: "合同名称", type: "Input", require: true },
-      { key: "supplier", title: "供应商", type: "TagSelect", require: true },
-      { key: "contractType", title: "合同类型", type: "Select", require: true },
-      { key: "puDept", title: "采购部门", type: "TagSelect", require: true },
-      { key: "buyer", title: "采购员", type: "TagSelect" },
-      { key: "source", title: "合同来源", type: "Select" },
-      {
-        key: "signDate",
-        title: "合同签订日期",
-        type: "DatePicker",
-        require: true,
-      },
-      {
-        key: "effectiveDate",
-        title: "合同生效日期",
-        type: "DatePicker",
-        require: true,
-      },
-      { key: "endDate", title: "合同终止日期", type: "DatePicker" },
-      { key: "externalContract", title: "外部合同号", type: "Input" },
-      { key: "refusalReasons", title: "拒绝理由", type: "Input" },
-      { key: "enquiryCode", title: "询价单号", type: "Input" },
-      { key: "externalFile", title: "对外附件", type: "Upload", span: 24 },
-      { key: "puFile", title: "采购商盖章合同附件", type: "Upload", span: 24 },
-      {
-        key: "supplierFile",
-        title: "供应商盖章合同附件",
-        type: "Upload",
-        span: 24,
-      },
-      { key: "projectName", title: "项目名称", type: "TagSelect" },
-      { key: "projectCode", title: "项目编号", type: "Input" },
-      { key: "area", title: "区域", type: "Input" },
-      { key: "consigneePhone", title: "收货人联系方式", type: "Input" },
-      { key: "paymentAgreement", title: "付款协议", type: "TagSelect" },
-      { key: "currency", title: "币种", type: "TagSelect", require: true },
-      { key: "taxPrice", title: "价税合计", type: "InputNumber" },
-      { key: "guaranteePeriod", title: "质保期", type: "Input" },
-
-      // { key: "lastPuMoney", title: "上年度采购额" },
-      // { key: "buyerName", title: "采购员名称" },
-      // { key: "supplierName", title: "供应商名称" },
-      // { key: "puMoneyYear", title: "本年度采购额" },
-      // { key: "puDeptName", title: "采购部门名称" },
-      // { key: "supplierTier", title: "供应商层级" },
-      // { key: "grossRateAverage", title: "平均毛利率" },
-      // { key: "approveFlow", title: "审批流程" },
-      // { key: "consumableClass", title: "耗材类别" },
-      // { key: "brandGrossRate", title: "同类品牌及毛利率" },
-      // { key: "contractFormat", title: "合同格式" },
-      // { key: "productName", title: "产品类别&名称" },
-      // { key: "invoiceTax", title: "发票税率" },
-      // { key: "emergencyDegree", title: "紧急程度" },
-      // { key: "project", title: "项目医院" },
-      // { key: "deliveryType", title: "交货方式" },
-      // { key: "contractPartyc", title: "合同丙方" },
-      // { key: "contractPartycName", title: "合同丙方名称" },
-      // { key: "guaranteePeriodEnd", title: "质保期限" },
-      // { key: "freightMethods", title: "运费承担方式" },
-      // { key: "isTarget", title: "是否有指标" },
-      // { key: "contractTarget", title: "合同指标" },
-      // { key: "exemptionPostageCondtion", title: "包邮条件" },
-      // { key: "isRebate", title: "是否有返利" },
-      // { key: "rebatePolicy", title: "返利政策" },
-      // { key: "rollbackPolicy", title: "退换货政策" },
-      // { key: "contractContent", title: "合同主要内容" },
-      // { key: "currencyName", title: "币种名称" },
+      // { key: "id", title: "主键" },
+      { key: "puOrg", title: "采购组织" },
+      { key: "puOrgName", title: "采购组织名称" },
+      { key: "billType", title: "订单类型" },
+      { key: "billTypeName", title: "订单类型名称" },
+      { key: "oaDemandNo", title: "OA需求单号" },
+      { key: "code", title: "订单编号" },
+      { key: "billDate", title: "订单日期" },
+      { key: "supplier", title: "供应商" },
+      { key: "supplierName", title: "供应商名称" },
+      { key: "paymentAgreement", title: "付款协议" },
+      { key: "finalType", title: "结算方式" },
+      { key: "currency", title: "币种" },
+      { key: "currencyName", title: "币种名称" },
+      { key: "buyer", title: "采购员" },
+      { key: "buyerName", title: "采购员名称" },
+      { key: "puDept", title: "采购部门" },
+      { key: "puDeptName", title: "采购部门名称" },
+      { key: "customer", title: "收货客户" },
+      { key: "customerName", title: "收货客户名称" },
+      { key: "qty", title: "总数量" },
+      { key: "originalQty", title: "原始总数量" },
+      { key: "money", title: "价税合计" },
+      { key: "originalMoney", title: "原始总金额" },
+      { key: "notaxMoney", title: "无税金额" },
+      { key: "status", title: "单据状态" },
+      { key: "freezeCause", title: "冻结原因" },
+      { key: "isBack", title: "退货" },
+      { key: "isMarketing", title: "已协同生成销售订单" },
+      { key: "isMarketingSource", title: "由销售订单协同生成" },
+      { key: "warehouse", title: "WMS入库仓库" },
+      { key: "warehouseName", title: "WMS入库仓库名称" },
+      { key: "goodsAllocation", title: "货位" },
+      { key: "goodsAllocationName", title: "货位名称" },
+      { key: "isSendSrm", title: "是否同步SRM" },
+      { key: "isInvoice", title: "发票标识" },
+      { key: "supplierOrderNo", title: "供应商订单号" },
+      { key: "rebateMoney", title: "订单使用返利金额" },
+      { key: "deductionMoney", title: "订单抵扣余款金额" },
+      { key: "address", title: "收货地址" },
+      { key: "contacts", title: "收货联系人" },
+      { key: "customerDept", title: "客户部门" },
+      { key: "customerDeptName", title: "客户部门名称" },
+      { key: "supplierContacts", title: "供应商业务联系人" },
+      { key: "supplierContactsName", title: "供应商业务联系人名称" },
+      { key: "isUrgency", title: "紧急程度" },
+      { key: "isSendWms", title: "已同步WMS" },
+      { key: "agent", title: "代理人" },
+      { key: "agentName", title: "代理人名称" },
+      { key: "isClose", title: "最终关闭" },
+      { key: "closeTime", title: "最终关闭日期" },
+      { key: "applyPaymentMoney", title: "累计付款申请金额" },
+      { key: "paymentMoney", title: "累计付款金额" },
+      { key: "invoiceMoney", title: "发票金额" },
+      { key: "supplierPersonal", title: "供应商业务员" },
+      { key: "supplierPersonalName", title: "供应商业务员名称" },
+      { key: "isDeliver", title: "是否发货" },
+      { key: "retReason", title: "退换原因" },
+      { key: "processType", title: "处理方式" },
+      { key: "isEnd", title: "整单关闭标识" },
+      { key: "projectNow", title: "在建工程项目" },
+      { key: "operatingItems", title: "经营性项目" },
+      { key: "isArrivalReson", title: "到货超期原因" },
+      { key: "midOrderNo", title: "中台采购订单号" },
+      { key: "marketingCode", title: "销售订单号" },
+      { key: "isArrival", title: "到货超期" },
       // { key: "tenantId", title: "租户号" },
       // { key: "revision", title: "乐观锁" },
-      // { key: "createByName", title: "创建人" },
-      // { key: "updateByName", title: "创建人名称" },
+      { key: "createByName", title: "创建人名称" },
+      { key: "updateByName", title: "更新人名称" },
       // { key: "delFlag", title: "删除标记" },
+      { key: "flowId", title: "OA流程ID" },
+      { key: "approver", title: "审批人" },
+      { key: "approverFinishTime", title: "审批时间" },
+      { key: "approveTime", title: "提交时间" },
+
     ];
     const initColumns = () =>
       columns.map((column) => {
@@ -109,79 +111,103 @@ export default {
     const initParams = () => arr2Obj(initColumns(), "key", "value");
     const tabColumns = [
       {
-        title: "物料基本信息",
-        key: "first",
-        tableColumns: [
-          { title: "序号", key: "" },
-          { title: "赠品", key: "" },
-          { title: "物料编码", key: "" },
-          { title: "物料名称", key: "" },
-          { title: "规格", key: "" },
-          { title: "生产厂家", key: "" },
-          { title: "收货客户", key: "" },
-          { title: "品牌", key: "" },
-          { title: "采购数量", key: "" },
-          { title: "采购单位", key: "" },
-          { title: "计价数量", key: "" },
-          { title: "税率%", key: "" },
-          { title: "含税单价", key: "" },
-          { title: "含税金额合计", key: "" },
-          { title: "价格有效期（起）", key: "" },
-          { title: "计划到货日期", key: "" },
-          { title: "来源类型", key: "" },
-          { title: "来源单号", key: "" },
-          { title: "需求单号", key: "" },
-          { title: "备注", key: "" },
-        ],
-      },
-      {
-        title: "合同条款",
-        key: "second",
+        title: '物料信息',
+        key: 'first',
         tableColumns: [
-          { title: "序号", key: "" },
-          { title: "条款编码", key: "" },
-          { title: "条款名称", key: "" },
-          { title: "条款内容", key: "" },
-          { title: "变量序号", key: "" },
-          { title: "变量内容", key: "" },
-          { title: "备注", key: "" },
-        ],
+          // { key: "id", title: "主键" },
+          { 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: "third",
+        title: '执行结果',
+        key: 'second',
         tableColumns: [
-          { title: "序号", key: "" },
-          { title: "费用编码", key: "" },
-          { title: "费用名称", key: "" },
-          { title: "费用金额", key: "" },
-          { title: "备注", key: "" },
-        ],
-      },
-      {
-        title: "付款协议信息",
-        key: "fourth",
-        tableColumns: [
-          { title: "序号", key: "" },
-          { title: "付款阶段", key: "" },
-          { title: "是否预付款", key: "" },
-          { title: "是否质保金", key: "" },
-          { title: "结算方式", key: "" },
-          { title: "付款起点", key: "" },
-          { title: "付款金额", key: "" },
-          { title: "付款比例%", key: "" },
-          { title: "账期天数", key: "" },
-          { title: "备注", key: "" },
-        ],
-      },
-      {
-        title: "合同执行组织范围",
-        key: "fifth",
-        tableColumns: [
-          { title: "序号", key: "" },
-          { title: "组织名称", key: "" },
-          { title: "组织编码", key: "" },
-        ],
+          // { 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;
@@ -216,9 +242,9 @@ export default {
       tabTableDatas: {
         first: [],
         second: [],
-        third: [],
-        fourth: [],
-        fifth: [],
+        // third: [],
+        // fourth: [],
+        // fifth: [],
       },
     };
   },
@@ -228,139 +254,70 @@ export default {
     setVisible(prop) {
       this.visible = prop;
     },
+    handleClick() { },
+    handleClose() { },
   },
   created() {
     console.log(this.params, this.columns);
   },
-  mounted() {},
-  destroyed() {},
+  mounted() { },
+  destroyed() { },
 };
 </script>
 <template>
-  <el-drawer
-    title="我是标题"
-    direction="btt"
-    size="100%"
-    :with-header="false"
-    :visible.sync="visible"
-    :before-close="handleClose"
-  >
-    <el-card
-      :body-style="{
-        padding: '20px',
-        display: 'flex',
-        'flex-wrap': 'wrap',
-      }"
-      style="margin: 10px"
-    >
-      <div
-        slot="header"
-        style="
+  <el-drawer title="我是标题" direction="btt" size="100%" :with-header="false" :visible.sync="visible"
+    :before-close="handleClose">
+    <el-card :body-style="{
+      padding: '20px',
+      display: 'flex',
+      'flex-wrap': 'wrap',
+    }" style="margin: 10px">
+      <div slot="header" style="
           display: flex;
           justify-content: space-between;
           align-items: center;
-        "
-      >
+        ">
         <h3>查看</h3>
         <div style="text-align: right">
           <el-button size="mini" @click="setVisible(false)">取消</el-button>
-          <el-button size="mini" type="info" @click="setVisible(false)"
-            >保存并新增</el-button
-          >
-          <el-button size="mini" type="danger" @click="setVisible(false)"
-            >保存</el-button
-          >
+          <!-- <el-button size="mini" type="info" @click="setVisible(false)">保存并新增</el-button>
+          <el-button size="mini" type="danger" @click="setVisible(false)">保存</el-button> -->
         </div>
       </div>
       <el-row>
-        <el-form
-          size="mini"
-          label-position="right"
-          label-width="150px"
-          :model="params"
-        >
-          <el-col
-            v-for="(column, index) in columns"
-            :key="index"
-            :span="column.span || 8"
-          >
-            <el-form-item
-              :prop="column.key"
-              :label="column.title"
-              :required="column.required"
-            >
-              <el-input
-                v-if="column.type === 'Input'"
-                v-model="params[column.key]"
-                :placeholder="column.placeholder"
-                :clearable="column.clearable"
-                style="width: 90%"
-              ></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"
-                style="width: 90%"
-              ></el-input-number>
-              <el-select
-                v-if="column.type === 'Select'"
-                v-model="params[column.key]"
-                :placeholder="column.placeholder"
-                :clearable="column.clearable"
-                style="width: 90%"
-              >
-                <el-option
-                  v-for="item in options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
+        <el-form size="mini" label-position="right" label-width="150px" :model="params">
+          <el-col v-for="(column, index) in columns" :key="index" :span="column.span || 8">
+            <el-form-item :prop="column.key" :label="column.title" :required="column.required">
+
+              <el-input v-if="column.type === 'Input'" v-model="params[column.key]" readonly
+                :placeholder="column.placeholder" :clearable="column.clearable" style="width: 90%"></el-input>
+
+              <el-input-number v-if="column.type === 'InputNumber'" v-model="params[column.key]" readonly
+                :controls-position="column.config.controlsPosition" :placeholder="column.placeholder"
+                :clearable="column.clearable" style="width: 90%"></el-input-number>
+
+              <el-select v-if="column.type === 'Select'" v-model="params[column.key]" disabled
+                :placeholder="column.placeholder" :clearable="column.clearable" style="width: 90%">
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
-              <el-select
-                v-if="column.type === 'TagSelect'"
-                v-model="params[column.key]"
-                multiple
-                clearable
-                collapse-tags
-                :placeholder="column.placeholder"
-                :clearable="column.clearable"
-                style="width: 90%"
-              >
+
+              <el-select v-if="column.type === 'TagSelect'" v-model="params[column.key]" disabled multiple clearable
+                collapse-tags :placeholder="column.placeholder" :clearable="column.clearable" style="width: 90%">
                 <template #prefix>
-                  <el-icon
-                    class="el-icon-s-operation"
-                    style="cursor: pointer"
-                    @click.stop="$message.info(234)"
-                  ></el-icon>
+                  <el-icon class="el-icon-s-operation" style="cursor: pointer" @click.stop="$message.info(234)"></el-icon>
                 </template>
-                <el-option
-                  v-for="item in options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
-              <el-date-picker
-                v-if="column.type === 'DatePicker'"
-                v-model="params[column.key]"
-                :type="column.config.type"
-                :placeholder="column.placeholder"
-                :clearable="column.clearable"
-                :picker-options="column.pickerOptions"
-                style="width: 90%"
-              >
+
+              <el-date-picker v-if="column.type === 'DatePicker'" readonly v-model="params[column.key]"
+                :type="column.config.type" :placeholder="column.placeholder" :clearable="column.clearable"
+                :picker-options="column.pickerOptions" style="width: 90%">
               </el-date-picker>
-              <el-upload
-                v-if="column.type === 'Upload'"
-                :file-list="params[column.key]"
-                drag
-                action="https://jsonplaceholder.typicode.com/posts/"
-                multiple
-              >
+
+              <el-upload v-if="column.type === 'Upload'" :file-list="params[column.key]" drag
+                action="https://jsonplaceholder.typicode.com/posts/" multiple>
                 <i class="el-icon-upload"></i>
                 <div class="el-upload__text">
                   将文件拖到此处，或<em>点击上传</em>
@@ -369,34 +326,23 @@ export default {
                   只能上传jpg/png文件，且不超过500kb
                 </div>
               </el-upload>
+
             </el-form-item>
           </el-col>
         </el-form>
       </el-row>
     </el-card>
-    
-    <el-card
-      :body-style="{
-        padding: '20px',
-        display: 'flex',
-        'flex-wrap': 'wrap',
-      }"
-      style="margin: 10px"
-    >
+
+    <el-card :body-style="{
+      padding: '20px',
+      display: 'flex',
+      'flex-wrap': 'wrap',
+    }" style="margin: 10px">
       <el-tabs v-model="tabName" @tab-click="handleClick" style="width: 100%">
-        <el-tab-pane
-          v-for="(column, index) in tabColumns"
-          :key="index"
-          :label="column.title"
-          :name="column.key"
-        >
+        <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%">
-            <el-table-column
-              v-for="(cColumn, cIndex) in column.tableColumns"
-              :key="cIndex"
-              :prop="cColumn.key"
-              :label="cColumn.title"
-            >
+            <el-table-column v-for="(cColumn, cIndex) in column.tableColumns" :key="cIndex" :prop="cColumn.key"
+              :label="cColumn.title">
             </el-table-column>
           </el-table>
         </el-tab-pane>