1.新增编辑接口增加类型名称；

2.调整部分字段排序

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

@@ -349,7 +349,7 @@ export const Columns = [
      isShow:true,
     queryParams: () => ({}),
   },
-  { key: "isEnd", title: "整单关闭标识", inputType: "Input", isShow:true, },
+  { key: "isEnd", title: "整单关闭标识", inputType: "Checkbox", isShow:true, },
   {
     key: "projectNowName",
     title: "在建工程项目",
@@ -573,6 +573,12 @@ export const TabColumns = [
       { key: "taxDeductMoneya", title: "折扣金额", inputType: "Input", },
       { key: "arrivalQty", title: "已到货数量", inputType: "Input", },
       { key: "unarrivedQty", title: "未到货数量", inputType: "Input", },
+      { 
+        key: "price",
+        title: "无税单价",
+        inputType: "Input",
+        disabled:true,
+      },
       { key: "notaxMoney", title: "无税金额", inputType: "Input", disabled:true,},
       // { key: "priceSource", title: "价格目录ID", inputType: "Input", },
       { key: "isStorage", title: "入库关闭", inputType: "Checkbox", },
@@ -720,12 +726,7 @@ export const TabColumns = [
         disabled:true,
         readonly:true,
       },
-      { 
-        key: "price",
-        title: "无税单价",
-        inputType: "Input",
-        disabled:true,
-      }
+      
     ]
   },
   {

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

@@ -345,6 +345,19 @@ export default {
         
       }
     },
+
+    // 下拉框选择改变
+    handleSelectChange(val,typeName){
+
+      if(val === 'billType'){
+
+      this.params['billTypeName'] = this.dict.type[typeName].find(item => item.value == this.params[val]).label;
+
+      }
+
+    },
+
+
     // 子表参照改变之后
     handleTabReferChange(val, source, type) {
 
@@ -396,12 +409,7 @@ export default {
       }
     },
 
