Merge branch 'master' of http://182.92.169.222:3000/yu/CostumingPlatform

ant-design-vue-jeecg/src/views/device/ZyDeviceList.vue

@@ -162,11 +162,11 @@
               return parseInt(index)+1;
             }
           },
-          // {
-          //   title:'设备类型编码',
-          //   align:"center",
-          //   dataIndex: 'typeCode'
-          // },
+          {
+            title:'设备类型编码',
+            align:"center",
+            dataIndex: 'typeCode'
+          },
           {
             title:'设备型号',
             align:"center",

ant-design-vue-jeecg/src/views/device/modules/ZyDeviceForm.vue

@@ -81,14 +81,29 @@
                                  placeholder="设备品牌" ></j-dict-select-tag>
             </a-form-model-item>
           </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="类型编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="devicetypeCode ">-->
+<!--              <j-popup-->
+<!--                v-model="model.code1"-->
+<!--                field="code1"-->
+<!--                org-fields="model,id"-->
+<!--                dest-fields="code1,modelId"-->
+<!--                code="zy_devicemodel"-->
+<!--                :multi="false"-->
+<!--                :param="parm1"-->
+<!--                @input="popupCallback"-->
+<!--              />-->
+<!--            </a-form-model-item>-->
+<!--            <a-input  v-model="model.modelId" hidden/>-->
+<!--          </a-col>-->
           <a-col :span="24">
-            <a-form-model-item label="类型编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="devicetypeCode ">
+            <a-form-model-item label="类型编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeCode">
               <j-popup
-                v-model="model.code1"
-                field="code1"
-                org-fields="model,id"
-                dest-fields="code1,modelId"
-                code="zy_devicemodel"
+                v-model="model.typeCode"
+                field="typeCode"
+                org-fields="code"
+                dest-fields="typeCode"
+                code="zy_devicetype"
                 :multi="false"
                 :param="parm1"
                 @input="popupCallback"