1.备件申购，特殊申购时显示现有库存；2.维修故障下钻问题修改

.env.development

@@ -6,9 +6,9 @@ ENV = 'development'
 # 线上正式地址
 #  VUE_APP_BASE_API = 'http://eam.modernfarming.cn:8000/'
 # 白少后台本地
-VUE_APP_BASE_API = 'http://192.168.1.77:8082/'
+# VUE_APP_BASE_API = 'http://192.168.1.77:8082/'
 # 线上测试
-# VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
+VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
 # VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
  # VUE_APP_BASE_API = 'http://127.0.0.1:8082/'
 

src/views/custom/subscribe/index.vue

@@ -292,12 +292,12 @@
           </el-table-column>
           <el-table-column label="现有库存" prop="reportery" align="center" min-width="60">
             <template slot-scope="scope">
-              <span v-if="createTemp.providerId == ''">{{ scope.row.reportery }}</span>
+              <span v-if="createTemp.providerId == '' || parseFloat(createTemp.purchaseType) > 0">{{ scope.row.reportery }}</span>
             </template>
           </el-table-column>
           <el-table-column v-if="dialogStatus==='special'" label="价格" prop="price" align="center" min-width="60">
             <template slot-scope="scope">
-              <span v-if="createTemp.purchaseType == '1'">{{ scope.row.price }}</span>
+              <span v-if="createTemp.purchaseType == '1' || createTemp.purchaseType == '3'">{{ scope.row.price }}</span>
               <el-form v-else :model="scope.row" :rules="rules">
                 <el-form-item prop="price">
                   <el-input v-model="scope.row.price" style="margin-top:15px" />
@@ -1007,7 +1007,8 @@ export default {
     sparePartSearch(queryString, cb) {
       console.log('备件模糊查询输入值', queryString)
       if(this.dialogStatus==='special'){
-        if(this.createTemp.providerId !== ''){
+        if(this.createTemp.providerId !== '' && this.createTemp.purchaseType !== '3'){
+          console.log(1111, this.createTemp.purchaseType)
           this.requestSparePart.name = 'getPartsListSG'
           this.requestSparePart.parammaps['providerId'] = this.createTemp.providerId
         }else{
@@ -1101,11 +1102,13 @@ export default {
         }
         this.$forceUpdate()
       } else {
-        console.log(2222222222)
         if (this.listAdd.length > 0) {
           if (this.listAdd.find(obj => obj.partId == item.partId)) {
             this.$message({ type: 'warning', message: '此备件已存在，请重新选择备件' })
           } else {
+            if(this.dialogStatus==='special' && this.createTemp.purchaseType == '3'){
+              this.$set(item,'price','0')
+            }
             if (item.srcpath !== null && item.picpath !== null && item.srcpath !== undefined && item.picpath !== undefined) {
               this.$set(item, 'srcpath', process.env.VUE_APP_BASE_API + item.srcpath)
               this.$set(item, 'picpath', process.env.VUE_APP_BASE_API + item.picpath)
@@ -1118,6 +1121,9 @@ export default {
             this.listAdd.unshift(item)
           }
         } else {
+          if(this.dialogStatus==='special' && this.createTemp.purchaseType == '3'){
+            this.$set(item,'price','0')
+          }
           if (item.srcpath !== null && item.picpath !== null && item.srcpath !== undefined && item.picpath !== undefined) {
             this.$set(item, 'srcpath', process.env.VUE_APP_BASE_API + item.srcpath)
             this.$set(item, 'picpath', process.env.VUE_APP_BASE_API + item.picpath)

src/views/report/maintenanceFault/index.vue

@@ -375,6 +375,12 @@ export default {
       this.isPasture = true
       this.isType3 = false
       this.isTitle3 = false
+      GetDataByName( { name: 'getEqClassBengbu', offset: 0, pagecount: 0, returntype: 'Map', parammaps: {
+        'section': '3','pid':'' }}).then(response => {
+      
+        this.eqClassList3 = response.data.list
+      
+      })
     },
     goSecond() {
       console.log("goSecond")
@@ -547,6 +553,12 @@ export default {
       this.tableObj.getdataListParm.parammaps.eqClassPIdStr = row.eqId
       this.tableObj.getdataListParm.parammaps.eqClassId = ''
       this.get_table_data()
+      GetDataByName( { name: 'getEqClassBengbu', offset: 0, pagecount: 0, returntype: 'Map', parammaps: {
+        'section': '3','pid':row.eqId }}).then(response => {
+
+        this.eqClassList3 = response.data.list
+
+      })
     }
 
   }