liuzhihui лет назад: 3
Родитель
Сommit
55bc7448bd

+ 4 - 4
CallCenterWeb.UI/RMYY/src/views/equipmentManage/equipmentList/addOrEdit.vue

1
 <template>
1
 <template>
2
   <div>
2
   <div>
3
     <el-form ref="ruleForm" :rules="rules" :model="ruleForm" label-width="120px">
3
     <el-form ref="ruleForm" :rules="rules" :model="ruleForm" label-width="120px">
4
-      <el-form-item label="设备名称" prop="equipname">
5
-        <el-input v-model="ruleForm.equipname" type="text" placeholder="请输入设备名称" />
4
+      <el-form-item label="耗材名称" prop="equipname">
5
+        <el-input v-model="ruleForm.equipname" type="text" placeholder="请输入耗材名称" />
6
       </el-form-item>
6
       </el-form-item>
7
       <el-form-item label="规格型号" prop="equipnumber">
7
       <el-form-item label="规格型号" prop="equipnumber">
8
         <el-input v-model="ruleForm.equipnumber" type="text" placeholder="请输入规格型号" />
8
         <el-input v-model="ruleForm.equipnumber" type="text" placeholder="请输入规格型号" />
9
       </el-form-item>
9
       </el-form-item>
10
-      <el-form-item label="设备价格" prop="equipprice">
11
-        <el-input v-model="ruleForm.equipprice" style="width:80%" type="number" placeholder="请输入设备价格(元)" />元
10
+      <el-form-item label="耗材价格" prop="equipprice">
11
+        <el-input v-model="ruleForm.equipprice" style="width:80%" type="number" placeholder="请输入耗材价格(元)" />元
12
       </el-form-item>
12
       </el-form-item>
13
       <el-form-item label="是否有效">
13
       <el-form-item label="是否有效">
14
         <el-switch v-model="ruleForm.state" active-color="#13ce66" inactive-color="#ff4949" active-value="1"
14
         <el-switch v-model="ruleForm.state" active-color="#13ce66" inactive-color="#ff4949" active-value="1"

+ 6 - 6
CallCenterWeb.UI/RMYY/src/views/equipmentManage/equipmentList/index.vue

3
     <el-row :gutter="20" />
3
     <el-row :gutter="20" />
4
     <el-form :inline="true" :model="ruleForm" class="demo-form-inline">
4
     <el-form :inline="true" :model="ruleForm" class="demo-form-inline">
5
       <el-form-item>
5
       <el-form-item>
6
-        <el-input v-model="ruleForm.sbmc" clearable placeholder="请输入设备名称" size="medium" />
6
+        <el-input v-model="ruleForm.sbmc" clearable placeholder="请输入耗材名称" size="medium" />
7
       </el-form-item>
7
       </el-form-item>
8
       <el-form-item>
8
       <el-form-item>
9
         <el-button type="primary" size="medium" @click="btn_search_task">查询</el-button>
9
         <el-button type="primary" size="medium" @click="btn_search_task">查询</el-button>
16
     </el-form>
16
     </el-form>
17
     <el-table :data="dataLists" border highlight-current-row stripe>
17
     <el-table :data="dataLists" border highlight-current-row stripe>
18
       <el-table-column type="index" label="序号" align="center" width="100" />
18
       <el-table-column type="index" label="序号" align="center" width="100" />
19
-      <el-table-column prop="F_EquipName" label="设备名称" align="center" min-width />
19
+      <el-table-column prop="F_EquipName" label="耗材名称" align="center" min-width />
20
       <el-table-column prop="F_EquipNumber" label="规格型号" align="center" min-width />
20
       <el-table-column prop="F_EquipNumber" label="规格型号" align="center" min-width />
21
-      <el-table-column prop="F_EquipPrice" label="价格(元)" align="center" min-width />
21
+      <el-table-column prop="F_EquipPrice" label="耗材价格(元)" align="center" min-width />
22
       <el-table-column label="状态" align="center" min-width>
