From 6bc650b801a7036b48b70a3350978b4e50dd5d66 Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Wed, 11 Oct 2023 16:20:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=85=B7=20#149=20#150?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/application/mk/basic-pages/list.vue       | 17 +++++++++--
 .../Middle/Mold/MoldProductionOrder/List.vue  | 29 +++++++++++++++----
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/src/application/mk/basic-pages/list.vue b/src/application/mk/basic-pages/list.vue
index 3990daf..29fa504 100644
--- a/src/application/mk/basic-pages/list.vue
+++ b/src/application/mk/basic-pages/list.vue
@@ -38,7 +38,7 @@
     </vxe-toolbar>
     <!-- 表格区 -->
     <div class="gridPanel">
-      <vxe-grid ref='xGrid' v-bind="options.gridOptions">
+      <vxe-grid ref='xGrid' v-bind="options.gridOptions"  class="mytable-style" :row-class-name="rowClassName">
         <template #op="{ row }">
           <div class="oplinks">
             <a @click.stop="pageEdit(row)" title="编辑"><a-icon type="edit" /></a>
@@ -631,6 +631,10 @@ export default {
       let rows = this.$refs.xGrid.getCheckboxRecords();
       return rows;
     },
+
+    rowClassName({ row }) { 
+      return row.rowClassName || '';
+    },
   },
   // 监听属性
   watch: {
@@ -639,7 +643,16 @@ export default {
 };
 
 </script>
-<style scoped lang="less">
+<style lang="less">
+.mytable-style    .row-lightred  td{
+  background-color: #ff9b9b9e; 
+}
+.mytable-style    .row-lightyellow  td{
+  background-color: #ffe09b9e; 
+}
+
+
+
 .page-body {
   padding: 15px;
   background: @base-bg-color;
diff --git a/src/pages/Middle/Mold/MoldProductionOrder/List.vue b/src/pages/Middle/Mold/MoldProductionOrder/List.vue
index 56a2200..31598d3 100644
--- a/src/pages/Middle/Mold/MoldProductionOrder/List.vue
+++ b/src/pages/Middle/Mold/MoldProductionOrder/List.vue
@@ -123,10 +123,10 @@ export default {
         searchFormItems: [ // 子项
 
 
-          { field: 'code', title: '编码', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入编码' } } },
-          { field: 'customer_name', title: '客户名称', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入客户名称' } } },
+          { field: 'code', title: '编码', span: 4, itemRender: { name: '$input', props: { placeholder: '请输入编码' } } },
+          { field: 'customer_name', title: '客户名称', span: 4, itemRender: { name: '$input', props: { placeholder: '请输入客户名称' } } },
           {
-            title: '模具师傅', span:5,
+            title: '模具师傅', span:4,
             field: 'mold_master_uid',
             dataRule: {
               fromField: "id"
@@ -144,7 +144,7 @@ export default {
             }
           },
           {
-            title: '工程师傅', span: 5,
+            title: '工程师傅', span: 4,
             field: 'engineer_uid',
             dataRule: {
               fromField: "id"
@@ -161,6 +161,25 @@ export default {
               }
             }
           },
+          {
+            title: '订单', span: 4,
+            field: 'order_id',
+            dataRule: {
+              fromField: "id"
+            },
+            itemRender: {
+              name: 'MkFormDataSelector', props: {
+                params: {
+                  dataType: "object",
+                  valueField: "id",
+                  textField: "name",
+                  listdataFieldName: 'MoldOrder',
+                  dataUrl: `${BASE_URL.BASE_URL}/MoldOrder/v1/mold/order/list`
+                }
+              }
+            }
+          },
+
           {
             align: 'right', span: 4, itemRender: {  // 按钮列
               name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } },  // 搜索按钮
@@ -204,7 +223,7 @@ export default {
             { title: '模具图片', slots: { default: 'column4' }, width: 90 },
 
             { slots: { content: 'column3' }, type: "expand", width: 100, title: '进度明细', showHeaderOverflow: true },
-            { field: 'progress', minWidth: 150, cellRender: { name: 'progress' }, sortable: true, title: '总进度', showHeaderOverflow: true },
+            { field: 'progress', minWidth: 150, cellRender: { name: 'progress' }, title: '总进度', showHeaderOverflow: true },
             // { slots: { default: 'column2' },width: 200,  title: '进度明细', showHeaderOverflow: true },
             { field: 'create_time', formatter: 'formatDate', width: 130, sortable: true, title: '创建时间', showHeaderOverflow: true }, // 创建时间