Merge branch 'newdevelop' into debelop

CallCenterWeb.UI/RMYY/src/components/button/orderList.vue

@@ -142,6 +142,7 @@
     <el-dialog :visible.sync="dialogStatus.dialog_haocai" title="确认耗材">
       <el-table :data="haocaiarr" border stripe>
         <el-table-column prop="F_EquipName" label="耗材名称" align="center" />
+        <el-table-column prop="F_EquipNumber" label="规格型号" align="center" />
         <el-table-column prop="F_EquipPrice" label="耗材价格(元)" align="center" />
         <el-table-column prop="F_EquipAmount" label="耗材数量" align="center" />
       </el-table>

CallCenterWeb.UI/RMYY/src/components/workOrder/information/addOrEditInfOrder.vue

@@ -420,7 +420,7 @@
           this.zppername = '表扬人'
         }
         if (this.worktypeInfo3 === 'ywzx_jy' || this.worktypeInfo3 === 'ywzx_ts' || this.worktypeInfo3 === 'ywzx_by' ||
-          this.worktypeInfo3 === 'ywzx_jtyy') {
+          this.worktypeInfo3 === 'ywzx_jtyy' || this.worktypeInfo3 === 'ywzx_zjyy' || this.worktypeInfo3 === 'ywzx_ysfw') {
           this.ruleForm.opt = '3'
         }
       }
@@ -513,6 +513,15 @@
             this.repairman1 = res.rows
           })
         }
+        // if(this.worktypeInfo3 == 'ywzx_zjyy'){
+        //   this.ruleForm.clid = '3857'
+        // }
+        // if(this.worktypeInfo3 == 'ywzx_ysfw'){
+        //   this.ruleForm.clid = '0018'
+        // }
+        // if(this.worktypeInfo3 == 'ywzx_ts' || this.worktypeInfo3 == 'ywzx_jy' || this.worktypeInfo3 == 'ywzx_by'){
+        //   this.ruleForm.clid = '2005'
+        // }
       },
       changeName(id) {
         const twoTypeInfo = this.$store.getters.workTypeMap[parseInt(id)]

CallCenterWeb.UI/RMYY/src/components/workOrder/repairbase/addRepairbase.vue

@@ -37,13 +37,13 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="worktypeInfo ==='gzbx_shebei'">
+       <!-- <el-row v-if="worktypeInfo ==='gzbx_shebei'">
           <el-col :span="24">
             <el-form-item label="设备资产编码" prop="F_DeviceEncode">
               <el-input v-model="ruleForm.F_DeviceEncode" placeholder="请输入设备资产编码"/>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row>
           <el-col :span="24">
             <el-form-item label="报修内容" prop="repairCenter">
@@ -228,9 +228,9 @@
             trigger: 'change'
           }],
           repairCenter: [{
-            // required: true,
-            // message: '请输入报修内容',
-            // trigger: 'blur'
+            required: true,
+            message: '请输入报修内容',
+            trigger: 'blur'
           }],
           F_DeviceEncode: [{
             required: true,

CallCenterWeb.UI/RMYY/src/views/faultRepairManagement/repairList/index.vue

@@ -369,7 +369,7 @@
           <el-select v-if="doneForm.IsInvolvedEquip == '1'" filterable v-model="equilist" placeholder="请选择耗材" size="medium"
             multiple collapse-tags clearable style="width: 80%" @change="equiChange">
             <el-option v-for="(item, index) in equiArr" :key="index"
-              :label="item.F_EquipName" :value="item.F_EquipID" />
+              :label="item.F_EquipName+'('+item.F_EquipNumber+')'" :value="item.F_EquipID" />
           </el-select>
         </el-form-item>
         <el-form-item v-if="doneForm.type == '0' && equilist.length > 0">
@@ -889,7 +889,12 @@
           if (valid) {
             new Promise((resolve) => {
               if (this.doneForm.File === '') {
-                this.doneForm.File = ''
+                // this.doneForm.File = ''
+                this.$message({
+                  type:'warning',
+                   message: '请上传附件!'
+                })
+                return;
               } else {
                 this.doneForm.File = this.doneForm.File.slice(
                   0,this.doneForm.File.length - 1

CallCenterWeb.UI/RMYY/src/views/orderManage/components/orderDetail.vue

@@ -65,11 +65,11 @@
               </tr>
               <tr>
                 <th>紧急情况:</th>
-                <td colspan="3">
+                <td colspan="5">
                   {{ orderDetailData.F_EmergencyTypes || "-" }}
                 </td>
-                <th>设备资产编码:</th>
-                <td>{{ orderDetailData.F_DeviceEncode || "-" }}</td>
+                <!-- <th>设备资产编码:</th>
+                <td>{{ orderDetailData.F_DeviceEncode || "-" }}</td> -->
               </tr>
               <tr>
                 <th>工单内容:</th>
@@ -153,7 +153,7 @@
                       :key="index"
                     >
                       <th>耗材名称</th>
-                      <td>{{ item.F_EquipName }}</td>
+                      <td>{{ item.F_EquipName }}({{ item.F_EquipNumber }})</td>
                       <th>耗材价格(元)</th>
                       <td>{{ item.F_EquipPrice }}</td>
                       <th>耗材数量</th>

CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/addRepair/addRepair.vue

@@ -7,10 +7,10 @@
 				<uni-forms-item label="工单类别" required name="WorkOrderCategory">
 					<order-select :orderType="valiFormData.WorkOrderCategory" @post-select-data="postSelectData" :typeid="3000"></order-select>
 				</uni-forms-item> 
-				<uni-forms-item label="设备资产编码" required  name="epCode" v-show="orderInf == 'gzbx_shebei'">
+				<!-- <uni-forms-item label="设备资产编码" required  name="epCode" v-show="orderInf == 'gzbx_shebei'">
 					<uni-easyinput v-model="valiFormData.epCode" placeholder="请输入设备资产编码" />
-				</uni-forms-item>
-				<uni-forms-item label="报修内容" name="Content">
+				</uni-forms-item> -->
+				<uni-forms-item label="报修内容" required name="Content">
 					<uni-easyinput type="textarea" v-model="valiFormData.Content" placeholder="请输入报修内容" />
 				</uni-forms-item>
 				<uni-forms-item label="报修科室" required name="ApplicationDept">
@@ -128,12 +128,12 @@
 							errorMessage: '请选择工单类别'
 						}]
 					},
-					// Content: {
-					// 	rules: [{
-					// 		required: true,
-					// 		errorMessage: '请输入报修内容'
-					// 	}]
-					// },
+					Content: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入报修内容'
+						}]
+					},
 					ApplicationDept: {
 						rules: [{
 							required: true,
@@ -296,10 +296,10 @@
 				if(this.clickImgState == 1) {
 					this.valiFormData.File = this.$mHelper.getImgString(this.imgIdList)
 				}
-				if(this.orderInf == 'gzbx_shebei' && !this.valiFormData.epCode) {
-					this.$mHelper.toast('请输入设备资产编码')
-					return
-				}
+				// if(this.orderInf == 'gzbx_shebei' && !this.valiFormData.epCode) {
+				// 	this.$mHelper.toast('请输入设备资产编码')
+				// 	return
+				// }
 				console.log(this.valiFormData.ApplicationDept.length)
 				
 				this.$refs[ref].validate().then(res => {