Browse Source

耗材列表

seimin 10 months ago
parent
commit
9f8c4d65c5

+ 5 - 2
components/NumberModal.vue

@@ -6,10 +6,13 @@
6 6
     <view class="container_form">
7 7
       <view class="content">
8 8
         <template v-if="selectType === 'editConsumable' || selectType === 'addConsumable'">
9
-        {{ selectData.consumableName }}({{ selectData.consumableBrandModel }}) {{ selectData.consumableEndPrice }}元
9
+          {{ selectData.consumableName }}
10
+          <template v-if="selectData.consumableBrandModel">({{ selectData.consumableBrandModel }})</template>
11
+          {{ selectData.consumableEndPrice }}元
10 12
         </template>
11 13
         <template v-else-if="selectType === 'editWorkHourManagement'">
12
-        {{ selectData.workName }}{{ selectData.wage }}元
14
+          {{ selectData.workName }}
15
+          {{ selectData.wage }}元
13 16
         </template>
14 17
       </view>
15 18
       

+ 1 - 1
manifest.json

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

+ 3 - 0
pages/consumableList/consumableList.vue

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

+ 2 - 2
pages/handler/handler.vue

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

+ 2 - 2
pages/incidentDetail/incidentDetail.vue

@@ -120,11 +120,11 @@
120 120
         </view>
121 121
         <view class="summaryItem_bodyItem" v-for="item in dataInfo.summaryObj.consumableList" :key="item.id">
122 122
           <view class="summaryItem_bodyItem_top">
123
-            <text class="name ellipsis">{{ item.consumableName }}({{ item.consumableBrandModel }})</text>
123
+            <text class="name ellipsis">{{ item.consumableName }}<template v-if="item.consumableBrandModel">({{ item.consumableBrandModel }})</template></text>
124 124
             <text class="value">{{ item.consumableEndPrice }}元</text>
125 125
           </view>
126 126
           <view class="summaryItem_bodyItem_bottom">
127
-            <text class="name">x{{ item.consumablesNum }}</text>
127
+            <text class="name">x{{ item.consumablesNum }}{{ item.consumablesUnit }}</text>
128 128
             <text class="value">总价{{item.consumablesNum * item.consumableEndPrice}}元</text>
129 129
           </view>
130 130
         </view>