Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/factoryModel/station/index.vue

@@ -143,7 +143,14 @@
             label: '设备名称',
             prop: 'extInfo.assetName',
             formatter: (_row, _column, cellValue) => {
-              return typeof cellValue === 'string' ? cellValue :'';
+              return typeof cellValue === 'string' ? cellValue : '';
+            }
+          },
+          {
+            label: '设备编码',
+            prop: 'extInfo.assetCode',
+            formatter: (_row, _column, cellValue) => {
+              return typeof cellValue === 'string' ? cellValue : '';
             }
           },
           {

src/views/material/product/detail.vue

@@ -331,6 +331,14 @@
               </template>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="需要序列号">
+              <el-radio-group v-model="form.extTagField.needProductSequence">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
     </el-card>
@@ -575,7 +583,8 @@
           extField: {},
           // isConsumables:2,
           extTagField: {
-            isConsumables: 0
+            isConsumables: 0,
+            needProductSequence: 0
           }
         },
         lbjtList: [
@@ -673,7 +682,8 @@
               modelKey: [],
               extField: {},
               extTagField: {
-                isConsumables: 0
+                isConsumables: 0,
+                needProductSequence: 0
               },
               measureType: 1,
               isEnabled: 1
@@ -1124,7 +1134,8 @@
 
           if (!this.form.extTagField) {
             this.form.extTagField = {
-              isConsumables: 0
+              isConsumables: 0,
+              needProductSequence: 0
             }; // 初始化动态模型属性
           }
           // this.$set(this.form.extTagField, 'isConsumables', 0); // 初始化动态模型属性