拉取代码

http/api.js

@@ -370,3 +370,9 @@ export function api_inspectionFormValues(data){
   return post("/simple/data/fetchDataList/inspectionFormValues", data);
 }
 
+/**
+ * 常用耗材
+ */
+export function api_in_consumables(id){
+  return post(`/incident/commonlyUse/consumables/${id}`, {});
+}

manifest.json

@@ -62,8 +62,8 @@
         "devServer" : {
             "proxy" : {
                 "/service" : {
-                    "target" : "http://192.168.3.108", //请求的目标域名
-                    // "target" : "http://192.168.4.163", //宋程玉本地
+                    // "target" : "http://192.168.3.108", //请求的目标域名
+                    "target" : "http://192.168.4.163", //宋程玉本地
                     // "target" : "http://192.168.4.105", //程肖本地
                     "changeOrigin" : true, //是否跨域
                     "secure" : false

pages/consumableList/consumableList.vue

@@ -26,7 +26,8 @@
   import { ref, reactive} from 'vue'
   import NumberModal from '@/components/NumberModal.vue';
   import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
-  import { api_consumable, getFetchDataList, api_incidentDetail, api_addSummaryDoc, api_incidentCategoryConsumable } from "@/http/api.js"
+  import { api_consumable, getFetchDataList, api_incidentDetail, 
+	api_addSummaryDoc, api_incidentCategoryConsumable, api_in_consumables } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useLoginUserStore } from '@/stores/loginUser'
@@ -46,6 +47,7 @@
     hasMore: true,//是否有更多数据
     incidentId: undefined,//事件ID
     summaryId: undefined,//汇总单ID
+		categoryId: undefined,//故障现象ID
     incidentData: {},//事件对象
     keyWord: '',//搜索的关键词
     isNumber: false,//修改数量弹窗
@@ -139,6 +141,25 @@
     })
   }
   
+	// 获取常用耗材
+	function getInConsumables(){
+		uni.showLoading({
+		  title: "加载中",
+		  mask: true,
+		});
+		api_in_consumables(dataInfo.categoryId).then(res => {
+		  uni.hideLoading();
+		  if(res.status == 200){
+		    dataInfo.list = res.data || {};
+		  }else{
+		    uni.showToast({
+		      icon: 'none',
+		      title: res.msg || '请求数据失败！'
+		    });
+		  }
+		})
+	}
+	
   // 搜索
   const search = debounce(getList.bind(null, 0), 500);
   
@@ -193,6 +214,7 @@
     if(dataInfo.keyWord.trim() === ''){
       dataInfo.list = [];
       uni.stopPullDownRefresh();
+			getInConsumables();
       return;
     }
     
@@ -236,6 +258,7 @@
 						}
 					}else{
 				    dataInfo.hasMore = false;
+						getInConsumables();
 				  }
 				}else{
 				  uni.showToast({
@@ -260,13 +283,14 @@
 		  .then((res) => {
 				dataInfo.itsmZeroStock = res.list.find(i=>i.key=='itsmZeroStock')
 				dataInfo.itsmParentConsumable = res.list.find(i=>i.key=='itsmParentConsumable')
-				getList(0);
+				getInConsumables();
 		  });
 	}
 	
   onLoad((option) => {
     dataInfo.incidentId = option.incidentId;
     dataInfo.summaryId = option.summaryId;
+		dataInfo.categoryId = option.categoryId;
     getIncidentDetail();
   })
   

pages/handler/handler.vue

@@ -75,7 +75,7 @@
 
       <!-- 故障处理 -->
       <template v-if="dataInfo.tabActiveValue === 'doing' && !isInSummaryOrder">
-        <view class="form_item column" v-if="HandleData.simpleness != 1">
+        <view class="form_item column" v-if="HandleData.simpleness != 1 || (HandleData.simpleness==1 && HandleData.isSolution==1)">
           <view class="title title-width">
 						<text class="required newicon newicon-bitian"></text>
 						<view class="title-fl-sb">
@@ -257,7 +257,8 @@
 
 	// 是否简单处理
 	const HandleData = reactive({
-		simpleness:null
+		simpleness:null,
+		isSolution:null,
 	})
   // 处理图片
   const handlerImgRef = ref(null)
@@ -728,7 +729,7 @@
   // 添加耗材
   function addConsumable(){
     uni.navigateTo({
-      url: `/pages/consumableList/consumableList?incidentId=${dataInfo.incidentId}&summaryId=${dataInfo.summaryId}`
+      url: `/pages/consumableList/consumableList?incidentId=${dataInfo.incidentId}&summaryId=${dataInfo.summaryId}&categoryId=${dataInfo.category.id}`
     })
   }
 
@@ -978,6 +979,8 @@
 					SummaryData.value = res.list.find(i=>i.key=='itsmSummarySheet')
 				}
 				HandleData.simpleness = res.list.find(i=>i.key=='itsmSimpleHandle').value
+				
+				HandleData.isSolution = res.list.find(i=>i.key=='itsmWriteSolution').value
 			});
 	}