From cd11856de97b080a096e99ef3a0d23f909f8b4a8 Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Sat, 16 Sep 2023 11:51:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/application/mk/libs/function/form.js   |  2 +-
 src/application/mk/libs/function/funs.js   | 14 ++++--
 src/pages/Middle/Mold/MoldOrder/Edit.vue   | 32 ++++--------
 src/pages/Middle/Mold/MoldOrder/dataset.js | 58 ++++++++++++++++++++++
 4 files changed, 77 insertions(+), 29 deletions(-)
 create mode 100644 src/pages/Middle/Mold/MoldOrder/dataset.js

diff --git a/src/application/mk/libs/function/form.js b/src/application/mk/libs/function/form.js
index e31b98a..c19297d 100644
--- a/src/application/mk/libs/function/form.js
+++ b/src/application/mk/libs/function/form.js
@@ -29,7 +29,7 @@ export default {
                             }
                             data[saveField] = parseInt(value); // 转换为整数
                         }
-                        else if (rule.dataRule.type == "number") { // 如果是整数
+                        else if (rule.dataRule.type == "number" || rule.dataRule.type == "float") { // 如果是整数
                             data[saveField] = parseFloat(value); // 转换为整数
                         }
                         else if (rule.dataRule.type == "timestamp") { // 如果是时间戳
diff --git a/src/application/mk/libs/function/funs.js b/src/application/mk/libs/function/funs.js
index 8c69926..83c178c 100644
--- a/src/application/mk/libs/function/funs.js
+++ b/src/application/mk/libs/function/funs.js
@@ -107,13 +107,14 @@ export default {
 
   },
 
-  getPostFieldValue({ dataId, list, type, deletedList, fieldName, rowFilter, dataRule }) {
+  getPostFieldValue({  dataId, list, type, deletedList, fieldName, rowFilter, dataRule }) {
 
     let d = {};
     console.log(list)
     if (rowFilter) {
       list = list.filter(rowFilter);
     }
+     
     if (dataRule) {
       list.forEach(item => {
 
@@ -121,15 +122,16 @@ export default {
         dataRule.forEach(rule => {
           let value = item[rule.field];
           
-          if(isNaN(value) ){
-            value = 0;
-          }
+      
           if (rule.type == "integer") {
+            if(isNaN(value) ){
+              value = 0;
+            }
             item[rule.field] = parseInt(value);
 
             
           }
-          else if (rule.type == "number") {
+          else if (rule.type == "number" || rule.type == "float") {
             item[rule.field] = parseFloat(value);
           }
           else if (rule.type == "timestamp") {
@@ -147,6 +149,8 @@ export default {
             }
 
           }
+
+          
         })
 
       })
diff --git a/src/pages/Middle/Mold/MoldOrder/Edit.vue b/src/pages/Middle/Mold/MoldOrder/Edit.vue
index 5867ba4..0d8bcdb 100644
--- a/src/pages/Middle/Mold/MoldOrder/Edit.vue
+++ b/src/pages/Middle/Mold/MoldOrder/Edit.vue
@@ -101,6 +101,8 @@
 <script>
 import BASE_URL from '@/services/mes/api.js';
 
+const dataset = require('./dataset.js');
+
 export default {
 
   name: '',
@@ -124,6 +126,7 @@ export default {
     // 页面数据变量
     var pageData = {
 
+      dataset:dataset,
       options_paid_status: options_paid_status,
       options_production_type: [{ value: '1', label: '正常布产' }, { value: '2', label: '委托布产' }],
       // 当前项目名称
@@ -275,7 +278,7 @@ export default {
         }).then(a => {
 
 
-          this.formOptions.data = this.$mk.formatDetailData({ data: a.data[this.detailDataFieldName], rules: this.formOptions.items });
+          this.formOptions.data = this.$mk.formatDetailData({ dataset:this.dataset, data: a.data[this.detailDataFieldName], rules: this.formOptions.items });
           console.log(this.formOptions.data)
           this.detailsData = JSON.parse(JSON.stringify(a.data[this.detailDataFieldName].order_molds || []));
           if (a.data[this.detailDataFieldName].auditor_uid) {
@@ -392,38 +395,21 @@ export default {
         // 如果是新增模式，提交的数据中加入id 如果是编辑模式，提交的数据中不加入id
         let postdata = Object.assign({}, this.formOptions.data);
 
-
+console.log(this.dataset.order_molds.fields)
         postdata.order_molds = this.$mk.getPostFieldValue({
           rowFilter: (row) => { return row.id || row.mold_id },
           dataId: this.getDataId_BigInt(),
           list: this.detailsData,
           deletedList: this.deletedDetailsData,
           fieldName: 'order_id',
-          dataRule: [
-            { field: 'id', type: 'bigint' },
-            { field: 'production_type', type: 'integer' },
-            { field: 'manufacture_cycle', type: 'timestamp' },
-            { field: 'draw_start_time', type: 'timestamp' },
-            { field: 'split_design_time', type: 'timestamp' },
-            { field: 'draw_time', type: 'timestamp' },
-            { field: 'draw2D_time', type: 'timestamp' },
-            { field: 'draw3D_time', type: 'timestamp' },
-            { field: 'horizontal_frame_time', type: 'timestamp' },
-            { field: 'inlay_deep_hole_time', type: 'timestamp' },
-            { field: 'update_uid', type: 'bigint' },
-            { field: 'mold_id', type: 'bigint' },
-            { field: 'mold_master_uid', type: 'bigint' },
-            { field: 'manufacture_cycle', type: 'timestamp' }, 
-            { field: 'product_structure_uid', type: 'bigint' }, 
-            { field: 'mold_structure_uid', type: 'bigint' },  
-            { field: 'create_uid', type: 'bigint' }
-          ]
+          dataRule: this.dataset.order_molds.fields
         });
+        
 
         // 格式化提交的数据
-        this.$mk.formatFormData({ data: postdata, rules: this.formOptions.items });
-
+        this.$mk.formatFormData({  dataset:this.dataset, data: postdata, rules: this.formOptions.items });
 
+ 
 
         // 提交数据
         this.$mk.post({
diff --git a/src/pages/Middle/Mold/MoldOrder/dataset.js b/src/pages/Middle/Mold/MoldOrder/dataset.js
new file mode 100644
index 0000000..df14b27
--- /dev/null
+++ b/src/pages/Middle/Mold/MoldOrder/dataset.js
@@ -0,0 +1,58 @@
+var dataset = {
+
+    actions: {
+        getList: `/MoldOrder/v1/mold/order/list`,
+        delete: `/MoldOrder/v1/mold/order/batchDelete`,
+        get: `/MoldOrder/v1/mold/order/detail`,
+        create: `/MoldOrder/v1/mold/order/create`,
+        update: `/MoldOrder/v1/mold/order/update`
+    },
+
+    listFieldName: 'MoldOrder',         // list接口返回 数据数组的字段名
+    detailDataFieldName: "mold_order",  // detail接口返回 数据的字段名
+
+    fields: [
+        { field: 'code', title: '订单编码', type: 'string' },
+        { field: 'name', title: '客户名称', type: 'string' },
+        { field: 'contact', title: '联系人', type: 'string' },
+        { field: 'phone', title: '联系电话', type: 'string' }, 
+        { field: 'salesman', title: '业务员姓名', type: 'string' },
+        { field: 'contract_no', title: '合同号', type: 'string' },
+        { field: 'contract_start_time', type: "timestamp", title: '合同开始日期' },
+        { field: 'contract_end_time', type: "timestamp", title: '合同结束日期' },
+
+        { field: 'amount', type: 'float', title: '订单金额' },
+        { field: 'paid_amount', type: 'number', title: '付款金额' },
+        { field: 'paid_ratio', type: 'number', title: '付款比例' },
+        { field: 'paid_status', type: 'integer', title: '付款状态' },
+        { field: 'remark', title: '备注', type: 'string' },
+ 
+    ],
+
+    order_molds:{
+        fields:[
+            { field: 'id', type: 'bigint' },
+            { field: 'production_type', type: 'integer' },
+            { field: 'manufacture_cycle', type: 'timestamp' },
+            { field: 'draw_start_time', type: 'timestamp' },
+            { field: 'split_design_time', type: 'timestamp' },
+            { field: 'draw_time', type: 'timestamp' },
+            { field: 'draw2D_time', type: 'timestamp' },
+            { field: 'draw3D_time', type: 'timestamp' },
+            { field: 'horizontal_frame_time', type: 'timestamp' },
+            { field: 'inlay_deep_hole_time', type: 'timestamp' },
+            { field: 'update_uid', type: 'bigint' },
+            { field: 'mold_id', type: 'bigint' },
+            { field: 'mold_master_uid', type: 'bigint' },
+            { field: 'manufacture_cycle', type: 'timestamp' }, 
+            { field: 'product_structure_uid', type: 'bigint' }, 
+            { field: 'mold_structure_uid', type: 'bigint' },  
+            { field: 'create_uid', type: 'bigint' }
+        ]
+    }
+
+
+};
+
+
+module.exports = dataset
\ No newline at end of file