From 7d3db0078a97d3308474ceb6b6df4e8ee29beb7f Mon Sep 17 00:00:00 2001
From: zxx <47968546@163.com>
Date: Mon, 16 Oct 2023 11:00:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9B=9E=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/application/mk/index.js                        |  5 -----
 src/pages/Middle/Mold/MoldOrder/selector.vue       |  7 ++++++-
 src/pages/Middle/Mold/MoldProductionOrder/List.vue | 11 +++++++----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/application/mk/index.js b/src/application/mk/index.js
index 1c6a2c8..ee431e0 100644
--- a/src/application/mk/index.js
+++ b/src/application/mk/index.js
@@ -164,11 +164,6 @@ VXETable.formats.mixin({
         return parseFloat(cellValue).toFixed(2) + "%";
     },
 
-    formatProduction({ cellValue }) { // 百分比的形式显示
-        if (cellValue === 0) return '未布产';
-        if (!cellValue) return '';
-        return '已布产';
-    },
 })
 
 VXETable.renderer.add('enum', {
diff --git a/src/pages/Middle/Mold/MoldOrder/selector.vue b/src/pages/Middle/Mold/MoldOrder/selector.vue
index 6039191..b5bf26e 100644
--- a/src/pages/Middle/Mold/MoldOrder/selector.vue
+++ b/src/pages/Middle/Mold/MoldOrder/selector.vue
@@ -13,7 +13,12 @@
 
       <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_id" title="布产状态" width="160"  formatter="formatProduction"></vxe-column>
+      <vxe-column field="production_id" title="布产状态" width="160" >
+        <template #default="{ row }">
+          <span v-if="row.production_id === 0"> 未布产</span>
+          <span v-if="row.production_id > 0">已布产</span>
+        </template>
+      </vxe-column>
       <vxe-column field="progress" title="进度" width="160" :cellRender="{ name: 'progress' }"></vxe-column>
       <vxe-column field="production_type" title="布产类型" width="160" :params="options_production_type"
         formatter='formatEnum'></vxe-column>
diff --git a/src/pages/Middle/Mold/MoldProductionOrder/List.vue b/src/pages/Middle/Mold/MoldProductionOrder/List.vue
index ff2adbe..c1271f9 100644
--- a/src/pages/Middle/Mold/MoldProductionOrder/List.vue
+++ b/src/pages/Middle/Mold/MoldProductionOrder/List.vue
@@ -32,6 +32,7 @@
 <script>
 import BASE_URL from '@/services/mes/api.js';
 
+const settings = require('../basic/settings.js');
 
 export default {
   i18n: require("./i18n"),
@@ -112,6 +113,7 @@ export default {
         searchFormData: {
           title: '',
           desc: '',
+          is_complete: '0',
         },
         // 搜索区配置
         searchRules: [
@@ -124,9 +126,9 @@ export default {
         searchFormItems: [ // 子项
 
 
-          { field: 'code', title: '编码', span: 4, itemRender: { name: '$input', props: { placeholder: '请输入编码' } } },
+          { field: 'code', title: '编码', span: 3, itemRender: { name: '$input', props: { placeholder: '请输入编码' } } },
           { field: 'customer_name', title: '客户名称', span: 4, itemRender: { name: '$input', props: { placeholder: '请输入客户名称' } } },
-          { field: 'is_complete', title: '完成状态', span: 2, itemRender: { name: '$input', props: { placeholder: '请输入客户名称' } } },
+          
           {
             title: '模具师傅', span:4,
             field: 'mold_master_uid',
@@ -146,7 +148,7 @@ export default {
             }
           },
           {
-            title: '工程师傅', span: 4,
+            title: '工程师傅', span: 3,
             field: 'engineer_uid',
             dataRule: {
               fromField: "id"
@@ -164,7 +166,7 @@ export default {
             }
           },
           {
-            title: '订单', span: 4,
+            title: '订单', span: 3,
             field: 'order_id',
             dataRule: {
               fromField: "id"
@@ -181,6 +183,7 @@ export default {
               }
             }
           },
+          { field: 'is_complete', title: '状态', span: 3, itemRender: { name: '$select', props: { options: settings.options_is_complete } } },
 
           {
             align: 'right', span: 4, itemRender: {  // 按钮列