Browse Source

修改台账中无法选择厂商库

chuwu 6 years ago
parent
commit
6c217e3143

+ 1 - 1
config/prod.env.js

@@ -1,7 +1,7 @@
 'use strict'
 module.exports = {
     NODE_ENV: '"production"',
-    BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
+    BASE_URL: '"http://39.96.187.128"', //线上iframe地址
     UPLOAD_URL: '"http://prod.dp.sagacloud.cn:28888"', //上传地址
     // BASE_URL: '"http://172.16.0.181"', //测试环境iframe的地址/
     // UPLOAD_URL: '"http://192.168.20.225:8080"', //上传地址

+ 2 - 2
src/components/demo2.vue

@@ -2,11 +2,11 @@
   <div>
     <div class="header">{{ title }}</div>
     <div style="margin-top:46px;">
-		<div class="city" v-for="letter in letterSortList">
+		<div class="city" v-for="(letter,index) in letterSortList" :key="index">
 		    <div class="city-title" :id="letter">{{letter}}</div>
 	        <div class="city-content">
 	          <ul class="city-list">
-	            <li class="city-item" v-for="city in letterCityList" v-if="city.capitalize === letter">{{city.name}}</li>
+	            <li class="city-item" v-for="(city,sityIndex) in letterCityList" :key="sityIndex" v-if="city.capitalize === letter">{{city.name}}</li>
 	          </ul>
 	        </div>
 	    </div>

+ 1 - 1
src/components/dialogHanson/addDevice.vue

@@ -493,4 +493,4 @@ export default {
     margin-right: 10px;
   }
 }
-</style>
+</style>

+ 1 - 0
src/components/dialogs/list/firm.vue

@@ -121,6 +121,7 @@ export default {
       this.getData()
     },
     getData() {
+        console.log(this.mess)
       getSpecList({
         limit: {
           skip: this.page.size * (this.page.currentPage - 1),

+ 2 - 2
src/components/handsontables/device.vue

@@ -50,7 +50,7 @@
     <!-- 二维码弹窗 -->
     <qrcode :dialog="dialog" :qrcodeUrl="qrcodeUrl" :addBody="true" ref="qrcode"></qrcode>
     <!-- 型号弹窗 -->
-    <firm :mess="{deviceId: deviceType.code}" ref="firm" @changeFirm="firmChange" :dialog="dialog"></firm>
+    <firm :mess="{deviceId: mess.deviceId}" ref="firm" @changeFirm="firmChange" :dialog="dialog"></firm>
     <!-- 供应商合同弹窗 -->
     <supply-dialog ref="supply" @change="supplyChange" :id="id" :dialog="dialog"></supply-dialog>
     <!-- 供应商弹窗 -->
@@ -507,7 +507,7 @@ export default {
 
       let data = showTools.changeHeader(arr, readArr, this.onlyRead, this.isWatch, this.allMess)
       data.unshift("操作", "当前关联的资产", "所属系统实例");
-      console.log(data)
+      console.log(data,'dataaaa')
       return data;
     },
 

+ 1 - 1
src/components/lib/uploadImgsName.vue

@@ -362,4 +362,4 @@ export default {
     }
   }
 }
-</style>
+</style>

+ 6 - 0
src/utils/hansontable/notShow.js

@@ -493,6 +493,9 @@ const showTools = {
             }
 
         }).filter(item => item);
+        if (!onlyRead) {
+            showTools.insertionType2(data, text.idType)
+        }
         return data
     },
 
@@ -534,6 +537,9 @@ const showTools = {
                 return undefined;
             }
         }).filter(d => d);
+        if (!onlyRead) {
+            showTools.insertionRea2(data)
+        }
         return data
     }
 }

+ 8 - 5
src/views/buildFamily.vue

@@ -5,13 +5,13 @@
   <div id="family">
     <header>
       <select class="form-control" v-model="value" @change="chooseMedicine">
-        <option v-for="opt in options" :value="opt.value">{{ opt.label }}</option>
+        <option v-for="(opt,index) in options" :key="index" :value="opt.value">{{ opt.label }}</option>
       </select>
       <build-input style="width:20rem;" @search="changeVal" :placeholder="'支持关键字、英文代号查找'"></build-input>
     </header>
     <main>
       <div class="left_main" v-loading="isLoading">
-        <div class="family" v-for="letter in letterArr">
+        <div class="family" v-for="(letter,index) in letterArr" :key="index">
           <div class="family_title" :id="letter">{{letter}}</div>
           <div class="family_content" v-if="searchVal == ''">
             <ul class="family_list">
@@ -20,6 +20,7 @@
                 @click="familyActive(family.name,family.code)"
                 :class="active == family.name ? 'active' : ''"
                 v-for="(family,index) in allFamily"
+                :key="index"
                 v-if="family.capitalize === letter"
               >{{family.name}}-{{family.code}}</li>
             </ul>
@@ -31,6 +32,7 @@
                 @click="familyActive(family.name,family.code)"
                 :class="active == family.name ? 'active' : ''"
                 v-for="(family,index) in searchArr"
+                :key="index"
                 v-if="family.capitalize === letter"
               >{{family.name}}-{{family.code}}</li>
             </ul>
@@ -42,6 +44,7 @@
             <li @click="moveScroll()">↑</li>
             <li
               v-for="(character,index) in letterArr"
+              :key="index"
               @click="moveScroll(character)"
             >{{ character }}</li>
           </ul>
@@ -49,11 +52,11 @@
       </div>
       <div class="right_main" v-loading="rightLoading">
         <el-tabs v-if="labelKey.length && tabsFalg" tab-position="left" style="height: 100%;">
-          <el-tab-pane v-for="(item,index) in labelKey">
+          <el-tab-pane v-for="(item,index) in labelKey" :key="index">
             <span slot="label">{{item.FirstTag}}</span>
-            <div class="label_main" v-for="(tag,tagIndex) in item.details">
+            <div class="label_main" v-for="(tag,tagIndex) in item.details" :key="tagIndex">
               <p>{{tag.SecondTag}}</p>
-              <ul v-for="detail in tag.details">
+              <ul v-for="(detail,detailInd) in tag.details" :key="detailInd">
                 <el-checkbox
                   v-model="detail.Visible"
                   @change="boxChange(detail)"