耗材列表

components/NumberModal.vue

@@ -6,10 +6,13 @@
     <view class="container_form">
       <view class="content">
         <template v-if="selectType === 'editConsumable' || selectType === 'addConsumable'">
-        {{ selectData.consumableName }}({{ selectData.consumableBrandModel }}) {{ selectData.consumableEndPrice }}元
+          {{ selectData.consumableName }}
+          <template v-if="selectData.consumableBrandModel">({{ selectData.consumableBrandModel }})</template>
+          {{ selectData.consumableEndPrice }}元
         </template>
         <template v-else-if="selectType === 'editWorkHourManagement'">
-        {{ selectData.workName }}{{ selectData.wage }}元
+          {{ selectData.workName }}
+          {{ selectData.wage }}元
         </template>
       </view>
       

manifest.json

@@ -62,7 +62,7 @@
         "devServer" : {
             "proxy" : {
                 "/service" : {
-                    "target" : "http://192.168.3.111", //请求的目标域名
+                    "target" : "http://192.168.4.163", //请求的目标域名
                     "changeOrigin" : true, //是否跨域
                     "secure" : false
                 }

pages/consumableList/consumableList.vue

@@ -6,6 +6,8 @@
     <view class="body" v-if="dataInfo.list.length">
       <view class="body_item ellipsis" v-for="data in dataInfo.list" :key="data.id" @click="numberClick(data, 'addConsumable')">
         {{data.name}}
+        <template v-if="data.brandModel">({{data.brandModel}})</template>
+        <template v-if="data.unit">({{data.unit}})</template>
       </view>
     </view>
     <view class="zanwu" v-else>
@@ -57,6 +59,7 @@
     dataInfo.isNumber = true;
     dataInfo.selectData = {
       consumableBrandModel: data.brandModel,
+      consumableUnit: data.unit,
       consumableEndPrice: data.endPrice,
       consumableId: data.id,
       consumableName: data.name,

pages/handler/handler.vue

@@ -16,11 +16,11 @@
           <view class="summaryItem_body" v-if="dataInfo.summaryObj.consumableList.length">
             <view class="summaryItem_bodyItem" v-for="item in dataInfo.summaryObj.consumableList" :key="item.id" @click="numberClick(item, 'editConsumable')">
               <view class="summaryItem_bodyItem_top">
-                <text class="name ellipsis">{{ item.consumableName }}（{{ item.consumableBrandModel }}）</text>
+                <text class="name ellipsis">{{ item.consumableName }}<template v-if="item.consumableBrandModel">({{ item.consumableBrandModel }})</template></text>
                 <text class="value">{{ item.consumableEndPrice }}元</text>
               </view>
               <view class="summaryItem_bodyItem_bottom">
-                <text class="name">x{{ item.consumablesNum }}</text>
+                <text class="name">x{{ item.consumablesNum }}{{ item.consumablesUnit }}</text>
                 <text class="value">总价{{item.consumablesNum * item.consumableEndPrice}}元</text>
               </view>
             </view>

pages/incidentDetail/incidentDetail.vue

@@ -120,11 +120,11 @@
         </view>
         <view class="summaryItem_bodyItem" v-for="item in dataInfo.summaryObj.consumableList" :key="item.id">
           <view class="summaryItem_bodyItem_top">
-            <text class="name ellipsis">{{ item.consumableName }}（{{ item.consumableBrandModel }}）</text>
+            <text class="name ellipsis">{{ item.consumableName }}<template v-if="item.consumableBrandModel">({{ item.consumableBrandModel }})</template></text>
             <text class="value">{{ item.consumableEndPrice }}元</text>
           </view>
           <view class="summaryItem_bodyItem_bottom">
-            <text class="name">x{{ item.consumablesNum }}</text>
+            <text class="name">x{{ item.consumablesNum }}{{ item.consumablesUnit }}</text>
             <text class="value">总价{{item.consumablesNum * item.consumableEndPrice}}元</text>
           </view>
         </view>