add

CallCenterWeb.UI/RMYY/src/components/workOrder/vehicleDispatch/addOrEdit.vue

@@ -81,42 +81,39 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row v-if="worktypeInfo!='bloodtransfer'">
           <el-col :span="12">
             <el-form-item label="联系人" prop="contact">
               <el-input v-model="ruleForm.contact" placeholder="请输入联系人" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <!-- <el-col :span="12">
-            <el-form-item label="联系人" prop="contact">
-              <el-input v-model="ruleForm.contact" placeholder="请输入联系人" />
-            </el-form-item>
-          </el-col> -->
-          <!-- <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="联系人电话" prop="contactnumber">
               <el-input
                 v-model="ruleForm.contactnumber"
                 placeholder="请输入联系人电话"
               />
             </el-form-item>
-          </el-col> -->
+          </el-col>
         </el-row>
         <el-row>
-          <!-- <el-col :span="12">
-            <el-form-item label="科室位置" prop="startplace">
-              <el-input
-                v-model="ruleForm.startplace"
-                placeholder="请输入科室位置"
-              />
-            </el-form-item>
-          </el-col> -->
           <el-col :span="12">
-            <el-form-item label="联系人电话" prop="contactnumber">
-              <el-input
-                v-model="ruleForm.contactnumber"
-                placeholder="请输入联系人电话"
-              />
+            <el-form-item label="出车地点" prop="dispatch">
+              <el-select
+                v-model="ruleForm.dispatch"
+                style="width: 100%"
+                clearable
+                placeholder="请选择出车地点"
+              >
+                <el-option
+                  v-for="(item, index) in yqarr"
+                  :key="index"
+                  :label="item.T_Woname"
+                  :value="item.T_Woname"
+                >
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -129,7 +126,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+         <!-- <el-col :span="12">
             <el-form-item label="出车地点" prop="dispatch">
               <el-select
                 v-model="ruleForm.dispatch"
@@ -146,7 +143,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="发车时间" prop="usertime">
               <el-date-picker
@@ -401,7 +398,8 @@ export default {
       this.worktypeInfo =
         this.$store.getters.workTypeMap[
           parseInt(this.orderTypeData.type2Arr[0])
-        ].tag;
+        ].tag || "";
+        console.log(this.worktypeInfo, "标识11");
       // this.ruleForm.F_Type2 = this.orderTypeData.F_Type2
       // this.ruleForm.identification = this.orderTypeData.identification
     },
@@ -541,6 +539,10 @@ export default {
         this.$message.error("填写工单内容");
         return;
       }
