Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt

src/views/bpm/stockManagement/storage.vue

@@ -908,6 +908,7 @@ export default {
               packingUnit: packingUnit, // 单位
               measureQuantity: measureQuantity, // 计量数量
               measureUnit: item.measuringUnit, // 计量单位
+              measureType: item.measureType, // 计量方式
               netWeight: item.netWeight > -1 ? item.netWeight : 0, // 净重
               singleWeight: singleWeight, // 单重重量
               weight: weight, // 总重量
@@ -1102,6 +1103,7 @@ export default {
                 ? this.getMeasureQuantity(item.code)
                 : this.form.totalCount, // 计量数量
               measureUnit: item.measuringUnit, // 计量单位
+              measureType: item.measureType, // 计量方式
               netWeight: item.netWeight > -1 ? item.netWeight : 0, // 净重
               weight: weight, // 重量
               singleWeight: singleWeight,
@@ -1553,6 +1555,7 @@ export default {
 
       // 处理产品数据
       this.productList = this.productList.map((productItem) => {
+        productItem.qualityControl = this.form.isQmsCheck; //是否质检
         return {
           ...productItem,
           outInDetailRecordRequestList: _packingList.filter(
@@ -1569,7 +1572,6 @@ export default {
       obj.extInfo.deptName = this.formData.extInfo.deptName;
       obj.extInfo.supplierName = this.form.supplierName;
       obj.extInfo.deliveryPhone = this.formData.extInfo.deliveryPhone;
-      obj.qualityControl = this.form.isQmsCheck;//是否质检
 
       // 处理仓库id
       let warehouseId = [];

src/views/home/index.vue

@@ -196,7 +196,7 @@
               v-for="(item, index) in list"
               :class="[(index + 1) % 3 == 0 ? 'item margin_0' : 'item']"
               @click="openUrl(item)"
-            >
+            > 
               <div><img :src="item.img" /></div>
               <div>{{ item.name }}</div>
             </div>
@@ -424,7 +424,23 @@
     },
     methods: {
       openUrl(item) {
-        window.open(item.linkUrl, '_blank');
+        // 统一门户配置
+        if(item.architType==='1'){
+           // bs门户配置
+          window.open(item.linkUrl);
+        }else{
+          let url = item.linkUrl.split('//');
+          window.open(url[1], '_blank');
+           // cs门户配置
+
+          //  const link = document.createElement('a');
+          //   // 6. 设置链接属性
+          //   link.href = url;
+          //   link.download = '自定义文件名.zip'; // 可以设置不同的下载文件名
+          //   link.style.display = 'none';
+        }
+           
+
       },
       async getPages() {
         let { list } = await getList({ pageNum: 1, size: 9999 });