From 6991bdd5783fc57fe3f97bbba247091a17bf7f0c Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Tue, 23 May 2023 16:56:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E8=A1=A3=E6=A0=B7=E6=9D=BF=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=E6=94=B9=E5=BC=B9=E5=87=BA=E6=A1=86=E8=81=94?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ZyClothSampleForm.vue             | 48 ++++++++++++++++---
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue
index 7b9a8901..eca3c159 100644
--- a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue
+++ b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue
@@ -18,8 +18,19 @@
           <!--关联服装款式表 zy_cloths_style 关联列：名称 传值id-->
           <a-col :span="24">
             <a-form-model-item label="款式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleId" v-if="this.model.id==null">
-              <j-dict-select-tag v-model="model.styleId" placeholder="请输入款式"
-                                 :dict-code="dict" @change="xiugai"></j-dict-select-tag>
+<!--              <j-dict-select-tag v-model="model.styleId" placeholder="请输入款式"
+                                 :dict-code="dict" @change="xiugai"></j-dict-select-tag>-->
+              <j-popup
+                v-model="model.styleName"
+                field="styleName"
+                org-fields="id,style_names"
+                dest-fields="styleId,styleName"
+                code="zy_cloths_style_enterprise_id"
+                :multi="multi"
+                :param = "param"
+                @input="popupCallback"
+              />
+              <a-input v-model="model.styleId" hidden />
 
             </a-form-model-item>
             <a-form-model-item label="款式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleId"  v-else>
@@ -35,8 +46,19 @@
               <!--              <a-input v-model="model.stylemodelId" placeholder="请输入款式型号" @change="(vaule) => handletypeSelect(value)"></a-input>-->
 <!--              <j-dict-select-tag v-model="model.stylemodelId" placeholder="请输入款式型号"-->
 <!--                                 dict-code="zy_style_model,model_number,model_number"></j-dict-select-tag>-->
-              <j-dict-select-tag v-model="model.stylemodelId" placeholder="请选择款式型号"
-                                 :dictCode="modenumber" @change="gaibian"></j-dict-select-tag>
+<!--              <j-dict-select-tag v-model="model.stylemodelId" placeholder="请选择款式型号"
+                                 :dictCode="modenumber" @change="gaibian"></j-dict-select-tag>-->
+              <j-popup
+                v-model="model.modelName"
+                field="modelName"
+                org-fields="id,model_number"
+                dest-fields="stylemodelId,modelName"
+                code="zy_style_model"
+                :multi="multi"
+                :param = "param2"
+                @input="popupCallback2"
+              />
+              <a-input v-model="model.stylemodelId" hidden />
             </a-form-model-item>
             <a-form-model-item label="款式型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stylemodelId" v-else>
               <!--              <a-input v-model="model.stylemodelId" placeholder="请输入款式型号" @change="(vaule) => handletypeSelect(value)"></a-input>-->
@@ -113,6 +135,9 @@ export default {
   data() {
     return {
       nums: '',
+      multi: false,
+      param:{enterprise_id:""},
+      param2:{style_id:""},
       selectedKey: '', // 款式id
       typeid: '', // 型号,
       serialNumber: '', // 顺序号
@@ -178,17 +203,28 @@ export default {
     console.log(this.props, 'superFieldList')
   },
   methods: {
+    popupCallback(value,row){
+      this.model = Object.assign(this.model, row);
+      this.param2.style_id = this.model.styleId;
+    },
+    popupCallback2(value,row){
+      this.model = Object.assign(this.model, row);
+      this.gaibian();
+    },
     add() {
       this.edit(this.modelDefault);
     },
     //
     kuanshi(){
-   this.dict="zy_cloths_style,style_names,id,enterprise_id="+"'"+this.model.enterpriseId+"'";
+      this.param.enterprise_id = this.model.enterpriseId;
+   /*this.dict="zy_cloths_style,style_names,id,enterprise_id="+"'"+this.model.enterpriseId+"'";*/
       // this.model.styleId=null
       // this.model.nums=null
     },
     xiugai(){
-      this.modenumber="zy_style_model,model_number,id,style_id="+"'"+this.model.styleId+"'"
+/*      this.modenumber="zy_style_model,model_number,id,style_id="+"'"+this.model.styleId+"'"*/
+      this.param2.style_id = this.model.styleId;
+
       // this.model.stylemodelId=null
       // this.model.nums=null
       // if(this.model.stylemodelId!=null&&this.model.enterpriseId!=null){