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

# Conflicts:
#	src/views/material/product/components/QualityInfo.vue
#	src/views/material/product/detail.vue

src/utils/common.js

@@ -31,14 +31,14 @@ export const init = () => {
 //   console.log('初始化Socket.io连接', token);
 
   let socket = io('ws://192.168.1.251:18086/websocket/UnreadNotifyMessageCount',{
-    //   auth:{
-    //       token:token
-    //   },
-    //  transports: ['websocket']
-    transports: ['polling'],
-    extraHeaders: {
-      'Authorization': token
-    }
+      auth:{
+          authorization:token
+      },
+     transports: ['websocket']
+    // transports: ['polling'],
+    // extraHeaders: {
+    //   'Authorization': token
+    // }
   }); ///websocket/UnreadNotifyMessageCount
 //   socket.disconnect().connect()
 

src/views/material/product/components/QualityInfo.vue

@@ -111,6 +111,7 @@
     },
     methods: {
       async getDictList(code) {
+        // debugger;
         let { data: res } = await getByCode(code);
         this.levelOptions = res.map((item) => {
           let values = Object.keys(item);

src/views/material/product/detail.vue

@@ -43,7 +43,14 @@
               </el-select>
             </el-form-item>
           </el-col>
-
+          <el-col :span="8">
+            <el-form-item label="属性类型:" prop="attributeType">
+              <el-select v-model="form.attributeType" filterable class="ele-block">
+                <el-option v-for="item in attributeList" :key="item.value" :value="item.value"
+                  :label="item.label"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="8" v-if="
             [1, 23, 9, 28].includes(
               Number(categoryLevelPathId || $route.query.rootTreeId)
@@ -98,7 +105,8 @@
           <el-col :span="8">
             <el-form-item label="体积">
               <div class="form-line">
-                <el-input v-model="form.volume" style="width: calc(100% - 100px)" @input="handleInput1" />
+                <el-input v-model="form.volume" style="width: calc(100% - 100px)" />
+                <!-- @input="handleInput1" -->
                 <DictSelection dictName="体积单位" clearable v-model="form.volumeUnit" style="width: 100px">
                 </DictSelection>
               </div>
@@ -143,6 +151,8 @@
               </template>
             </el-form-item>
           </el-col>
+
+
         </el-row>
       </el-form>
     </el-card>
@@ -155,7 +165,6 @@
     <WarehouseInfo ref="warehouseRefs" v-if="isShow" :form="categoryWms" :measuringUnit="form.measuringUnit"
       :packingUnit="form.packingUnit" :packageDispositionVOList="packageDispositionVOList"
       @change="changePackagingSpecification" />
-
     <!-- 销售配置 -->
     <SalesInfos ref="salesRefs" :form="categorySales" />
     <!-- 采购信息 -->
@@ -257,12 +266,29 @@ export default {
         categoryLevelName: '',
         isConsumable: 1,
         measuringUnit: '',
+        attributeType: '',
         weightUnit: '',
         packingUnit: '',
 
         extField: {}
       },
-
+      attributeList: [
+        {
+          label: '总装',
+          value: 1
+        },
+        {
+          label: '部件',
+          value: 2
+        },
+        {
+          label: '零件',
+          value: 3
+        }, {
+          label: '原材料',
+          value: 4
+        }
+      ],
       remarkform: {
         remarkAttach: []
       },
@@ -297,6 +323,9 @@ export default {
         produceType: [
           { required: true, message: '请选择生产类型', trigger: 'change' }
         ],
+        attributeType: [
+          { required: true, message: '请选择属性类型', trigger: 'change' }
+        ],
         categoryLevelName: [
           { required: true, message: '请选择所属分类', trigger: 'change' }
         ],
@@ -366,7 +395,7 @@ export default {
       },
       deep: true,
       immediate: true
-    },
+    }
   },
   async activated() {
     this.status = this.$route.query.status;
@@ -420,7 +449,7 @@ export default {
     this.getDictList('productionType');
   },
   methods: {
-    handleInput1(value) {
+    handleInput(value) {
       this.form.volume = this.$handleInputPublicHasPoint(value);
     },
     handleInput2(value) {
@@ -451,7 +480,7 @@ export default {
             console.log(this.form.measuringUnit, 'this.form.measuringUnit');
             console.log(this.form.packingUnit, 'this.form.packingUnit');
             if (this.packageDispositionVOList.length === 0) {
-              console.log('如果没有包装组，则添加包装组');
+              console.log('如果没有包装组');
               this.$refs.warehouseRefs.defaultBuild(this.form.packingUnit);
             }
           }
@@ -462,7 +491,6 @@ export default {
     changePackagingSpecification(val) {
       console.log('changePackagingSpecification---', val);
       this.packagingSpecificationList = val;
-
     },
     async _getDetails() {
       const data = await getDetails(this.$route.query.id);