From b1c4b9509b3b84594bbc9a541f308101d3a17140 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 24 七月 2025 10:20:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/technical/modules/EamTechnicalStatusChangeModal.vue | 54 ++++++++++++++++++++++++++----------------------------
1 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/src/views/eam/technical/modules/EamTechnicalStatusChangeModal.vue b/src/views/eam/technical/modules/EamTechnicalStatusChangeModal.vue
index 7a4b5b1..5d93703 100644
--- a/src/views/eam/technical/modules/EamTechnicalStatusChangeModal.vue
+++ b/src/views/eam/technical/modules/EamTechnicalStatusChangeModal.vue
@@ -2,35 +2,33 @@
<j-modal :title="title" :width="1200" :visible="visible" :confirmLoading="confirmLoading" switchFullscreen
@ok="handleOk" @cancel="handleCancel" cancelText="鍏抽棴">
<a-spin :spinning="spinning">
- <div class="table-page-search-wrapper">
- <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-row>
- <a-col :span="8">
- <a-form-model-item label="鍙樻洿鍗曞彿">
- <a-input placeholder="绯荤粺鑷姩鐢熸垚" v-model="model.changeOrderNum" disabled/>
- </a-form-model-item>
- </a-col>
- <a-col :span="8">
- <a-form-model-item label="鐢宠鍗曚綅" prop="factoryOrgCode">
- <a-tree-select v-model="model.factoryOrgCode" :tree-data="productionTreeData"
- @change="detail.dataSource=[]"
- show-search :replaceFields="{key:'orgCode',value:'orgCode'}"
- treeNodeFilterProp="title" searchPlaceholder="璇疯緭鍏ュ叧閿瓧鎼滅储"
- :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="璇烽�夋嫨鐢宠鍗曚綅"
- allow-clear tree-default-expand-all :allow-clear="false"/>
- </a-form-model-item>
- </a-col>
- </a-row>
+ <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="鍙樻洿鍗曞彿">
+ <a-input placeholder="绯荤粺鑷姩鐢熸垚" v-model="model.changeOrderNum" disabled/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鐢宠鍗曚綅" prop="factoryOrgCode">
+ <a-tree-select v-model="model.factoryOrgCode" :tree-data="productionTreeData"
+ @change="detail.dataSource=[]"
+ show-search :replaceFields="{key:'orgCode',value:'orgCode'}"
+ treeNodeFilterProp="title" searchPlaceholder="璇疯緭鍏ュ叧閿瓧鎼滅储"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="璇烽�夋嫨鐢宠鍗曚綅"
+ allow-clear tree-default-expand-all :allow-clear="false"/>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
- <a-row>
- <a-col :span="24">
- <a-form-model-item label="澶囨敞" :labelCol="{span:2}" :wrapperCol="{span:20}">
- <a-textarea placeholder="璇疯緭鍏ュ娉�" v-model="model.remark"/>
- </a-form-model-item>
- </a-col>
- </a-row>
- </a-form-model>
- </div>
+ <a-row>
+ <a-col :span="24">
+ <a-form-model-item label="澶囨敞" :labelCol="{span:2}" :wrapperCol="{span:20}">
+ <a-textarea placeholder="璇疯緭鍏ュ娉�" v-model="model.remark"/>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </a-form-model>
<j-vxe-table ref="editableDetailTable" rowNumber rowSelection bordered alwaysEdit toolbar
v-if="model.factoryOrgCode"
--
Gitblit v1.9.3