002201 преди 2 години
родител
ревизия
77679c26c6

+ 25 - 16
src/views/purchase/apply/add/column.js

@@ -12,13 +12,14 @@ export const FormColumns = [
     referName: "SUPPLIER_PARAM",
     valueKey: "name",
     dataMapping: {
-      supplier: "code",
+      supplier: "id",
+      supplierCode: "code",
       supplierName: "name",
     },
     require: true,
   },
   {
-    key: "supplier",
+    key: "supplierCode",
     title: "供应商编码",
     inputType: "Input",
     disabled: true,
@@ -32,12 +33,13 @@ export const FormColumns = [
     valueKey: "name",
     dataMapping: {
       puOrg: "id",
+      puOrgCode: "code",
       puOrgName: "name",
     },
     require: true,
   },
   {
-    key: "puOrg",
+    key: "puOrgCode",
     title: "采购组织编码",
     inputType: "Input",
     disabled: true,
@@ -49,13 +51,14 @@ export const FormColumns = [
     inputType: "PopoverSelect",
     referName: "CURRENCY_PARAM",
     dataMapping: {
-      currency: "code",
+      currency: "id",
+      currencyCode: "code",
       currencyName: "name",
     },
     require: true,
   },
   {
-    key: "currency",
+    key: "currencyCode",
     title: "币种编码",
     inputType: "Input",
     disabled: true,
@@ -91,13 +94,14 @@ export const FormColumns = [
     inputType: "PopoverSelect",
     referName: "DEPT_PARAM",
     dataMapping: {
-      puDept: "code",
+      puDept: "id",
+      puDeptCode: "code",
       puDeptName: "name",
     },
     require: true,
   },
   {
-    key: "puDept",
+    key: "puDeptCode",
     title: "采购部门编码",
     inputType: "Input",
     disabled: true,
@@ -212,7 +216,8 @@ export const TabColumns = [
         width: 300,
         referName: "UNIT_PARAM",
         dataMapping: {
-          unit: "code",
+          unit: "id",
+          unitCode: "code",
           unitName: "name",
         },
       },
@@ -227,7 +232,8 @@ export const TabColumns = [
         width: 300,
         referName: "UNIT_PARAM",
         dataMapping: {
-          puUnit: "code",
+          puUnit: "id",
+          puUnitCode: "code",
           puUnitName: "name",
         },
       },
@@ -279,7 +285,8 @@ export const TabColumns = [
         inputType: "PopoverSelect",
         referName: "CURRENCY_PARAM",
         dataMapping: {
-          currency: "code",
+          currency: "id",
+          currencyCode: "code",
           currencyName: "name",
         },
       },
@@ -308,19 +315,20 @@ export const TabColumns = [
         require: true,
       },
       {
-        title: "客户名称",
+        title: "客户",
         key: "customerName",
         inputType: "PopoverSelect",
         width: 300,
         referName: "CUSTOMER_PARAM",
         dataMapping: {
-          customer: "code",
+          customer: "id",
+          customerCode: "code",
           customerName: "name",
         },
       },
       {
-        title: "客户",
-        key: "customer",
+        title: "客户编码",
+        key: "customerCode",
       },
       {
         title: "最近价格",
@@ -374,11 +382,12 @@ export const TabColumns = [
         inputType: "PopoverSelect",
         referName: "ORG_PARAM",
         dataMapping: {
-          org: "code",
+          org: "id",
+          orgCode: "code",
           orgName: "name",
         },
       },
-      { title: "组织编码", key: "org" },
+      { title: "组织编码", key: "orgCode" },
       {
         title: "创建人名称",
         key: "createByName",

+ 1 - 1
src/views/purchase/apply/index.vue

@@ -252,9 +252,9 @@ export default {
       :size="size"
       :data="tableData"
       highlight-current-row
-      @row-click="useSelect([$event])"
       @row-dblclick="useSee"
       @selection-change="useSelect"
+      @row-click="useSelect([$event])"
       style="width: 100%; margin: 20px 0 0 0"
     >
       <el-table-column

+ 3 - 3
src/views/purchase/task/first-direct/column.js

@@ -26,7 +26,7 @@ export const TableColumns = [
     key: "purchaseQuantity",
     title: "本次采购数量",
     inputType: "InputNumber",
-    width: 200,
+    width: 300,
     min: (prop) => 0,
     max: (prop) => prop.puQty - (prop.executeQty || 0),
     controlsPosition: "right",
@@ -36,12 +36,12 @@ export const TableColumns = [
     title: "计划到货日期",
     inputType: "DatePicker",
     valueFormat: "yyyy-MM-dd",
-    width: 200,
+    width: 300,
     pickerOptions: {
       disabledDate(time) {
         return time.getTime() < Date.now();
       },
     },
   },
-  { key: "note", title: "备注", inputType: "Textarea", width: 200 },
+  { key: "note", title: "备注", inputType: "Textarea", width: 300 },
 ];

+ 0 - 2
src/views/purchase/task/first-direct/index.vue

@@ -37,7 +37,6 @@ export default {
         const { code, data } = await FIRSTDIRECT(prop);
         if (code === 200) {
           this.data = data;
-          console.log(this.data);
           return true;
         } else {
           return false;
@@ -145,7 +144,6 @@ export default {
               :size="size"
               :min="cItem.min(item)"
               :max="cItem.max(item)"
-              +
               :placeholder="cItem.placeholder"
               :controls-position="cItem.controlsPosition"
               style="width: 90%"

+ 3 - 1
src/views/purchase/task/index.vue

@@ -294,9 +294,11 @@ export default {
     <el-table
       :data="tableData"
       size="mini"
-      style="width: 100%; margin: 20px 0 0 0"
+      highlight-current-row
       @row-dblclick="useSee"
       @selection-change="useSelect"
+      @row-click="useSelect([$event])"
+      style="width: 100%; margin: 20px 0 0 0"
     >
       <el-table-column
         fixed

+ 1 - 0
src/views/purchase/task/see/index.vue

@@ -62,6 +62,7 @@ export default {
         <el-button
           :size="size"
           circle
+          type="danger"
           icon="el-icon-close"
           @click="visible = false"
         ></el-button>