+      if(this.worktypeInfo == "bloodtransfer"){
+        this.ruleForm.contact = ""
+        this.ruleForm.contactnumber = ""
+      }
 
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {

CallCenterWeb.UI/RMYY/src/views/comDispatch/components/dispatchdetail.vue

@@ -406,7 +406,11 @@
             }
           } else {
             const res = response.data[0];
-            this.orderDetailData = res;
+            this.orderDetailData = res;
+            //处理人隐藏评价
+            if(window.localStorage.getItem("storageUsercode") == response.data[0].F_DealMan){
+              this.$refs.tabs.$children[0].$refs.tabs[2].style.display = "none";
+            }
             const imgs = [];
             const others = [];
             const fileUrls = [

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

@@ -155,24 +155,6 @@
                   文字评价：{{ evaluateData.F_Evaluator }}</el-col
                 >
               </div>
-             <!-- <el-table :data="evaluateData" border style="width: 100%">
-                <el-table-column
-                  prop="F_EvaluateUser"
-                  label="评价人"
-                  align="center"
-                />
-                <el-table-column
-                  prop="F_Evaluator"
-                  label="评价内容"
-                  align="center"
-                />
-                <el-table-column prop="F_Score" label="评分" align="center" />
-                <el-table-column
-                  prop="F_EvaluationTime"
-                  label="评价时间"
-                  align="center"
-                />
-              </el-table> -->
             </el-tab-pane>
           </el-tabs>
         </el-card>
@@ -280,6 +262,10 @@ export default {
           this.workOrderCirculationList = response.data;
         }
         if (num == 0) {
+          //处理人隐藏评价
+          if(window.localStorage.getItem("storageUsercode") == response.model.F_DriverCode){
+            this.$refs.tabs.$children[0].$refs.tabs[1].style.display = "none";
+          }
           const res = response.model;
           this.orderDetailData = res;
           if (

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

@@ -499,6 +499,10 @@ export default {
       };
       GetFaultRepairDetail(params).then((response) => {
         if (type == "1" && response.data[0]) {
+          //处理人隐藏评价
+          if(window.localStorage.getItem("storageUsercode") == response.data[0].F_Maintenancer){
+            this.$refs.tabs.$children[0].$refs.tabs[4].style.display = "none";
+          }
           this.tabData1 = response.data[0];
           this.tabData1.F_MaintenanceDept =
             this.$store.getters.deptmap[

CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/driverOrder/index.vue

@@ -98,6 +98,12 @@
       />
       <el-table-column
         :show-overflow-tooltip="true"
+        prop="F_CreateTime"
+        label="派单时间"
+        align="center"
+      />
+      <el-table-column
+        :show-overflow-tooltip="true"
         prop="F_CloseTime"
         label="完工时间"
         align="center"

CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/components/detail.vue

@@ -168,24 +168,6 @@
                   文字评价：{{ evaluateData.F_Evaluator }}</el-col
                 >
               </div>
-              <!-- <el-table :data="evaluateData" border style="width: 100%">
-                <el-table-column
-                  prop="F_EvaluateUser"
-                  label="评价人"
-                  align="center"
-                />
-                <el-table-column
-                  prop="F_Evaluator"
-                  label="评价内容"
-                  align="center"
-                />
-                <el-table-column prop="F_Score" label="评分" align="center" />
-                <el-table-column
-                  prop="F_EvaluationTime"
-                  label="评价时间"
-                  align="center"
-                />
-              </el-table> -->
             </el-tab-pane>
           </el-tabs>
         </el-card>
@@ -264,6 +246,10 @@ export default {
       };
       getModelDetail(params).then((response) => {
         if (num == 0) {
+          //处理人隐藏评价
+          if(window.localStorage.getItem("storageUsercode") == response.model.F_DriverCode){
+            this.$refs.tabs.$children[0].$refs.tabs[1].style.display = "none";
+          }
           this.orderDetailData = response.model;
           this.orderDetailData.F_TypeName2 =
             this.$store.getters.workTypeMap[

CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/index.vue

@@ -128,6 +128,12 @@
       />
       <el-table-column
         :show-overflow-tooltip="true"
+        prop="F_AssignTime"
+        label="派单时间"
+        align="center"
+      />
+      <el-table-column
+        :show-overflow-tooltip="true"
         prop="StateName"
         label="工单状态"
         align="center"

CallCenterWeb.UI/RMYYAPP/pages/myTask/comDispatch/addComDispatch/addComDispatch.vue

@@ -8,8 +8,8 @@
 					<order-select :orderType="valiFormData.WorkOrderCategory" @post-select-data="postSelectData"
 						:typeid="2000" :readonly="readonly"></order-select>
 				</uni-forms-item>
-				<uni-forms-item label="申请部门" required name="ApplicationDept">
-					<uni-data-picker placeholder="请选择申请部门" :localdata="deptDataTree"
+				<uni-forms-item label="申请科室" required name="ApplicationDept">
+					<uni-data-picker :readonly="true" placeholder="请选择申请科室" :localdata="deptDataTree"
 						v-model="valiFormData.ApplicationDept" @nodeclick="deptNodeclick" :showSearch="showSearch" @popupclosed="popupclosedDept" @searchTrue="departSearchTrue">
 					</uni-data-picker>
 				</uni-forms-item>

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

@@ -15,7 +15,7 @@
 					<uni-easyinput type="textarea" v-model="valiFormData.Content" placeholder="请输入报修内容" />
 				</uni-forms-item>
 				<uni-forms-item label="报修科室" required name="ApplicationDept">
-					<uni-data-picker :showSearch="showSearch" placeholder="请选择报修科室" :localdata="deptDataTree"
+					<uni-data-picker :readonly="true" :showSearch="showSearch" placeholder="请选择报修科室" :localdata="deptDataTree"
 						v-model="valiFormData.ApplicationDept" @nodeclick="deptNodeclick" @popupclosed="popupclosedDept" @searchTrue="departSearchTrue">
 					</uni-data-picker>
 				</uni-forms-item>

CallCenterWeb.UI/RMYYAPP/pages/myTask/vehicleSchedulList/applicantsList/addVehicle/addVehicle.vue

@@ -7,9 +7,8 @@
 				<uni-forms-item label="工单类别" required name="WorkOrderCategory">
 					<order-select :orderType="valiFormData.WorkOrderCategory" @post-select-data="postSelectData" :typeid="4000" :readonly="detpReadonly"></order-select>
 				</uni-forms-item>
-				<uni-forms-item label="申请科室" required name="detpid">
-					
-					<uni-data-picker placeholder="请选择科室" :showSearch= "showSearch" v-if="!detpReadonly" :readonly="detpReadonly" :localdata="deptDataTree" v-model="valiFormData.detpid" @nodeclick="deptNodeclick" @popupclosed="popupclosedDept" @searchTrue="departSearchTrue">
+				<uni-forms-item label="申请科室" required name="detpid">				
+					<uni-data-picker placeholder="请选择科室" :showSearch= "showSearch" v-if="!detpReadonly" :readonly="true" :localdata="deptDataTree" v-model="valiFormData.detpid" @nodeclick="deptNodeclick" @popupclosed="popupclosedDept" @searchTrue="departSearchTrue">
 					</uni-data-picker>
 					<uni-easyinput disabled v-model="valiFormData.F_ProposerDeptName" v-if="detpReadonly" />
 				</uni-forms-item>
@@ -25,10 +24,10 @@
 				<uni-forms-item label="申请人电话" required name="Phone">
 					<uni-easyinput v-model="valiFormData.Phone" :disabled="detpReadonly" placeholder="请输入联系电话" />
 				</uni-forms-item>
-				<uni-forms-item label="联系人" required name="contact">
+				<uni-forms-item v-if="worktypeInfo!='bloodtransfer'" label="联系人" required name="contact">
 					<uni-easyinput v-model="valiFormData.contact" placeholder="请输入联系人" />
 				</uni-forms-item>
-				<uni-forms-item label="联系电话" required name="contactnumber">
+				<uni-forms-item v-if="worktypeInfo!='bloodtransfer'" label="联系电话" required name="contactnumber">
 					<uni-easyinput v-model="valiFormData.contactnumber" placeholder="请输入联系电话" />
 				</uni-forms-item>
 				<uni-forms-item label="车辆要求" required name="cartype">
@@ -82,6 +81,7 @@
 		},
 		data() {
 			return {
+				worktypeInfo:"",//工单标识
 				getFontSizeValue:'1rem',
 				showSearch: true,
 				readonly: false,
@@ -316,7 +316,8 @@
 			postSelectData(e, id, type, identification, text){
 				this.valiFormData.WorkOrderCategory = e
 				this.typeName = text
-				console.log(text, 'e')
+				this.worktypeInfo = identification
+				console.log(identification,text, 'e')
 			},
 			//申请人
 			changeApplicant(res) {
@@ -339,6 +340,10 @@
 				if(this.valiFormData.usertime.length==11){
 					this.valiFormData.usertime = this.valiFormData.usertime+"00:00:00"
 				}
+				if(this.worktypeInfo=='bloodtransfer'){
+					this.valiFormData.contact = ""
+					this.valiFormData.contactnumber = ""
+				}
 				this.disabledButton = false
 				this.$refs[ref].validate().then(res => {
 					if(this.valiFormData.birth ===0&&this.valiFormData.content ===""){