-    // 下拉框选择改变
-    handleChangeSelect(val,typeName){
-      if(val === 'billType'){
-       this.params['billTypeName'] = this.dict.type[typeName].find(item => item.value == this.params[val]).label;
-      }
-    },
+    
 
   },
   created() {
@@ -518,6 +526,7 @@ export default {
                 :clearable="column.clearable"
                 :placeholder="column.placeholder"
                 style="width: 100%"
+                @change="handleSelectChange(column.key,column.referName)"
               >
                 <el-option
                   v-for="item in dict.type[column.referName]"
@@ -659,7 +668,7 @@ export default {
                       :clearable="cColumn.clearable"
                       :placeholder="cColumn.placeholder"
                       style="width: 100%"
-                      @change="handleTabSelectChange(cColumn.key,scope.row)"
+                      @change="handleTabSelectChange(cColumn,scope.row)"
                     >
                       <el-option
                         v-for="item in dict.type[cColumn.referName]"

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

@@ -15,7 +15,7 @@ export const TableColumns = [
     inputType: "Select",
     referName: "sys_order_type",
   },
-  { key: "code", title: "订单编号",  inputType: "Input" },
+  { key: "code", title: "订单编号",  inputType: "Input",width:150, },
   {
     key: "status",
     title: "单据状态",
@@ -23,7 +23,7 @@ export const TableColumns = [
     width:80,
     referName: "documents_status", // 字典名
   },
-  { key: "billDate", title: "订单日期" },
+  { key: "billDate", title: "订单日期",width:100,},
   // { key: "supplier", title: "供应商" },
   { key: "supplierName", title: "供应商", inputType: "Input" },
   { key: "paymentAgreementName", title: "付款协议" },
@@ -37,7 +37,7 @@ export const TableColumns = [
   // { key: "paymentAgreement", title: "付款协议" },
   
   // { key: "buyer", title: "采购员" },ut
-  { key: "buyerName", title: "采购员" },
+  { key: "buyerName", title: "采购员" ,width:100,},
   // { key: "puDept", title: "采购部门" },
   { key: "puDeptName", title: "采购部门" },
   // { key: "customer", title: "收货客户" },
@@ -46,6 +46,7 @@ export const TableColumns = [
     key: "isDeliver", 
     title: "是否发货",
     inputType: 'Checkbox',
+    width:80,
    },
   {
     key: "isArrival",
@@ -60,8 +61,8 @@ export const TableColumns = [
     width:80,
   },
   // { key: "freezeCause", title: "冻结原因" },
-  { key: "qty", title: "总数量" },
-  { key: "money", title: "总数量" },
+  { key: "qty", title: "总数量",width:100, },
+  { key: "money", title: "价税合计",width:100, },
   {
     key: "isMarketing",
     title: "已协同生成销售订单",
@@ -73,7 +74,7 @@ export const TableColumns = [
     inputType: 'Checkbox',
   },
   // { key: "personal", title: "人员" },
-  { key: "personalName", title: "人员" },
+  { key: "personalName", title: "人员" ,width:120,},
   // { key: "isSendSrm", title: "是否同步SRM" },
   {
     key: "isInvoice",
@@ -81,8 +82,8 @@ export const TableColumns = [
     inputType: 'Checkbox',
     width:80,
   },
-  { key: "rebateMoney", title: "订单使用返利金额" },
-  { key: "deductionMoney", title: "订单抵扣余款金额" },
+  { key: "rebateMoney", title: "订单使用返利金额" ,},
+  { key: "deductionMoney", title: "订单抵扣余款金额" ,},
   // { key: "warehouse", title: "WMS入库仓库" },
   { key: "warehouseName", title: "收货仓库" }, //WMS入库仓库名称
   // { key: "goodsAllocation", title: "货位" },
@@ -111,16 +112,7 @@ export const TableColumns = [
   // { key: "supplierPersonal", title: "供应商业务员" },
   { key: "supplierPersonalName", title: "供应商业务员" },
   { key: "marketingCode", title: "销售订单号" },
-  { key: "createByName", title: "创建人" },
-  { key: "updateByName", 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: "oaDemandNo", title: "OA需求单号" },
   { key: "address", title: "收货地址" },
   { key: "contacts", title: "收获联系人" },
@@ -133,10 +125,18 @@ export const TableColumns = [
   { key: "retReasonName", title: "退换原因" },
   { key: "closeTime", title: "最终关闭日期" },
   { key: "processTypeName", title: "处理方式" },
-  { key: "isEnd", title: "整单关闭标识" },
+  { key: "isEnd", title: "整单关闭标识" ,inputType: "Checkbox"},
   { key: "projectNowName", title: "在建工程项目" },
   { key: "operatingItemsName", title: "经营性项目" },
   { key: "isArrivalReson", title: "到货超期原因" },
+  { key: "createByName", title: "创建人" ,width:100,},
+  { key: "createTime", title: "制单日期/创建时间", },
+  { key: "approveTime", title: "提交时间" ,width:100,},
+  { key: "approver", title: "审批人" ,width:100,},
+  { key: "approverFinishTime", title: "审批时间",width:100, },
+  { key: "updateByName", title: "更新人" ,width:100,},
+  { key: "updateTime", title: "最后修改时间" },
+  { key: "remark", title: "备注" },
   // { key: "midOrderNo", title: "中台采购订单号" },
 ];
 
@@ -177,6 +177,7 @@ export const TabColumns = [
       { key: "taxDeductMoneya", title: "折扣金额" },
       { key: "arrivalQty", title: "已到货数量" },
       { key: "unarrivedQty", title: "未到货数量" },
+      { key: "price", title: "无税单价" },
       { key: "notaxMoney", title: "无税金额" },
       { key: "priceSource", title: "价格目录ID" },
       {
@@ -279,7 +280,7 @@ export const TabColumns = [
       { key: "materialClassifyThreeName", title: "物料三级分类", width: 180 },
       // { key: "materialClassifyFour", title: "物料四级分类" },
       { key: "materialClassifyFourName", title: "物料四级分类", width: 180 },
-      { key: "price", title: "无税单价" }
+      
     ]
   },
   {

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

@@ -227,6 +227,17 @@ export default {
       }
     },
 
+    // 子表Select改变之后
+     handleSelectChange(val,typeName){
+
+      if(val === 'billType'){
+
+       this.params['billTypeName'] = this.dict.type[typeName].find(item => item.value == this.params[val]).label;
+      
+      }
+      
+    },
+
      // 子表下拉框改变
      handleTabSelectChange(type,row){
       console.log(type,'type');
@@ -273,12 +284,7 @@ export default {
     handleIsRevise(status) {
       return status == '2';
     },
-     // 下拉框选择改变
-     handleChangeSelect(val,typeName){
-      if(val === 'billType'){
-       this.params['billTypeName'] = this.dict.type[typeName].find(item => item.value == this.params[val]).label;
-      }
-    },
+    
   },
   created() {
     console.log("EDIT CREATED");
@@ -375,7 +381,7 @@ export default {
                 :clearable="column.clearable" 
                 :placeholder="column.placeholder" 
                 style="width: 100%"
-                @change="handleChangeSelect(column.key,column.referName)"
+                @change="handleSelectChange(column.key,column.referName)"
                 >
                 <el-option 
                   v-for="item in dict.type[column.referName]"