22
       <el-table-column label="状态" align="center" min-width>
23
         <template slot-scope="scope">
23
         <template slot-scope="scope">
24
           <span v-if="scope.row.F_State==1">有效</span>
24
           <span v-if="scope.row.F_State==1">有效</span>
143
             } // props
143
             } // props
144
           },
144
           },
145
           area: ['40%', '50%'],
145
           area: ['40%', '50%'],
146
-          title: '添加设备'
146
+          title: '添加耗材'
147
         })
147
         })
148
       },
148
       },
149
       handleEdit(row) {
149
       handleEdit(row) {
156
             } // props
156
             } // props
157
           },
157
           },
158
           area: ['40%', '50%'],
158
           area: ['40%', '50%'],
159
-          title: '编辑设备'
159
+          title: '编辑耗材'
160
         })
160
         })
161
       },
161
       },
162
       handleDelete(row) {
162
       handleDelete(row) {
163
-        this.$confirm('确定要删除此设备吗?', '提示', {
163
+        this.$confirm('确定要删除此耗材吗?', '提示', {
164
             confirmButtonText: '确定',
164
             confirmButtonText: '确定',
165
             cancelButtonText: '取消',
165
             cancelButtonText: '取消',
166
             type: 'warning'
166
             type: 'warning'

+ 3 - 3
CallCenterWeb.UI/RMYY/src/views/faultRepairManagement/repairList/index.vue

361
               :label="item.F_Name" />
361
               :label="item.F_Name" />
362
           </el-select>
362
           </el-select>
363
         </el-form-item>
363
         </el-form-item>
364
-        <el-form-item v-if="doneForm.type == '0'" label="是否涉及设备">
364
+        <el-form-item v-if="doneForm.type == '0'" label="是否涉及耗材">
365
           <el-radio-group v-model="doneForm.IsInvolvedEquip" style="margin-right: 15px" @change="handleType">
365
           <el-radio-group v-model="doneForm.IsInvolvedEquip" style="margin-right: 15px" @change="handleType">
366
             <el-radio label="0">否</el-radio>
366
             <el-radio label="0">否</el-radio>
367
             <el-radio label="1">是</el-radio>
367
             <el-radio label="1">是</el-radio>
368
           </el-radio-group>
368
           </el-radio-group>
369
-          <el-select v-if="doneForm.IsInvolvedEquip == '1'" filterable v-model="equilist" placeholder="请选择设备" size="medium"
369
+          <el-select v-if="doneForm.IsInvolvedEquip == '1'" filterable v-model="equilist" placeholder="请选择耗材" size="medium"
370
             multiple collapse-tags clearable style="width: 80%" @change="equiChange">
370
             multiple collapse-tags clearable style="width: 80%" @change="equiChange">
371
             <el-option v-for="(item, index) in equiArr" :key="index"
371
             <el-option v-for="(item, index) in equiArr" :key="index"
372
               :label="item.F_EquipName" :value="item.F_EquipID" />
372
               :label="item.F_EquipName" :value="item.F_EquipID" />
374
         </el-form-item>
374
         </el-form-item>
375
         <el-form-item v-if="doneForm.type == '0' && equilist.length > 0">
375
         <el-form-item v-if="doneForm.type == '0' && equilist.length > 0">
376
           <el-table :data="equipmodellist" border stripe style="width: 100%">
376
           <el-table :data="equipmodellist" border stripe style="width: 100%">
377
-            <el-table-column prop="F_EquipName" label="设备" />
377
+            <el-table-column prop="F_EquipName" label="耗材名称" />
378
             <el-table-column prop="F_EquipNumber" label="规格型号" />
378
             <el-table-column prop="F_EquipNumber" label="规格型号" />
379
             <el-table-column prop="F_EquipPrice" label="价格" />
379
             <el-table-column prop="F_EquipPrice" label="价格" />
380
             <el-table-column prop="F_EquipAmount" label="数量">
380
             <el-table-column prop="F_EquipAmount" label="数量">