From 50aaceaf0f1f2fee94e8d40768df7e652f20536c Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Mon, 18 Sep 2023 11:48:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=85=B7=20=E5=B8=83=E4=BA=A7?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E6=97=B6=E5=80=99=E9=80=89=E6=8B=A9=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=9C=80=E8=A6=81=E6=98=BE=E7=A4=BA=E6=A8=A1=E5=85=B7?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Middle/Mold/MoldOrder/selector.vue | 77 ++++++++++----------
 1 file changed, 37 insertions(+), 40 deletions(-)

diff --git a/src/pages/Middle/Mold/MoldOrder/selector.vue b/src/pages/Middle/Mold/MoldOrder/selector.vue
index 5aa523f..ad3ee7d 100644
--- a/src/pages/Middle/Mold/MoldOrder/selector.vue
+++ b/src/pages/Middle/Mold/MoldOrder/selector.vue
@@ -8,29 +8,25 @@
     <!-- 表格区 -->
     <vxe-grid ref='xGrid' v-bind="gridOptions" @current-change="onSelectRow"></vxe-grid>
 
-    <vxe-table :row-config="{isCurrent:true}"  border show-overflow keep-source ref="xTable" :height="table1Height" :data="detailsData">
+    <vxe-table :row-config="{ isCurrent: true }" border show-overflow keep-source ref="xTable" :height="table1Height"
+      :data="detailsData">
 
-      <vxe-column field="mold_scheme" title="模型" width="160" :params="editor_scheme" formatter="formatRef" ></vxe-column>
+      <vxe-column field="mold_scheme" title="模型名" width="160" :params="editor_scheme" formatter="formatRef"></vxe-column>
+      <vxe-column field="mold_scheme" title="模型编码" width="160" :params="{dataType:'object',valueField: 'id',textField: 'code'}" formatter="formatRef"></vxe-column>
       <vxe-column field="production_type" title="布产类型" width="160" :params="options_production_type"
-        formatter='formatEnum' ></vxe-column>
+        formatter='formatEnum'></vxe-column>
 
-      <vxe-column field="mold_master_user_detail" title="师傅" width="160" :params="editor_staff" formatter="formatRef" ></vxe-column>
+      <vxe-column field="mold_master_user_detail" title="师傅" width="160" :params="editor_staff"
+        formatter="formatRef"></vxe-column>
 
-      <vxe-column field="manufacture_cycle" title="制作周期" width="160" formatter="formatDate" ></vxe-column>
-      <vxe-column field="draw_start_time" title="预计开始画图时间" width="160" formatter="formatDate"
-        ></vxe-column>
-      <vxe-column field="split_design_time" title="分模设计时间预计" width="160" formatter="formatDate"
-        ></vxe-column>
-      <vxe-column field="draw_time" title="出图时间预计" width="160" formatter="formatDate"
-        ></vxe-column>
-      <vxe-column field="draw2D_time" title="出2D时间预计" width="160" formatter="formatDate"
-        ></vxe-column>
-      <vxe-column field="draw3D_time" title="出3D时间预计" width="160" formatter="formatDate"
-        ></vxe-column>
-      <vxe-column field="horizontal_frame_time" title="横架到厂日期预计" width="160" formatter="formatDate"
-        ></vxe-column>
-      <vxe-column field="inlay_deep_hole_time" title="镶件深孔钻到厂日期预计" width="160" formatter="formatDate"
-        ></vxe-column>
+      <vxe-column field="manufacture_cycle" title="制作周期" width="160" formatter="formatDate"></vxe-column>
+      <vxe-column field="draw_start_time" title="预计开始画图时间" width="160" formatter="formatDate"></vxe-column>
+      <vxe-column field="split_design_time" title="分模设计时间预计" width="160" formatter="formatDate"></vxe-column>
+      <vxe-column field="draw_time" title="出图时间预计" width="160" formatter="formatDate"></vxe-column>
+      <vxe-column field="draw2D_time" title="出2D时间预计" width="160" formatter="formatDate"></vxe-column>
+      <vxe-column field="draw3D_time" title="出3D时间预计" width="160" formatter="formatDate"></vxe-column>
+      <vxe-column field="horizontal_frame_time" title="横架到厂日期预计" width="160" formatter="formatDate"></vxe-column>
+      <vxe-column field="inlay_deep_hole_time" title="镶件深孔钻到厂日期预计" width="160" formatter="formatDate"></vxe-column>
     </vxe-table>
 
   </div>
@@ -52,8 +48,8 @@ export default {
 
     // 页面数据变量
     var pageData = {
- 
-      options_production_type:[{value:'1',label:'正常布产'},{value:'2',label:'委托布产'}],
+
+      options_production_type: [{ value: '1', label: '正常布产' }, { value: '2', label: '委托布产' }],
       keyName: 'ID',
       tabKey: '1',
       actions: {
@@ -68,24 +64,24 @@ export default {
       table1Height: 300,
       downHeight: 0,
 
-      detailsData:[],
+      detailsData: [],
 
       //搜索区
       searchFormData: {
-        code: '', 
+        code: '',
       },
       searchRules: [
-        { key: "code", mode: "like" }, 
+        { key: "code", mode: "like" },
       ],
 
 
       searchFormItems: [
         { field: 'code', title: '订单号', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入订单号' } } },
 
-      
+
         { span: 4, itemRender: { name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } }, { props: { type: 'reset', content: '重置' } }] } }
       ],
- 
+
 
       //数据区
       gridOptions: {
@@ -150,6 +146,7 @@ export default {
         ],
         dataUrl: `${BASE_URL.BASE_URL}/MoldScheme/v1/mold/scheme/list`
       },
+ 
       editor_staff: {
         dataType: "object",
         valueField: "id",
@@ -192,25 +189,25 @@ export default {
     getConfirmData() {
       return this.getSelectdRow();
     },
-    
-    onSelectRow({ row }) {
- 
-      this.currentRowId = row.id; 
 
-     
+    onSelectRow({ row }) {
+
+      this.currentRowId = row.id;
+
+
       this.$mk.post({
-        url:  `${BASE_URL.BASE_URL}/MoldOrder/v1/mold/order/detail`,
+        url: `${BASE_URL.BASE_URL}/MoldOrder/v1/mold/order/detail`,
         loading: "加载中...",
         data: { id: this.$mk.toBigInt(this.currentRowId) },
         useBigInt: true
       }).then(a => {
 
 
-  
+
         this.detailsData = JSON.parse(JSON.stringify(a.data[this.detailDataFieldName].order_molds || []));
- 
+
         console.log(this.detailsData)
- 
+
       });
     },
     onDateChange(date) {
@@ -249,7 +246,7 @@ export default {
             value: value // 值
           });
         }
-      } 
+      }
 
 
       return rules; // 返回搜索参数
@@ -257,8 +254,8 @@ export default {
     getSelectdRow() {
       let row2 = this.$refs.xTable.getCurrentRecord();
       let row1 = this.$refs.xGrid.getCurrentRecord();
-       
-      return {row1,row2};
+
+      return { row1, row2 };
     },
     loadData({ params }) {
 
@@ -269,7 +266,7 @@ export default {
         data: params
       });
     },
- 
+
     //add / log / setting
     toolbarClick(e) {
       if (e.name == "add") {
@@ -292,7 +289,7 @@ export default {
       }
     },
 
- 
+
     onSearch() {
       this.$refs.xGrid.commitProxy('query')
     }