diff --git a/ant-design-vue-jeecg/src/views/zygoods/modules/ZyGoodsForm.vue b/ant-design-vue-jeecg/src/views/zygoods/modules/ZyGoodsForm.vue
index 8391ce0e..ada55544 100644
--- a/ant-design-vue-jeecg/src/views/zygoods/modules/ZyGoodsForm.vue
+++ b/ant-design-vue-jeecg/src/views/zygoods/modules/ZyGoodsForm.vue
@@ -11,17 +11,49 @@
           <a-col :span="24">
             <a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothsTypeId">
               <!--<j-dict-select-tag type="list" v-model="model.clothsTypeId" :dictCode="lx" placeholder="请选择类型" @change="getks()"/>-->
-              <j-dict-select-tag type="list" v-model="model.clothsTypeId" dictCode="zy_cloths_type,type_name,id" placeholder="请选择类型" @change="getks()"/>
+              <!--<j-dict-select-tag type="list" v-model="model.clothsTypeId" dictCode="zy_cloths_type,type_name,id" placeholder="请选择类型" @change="getks()"/>-->
+              <j-popup
+                v-model="model.typeName"
+                field="typeName"
+                org-fields="id,type_name"
+                dest-fields="clothsTypeId,typeName"
+                code="zy_cloths_type"
+                :multi="multi"
+                @input="popupCallback"
+              />
+              <a-input v-model="model.clothsTypeId" hidden />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="服装款式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleId">
-              <j-dict-select-tag type="list" v-model="model.styleId" :dictCode="ks" placeholder="请选择款式" @change="getxh()"/>
+              <!--<j-dict-select-tag type="list" v-model="model.styleId" :dictCode="ks" placeholder="请选择款式" @change="getxh()"/>-->
+              <j-popup
+                v-model="model.styleName"
+                field="styleName"
+                org-fields="id,style_names"
+                dest-fields="styleId,styleName"
+                code="zy_cloths_style"
+                :multi="multi"
+                :param = "param"
+                @input="popupCallback2"
+              />
+              <a-input v-model="model.styleId" hidden />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="服装型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modelId">
-              <j-dict-select-tag type="list" v-model="model.modelId" :dictCode="xh" placeholder="请选择型号" @change="getspbh()"/>
+              <!--<j-dict-select-tag type="list" v-model="model.modelId" :dictCode="xh" placeholder="请选择型号" @change="getspbh()"/>-->
+              <j-popup
+                v-model="model.modelName"
+                field="modelName"
+                org-fields="id,model_number"
+                dest-fields="modelId,modelName"
+                code="zy_style_model"
+                :multi="multi"
+                :param = "param2"
+                @input="popupCallback3"
+              />
+              <a-input v-model="model.modelId" hidden />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -129,6 +161,8 @@
         lx:'zy_cloths_type ,type_name,id',
         ks:'zy_cloths_style,style_names,id',
         xh:'zy_style_model,model_number,id',
+        param:{type_id:""},
+        param2:{style_id:""},
         autoplay:true,
         model:{
             customized:0,
@@ -144,6 +178,7 @@
           sm: { span: 16 },
         },
         confirmLoading: false,
+        multi: false,
         validatorRules: {
           enterprisesId:[{
             required: true, message: '请选择企业!'
@@ -206,6 +241,41 @@
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
     methods: {
+      popupCallback(value,row){
+        this.model = Object.assign(this.model, row);
+        this.param.type_id = this.model.clothsTypeId;
+      },
+      popupCallback2(value,row){
+        this.model = Object.assign(this.model, row);
+        this.param2.style_id = this.model.styleId;
+        getAction(this.url.zystyle, {ksid:this.model.styleId}).then((res) => {
+          if (res.success) {
+            // this.$forceUpdate();
+            this.$set(this.model,'goodsIntr',res.result.productOverview);
+            this.$set(this.model,'goodsPicture',res.result.designSketch);
+            this.$set(this.model,'defaultPicture',res.result.designSketch);
+          } else {
+
+          }
+        });
+      },
+      popupCallback3(value,row){
+        this.model = Object.assign(this.model, row);
+        // //如果编辑-商品编码不该改变
+        if(!this.model.id)
+        {
+          getAction(this.url.zy, {lxid:this.model.clothsTypeId,xhid:this.model.modelId}).then((res) => {
+            if (res.success) {
+              // console.log(res.result.nums)
+              // this.$forceUpdate();
+              //写一个接口返回一个拼装好的商品编号
+              this.$set(this.model,'goodsCode',res.result);
+            } else {
+
+            }
+          });
+        }
+      },
       getlx(){
         this.lx ="zy_cloths_type ,type_name,id,enterprise_id='" + this.model.enterprisesId + "'";
       },