2.11

CallCenterWeb.UI/RMYY/src/api/comDispatch/addOrEditDispatch.js

@@ -104,6 +104,14 @@ export function postDispatchDealWorkOrder(params) {
     data: params
   })
 }
+// 送达的编辑
+export function postDispatchDealEditWorkOrder(params) {
+  return request({
+    url: 'Scheduling/UpdateDealWorkOrder',
+    method: 'post',
+    data: params
+  })
+}
 // 收取标本
 export function postCollectSpecimens(params) {
   return request({

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

@@ -689,14 +689,6 @@
       >
         <el-table-column prop="F_DicName" label="物品" align="center" />
         <el-table-column prop="F_Number" label="数量" align="center" />
-        <!-- <el-table-column prop="" label="实收数量" align="center">
-          <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.F_PaidInQuantity"
-              placeholder="请输入数量"
-            ></el-input>
-          </template>
-        </el-table-column> -->
       </el-table>
       <el-form
         ref="dealWorkForm"
@@ -704,26 +696,20 @@
         :rules="rules"
         label-width="100px"
       >
-        <!-- <el-form-item label="接收人" v-if="bbtags.indexOf('急查标本') >= 0">
-          <el-input
-            v-model="dealWorkForm.recipient"
-            placeholder="请输入接收人工号"
-          ></el-input>
-        </el-form-item> -->
         <el-form-item label="是否异常" v-if="bbtags.indexOf('急查标本') >= 0">
           <el-radio-group v-model="dealWorkForm.isabnormal">
             <el-radio label="0">否</el-radio>
             <el-radio label="1">是</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-row v-if="dealWorkForm.isabnormal === '1'">
+        <el-row v-if="dealWorkForm.isabnormal === '1' && bbtags.indexOf('急查标本') >= 0">
           <el-col>
             <el-form-item label="标本信息" required>
               <el-button icon="el-icon-plus" @click="addItem()">添加</el-button>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="dealWorkForm.isabnormal === '1'">
+        <el-row v-if="dealWorkForm.isabnormal === '1' && bbtags.indexOf('急查标本') >= 0">
           <el-row v-for="(item, index) in dispatchhaocaiarrError" :key="index">
             <el-col :span="7">
               <el-form-item prop="devname">
@@ -732,6 +718,7 @@
                   :options="bborderData"
                   :props="TagProps"
                   clearable
+                  filterable
                   placeholder="请选择标本"
                   @change="(devname) => handleChange(devname, index)"
                 ></el-cascader>
@@ -794,6 +781,109 @@
         >
       </div>
     </el-dialog>
+    <!-- 送达的编辑 -->
+    <el-dialog :visible.sync="dialogStatus.dialog_schEdit" title="编辑">
+      <el-table
+        :data="dispatchhaocaiarr"
+        border
+        stripe
+        v-if="bbtags.indexOf('急查标本') >= 0"
+      >
+        <el-table-column prop="F_DicName" label="物品" align="center" />
+        <el-table-column prop="F_Number" label="数量" align="center" />
+      </el-table>
+      <el-form
+        ref="dealEditWorkForm"
+        :model="dealEditWorkForm"
+        :rules="rules"
+        label-width="100px"
+      >
+        <el-form-item label="是否异常" v-if="bbtags.indexOf('急查标本') >= 0">
+          <el-radio-group v-model="dealEditWorkForm.isabnormal">
+            <el-radio label="0">否</el-radio>
+            <el-radio label="1">是</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-row v-if="dealEditWorkForm.isabnormal === '1'&& bbtags.indexOf('急查标本') >= 0">
+          <el-col>
+            <el-form-item label="标本信息" required>
+              <el-button icon="el-icon-plus" @click="addItemEdit()">添加</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="dealEditWorkForm.isabnormal === '1' && bbtags.indexOf('急查标本') >= 0">
+          <el-row v-for="(item, index) in dispatchhaocaiarrEdit" :key="index">
+            <el-col :span="7">
+              <el-form-item>
+                <el-cascader
+                  v-model="item.F_DicId"
+                  ref="cascaderbbedit"
+                  :options="bborderData"
+                  :props="TagProps"
+                  clearable
+                  filterable
+                  placeholder="请选择标本"
+                  @change="(F_DicId) => handleChangeEdit(F_DicId, index)"
+                ></el-cascader>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item prop="num">
+                <el-input-number
+                  v-model="item.F_Number"
+                  :min="1"
+                  size="medium"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="11">
+              <el-form-item prop="num">
+                <el-input
+                  style="width: 180px"
+                  v-model="item.F_ReceiveUser"
+                  placeholder="科室交接人"
+                ></el-input>
+                <el-button
+                  type="primary"
+                  icon="el-icon-close"
+                  circle
+                  @click="removeItemEdit(index)"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-row>
+        <el-form-item label="附件" v-if="bbtags.indexOf('急查标本') < 0">
+          <el-upload
+            :headers="headers"
+            :on-remove="handle_removeEdit"
+            :on-success="handle_successEdit"
+            :file-list="dealEditWorkFormFile"
+            :action="imgUrl"
+            list-type="picture-card"
+          >
+            <i class="el-icon-plus" />
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="说明">
+          <el-input
+            :autosize="{ minRows: 4, maxRows: 8 }"
+            v-model="dealEditWorkForm.remark"
+            show-word-limit
+            maxlength="100"
+            type="textarea"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogStatus.dialog_schEdit = false"
+          >取 消</el-button
+        >
+        <el-button type="primary" @click="submitForm('dealEditWorkForm')"
+          >确 定</el-button
+        >
+      </div>
+    </el-dialog>
     <!-- 综合调度收取标本 -->
     <el-dialog
       :visible.sync="dialogStatus.dialog_dispatch_shouqubiaoben"
@@ -860,6 +950,43 @@
         :rules="rules"
         label-width="100px"
       >
+        <el-form-item label="服务态度" prop="Attitude">
+          <el-rate
+            v-model="carEvaluteForm.Attitude"
+            :texts="evaluateText"
+            show-text
+          />
+        </el-form-item>
+        <el-form-item label="服务质量" prop="Quality">
+          <el-rate
+            v-model="carEvaluteForm.Quality"
+            :texts="evaluateText"
+            show-text
+          />
+        </el-form-item>
+        <el-form-item label="完成时效" prop="Efficiency">
+          <el-rate
+            v-model="carEvaluteForm.Efficiency"
+            :texts="evaluateText"
+            show-text
+          />
+        </el-form-item>
+        <el-form-item label="文字评价" prop="Evaluation">
+          <el-input
+            :autosize="{ minRows: 4, maxRows: 8 }"
+            v-model="carEvaluteForm.Evaluation"
+            show-word-limit
+            maxlength="100"
+            type="textarea"
+          />
+        </el-form-item>
+      </el-form>
+      <!-- <el-form
+        ref="carEvaluteForm"
+        :model="carEvaluteForm"
+        :rules="rules"
+        label-width="100px"
+      >
         <el-form-item label="评价内容">
           <el-input
             :autosize="{ minRows: 4, maxRows: 8 }"
@@ -876,7 +1003,7 @@
             show-text
           />
         </el-form-item>
-      </el-form>
+      </el-form> -->
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_cldu_pingjia = false"
           >取 消</el-button
@@ -1101,6 +1228,7 @@ import {
   postDispatchCheckWorkOrder,
   postDispatchBackWorkOrder,
   postDispatchDealWorkOrder,
+  postDispatchDealEditWorkOrder,
   postCollectSpecimens,
   postDelDispatchWorkOrder,
   postwithdrawDispatchWorkOrder,
@@ -1146,12 +1274,20 @@ export default {
           F_ReceiveUser: "",
         },
       ],
+      dispatchhaocaiarrEdit:[
+        {
+          F_DicId: '',
+          F_Number: 1,
+          F_ReceiveUser: "",
+        },
+      ],
       reason1: "",
       reason2: "",
       reason3: "",
       reason4: "",
       reasonarr1: [],
       dialogStatus: {
+        dialog_schEdit:false,
         dialog_dispatch_zhuanpai: false,
         dialog_zhdd_zhipai: false,
         dialog_zhdd_tuihui: false,
@@ -1270,7 +1406,10 @@ export default {
       },
       carEvaluteForm: {
         Evaluation: "",
-        score: 0,
+        Attitude: 0,
+        Quality: 0,
+        Efficiency: 0,
+        // score: 0,
       },
       evaluateForm: {
         Attitude: 0,
@@ -1353,6 +1492,12 @@ export default {
         // recipient: "",
         isabnormal: "0",
       },
+      dealEditWorkForm:{
+        file: "",
+        remark: "",
+        // recipient: "",
+        isabnormal: "0",
+      },
       collectForm: {
         jcnum: "0",
         fjcnum: "0",
@@ -1375,6 +1520,7 @@ export default {
       imgUrl:
         this.$store.getters.serverConfig.BASE_API + "FaultRepair/UploadFile",
       dealWorkFormFile: [],
+      dealEditWorkFormFile:[],
       collectFormFile: [],
       rules: {
         file: [
@@ -1473,6 +1619,14 @@ export default {
       };
       this.dispatchhaocaiarrError.push(params);
     },
+    addItemEdit(){
+      const params = {
+        F_DicId: "",
+        F_Number: 1,
+        F_ReceiveUser: "",
+      };
+      this.dispatchhaocaiarrEdit.push(params);
+    },
     getDepUsers() {
       const deptid = this.$store.getters.teamId;
       return new Promise((resolve) => {
@@ -1495,11 +1649,20 @@ export default {
       console.log(index);
       this.dispatchhaocaiarrError.splice(index, 1);
     },
+    removeItemEdit(index) {
+      console.log(index);
+      this.dispatchhaocaiarrEdit.splice(index, 1);
+    },
     handleChange(data, index) {
       const obj = this.$refs["cascaderbb"][index].getCheckedNodes();
       this.dispatchhaocaiarrError[index].F_DicId = data;
       this.dispatchhaocaiarrError[index].F_DicName = obj[0].data.text;
     },
+    handleChangeEdit(data, index) {
+      const obj = this.$refs["cascaderbbedit"][index].getCheckedNodes();
+      this.dispatchhaocaiarrEdit[index].F_DicId = data;
+      this.dispatchhaocaiarrEdit[index].F_DicName = obj[0].data.text;
+    },
     handleChange1(data) {
       this.returnWorkForm.key = data.split(",")[0];
       this.returnWorkForm.value = data.split(",")[1];
@@ -1518,12 +1681,37 @@ export default {
     },
     handle_success(res) {
       this.dealWorkForm.file += res.data[0].F_FileId + ",";
-      this.$refs.dealWorkForm.clearValidate("file");
+      // this.$refs.dealEditWorkForm.clearValidate("file");
+    },
+    handle_successEdit(res) {
+      this.dealEditWorkForm.file += res.data[0].F_FileId + ",";
     },
     handle_remove(res) {
       const str = res.response.data[0].F_FileId + ",";
       this.dealWorkForm.file = this.dealWorkForm.file.replace(str, "");
     },
+    handle_removeEdit(res) {
+      var oldstr = "";
+      var str = "";
+      if (res.F_FileId) {
+        oldstr = res.F_FileId + ",";
+      }
+      if (res.response) {
+        str = res.response.data[0].F_FileId + ",";
+      }
+      if (oldstr) {
+        this.dealEditWorkForm.file = this.dealEditWorkForm.file.replace(
+          oldstr,
+          ""
+        );
+      }
+      if (str) {
+        this.dealEditWorkForm.file = this.dealEditWorkForm.file.replace(
+          str,
+          ""
+        );
+      }
+    },
     handle_successcol(res) {
       this.collectForm.file += res.data[0].F_FileId + ",";
     },
@@ -1539,9 +1727,19 @@ export default {
       GetFaultRepairDetail(params).then((res) => {
         this.haocaiarr = res.data[0].Equips;
         this.FileUrl = res.data[0].FileUrl;
-        // this.PictureUrl = res.data[0].PictureUrl
       });
     },
+    getDispatchHaocaiEdit(){
+      const params = {
+        WorkOrderCode: this.wocode,
+        type: 1
+      };
+      GetOrderDetail(params).then(res=>{
+        if(res.data.length>0&&res.data[0].F_OperationType==9){
+          this.dealEditWorkForm.remark = res.data[0].F_LogContent.slice(res.data[0].F_LogContent.indexOf(',')+1,res.data[0].F_LogContent.length)
+        }
+      })
+    },
     getDispatchHaocai() {
       const params = {
         WorkOrderCode: this.wocode,
@@ -1553,14 +1751,40 @@ export default {
             parseInt(res.data[0].F_WorkOrderCategory)
           ].text;
         // console.log(this.bbtags)
-        this.dispatchhaocaiarr = res.data[0].PSInfo;
-        for (var i = 0; i < res.data[0].PSInfo.length; i++) {
-          res.data[0].PSInfo[i].F_DicName =
-            this.$store.getters.bbxxTypeMap[
-              parseInt(res.data[0].PSInfo[i].F_DicId)
-            ].text;
+        this.dispatchhaocaiarr = res.data[0].PSInfo || [];
+        if(res.data[0].F_IsAbnormal){
+          this.dealEditWorkForm.isabnormal = res.data[0].F_IsAbnormal.toString()
+        }
+        if(this.bbtags.indexOf('急查标本')>=0){
+          for (var i = 0; i < res.data[0].PSInfo.length; i++) {
+            res.data[0].PSInfo[i].F_DicName =
+              this.$store.getters.bbxxTypeMap[
+                parseInt(res.data[0].PSInfo[i].F_DicId)
+              ].text;
+          }
+        }
+        const sdarr =  []
+        for (var i = 0; i < res.data[0].SDInfo.length; i++) {
+          sdarr.push({
+            F_DicId: res.data[0].SDInfo[i].F_DicId,
+            F_DicName: res.data[0].SDInfo[i].F_DicName,
+            F_Number: res.data[0].SDInfo[i].F_Number,
+            F_ReceiveUser:res.data[0].SDInfo[i].F_ReceiveUser
+          })
+        }
+        this.dispatchhaocaiarrEdit = sdarr
+        this.dealEditWorkFormFile = []
+        this.dealEditWorkForm.file = "";
+        if (res.data[0].DealFileUrl) {
+          for (var i = 0; i < res.data[0].DealFileUrl.length; i++) {
+            this.dealEditWorkForm.file += res.data[0].DealFileUrl[i].F_FileId + ",";
+            this.dealEditWorkFormFile.push({
+              F_FileId: res.data[0].DealFileUrl[i].F_FileId,
+              name: res.data[0].DealFileUrl[i].F_FileName,
+              url: res.data[0].DealFileUrl[i].F_FileUrl,
+            });
+          }
         }
-        // console.log(res.data[0].PSInfo)
       });
     },
     getFileUrl() {
@@ -1822,6 +2046,10 @@ export default {
       if (name === "dispatch_daoda") {
         this.getDispatchHaocai();
       }
+      if (name === "schEdit") {
+        this.getDispatchHaocai();
+        this.getDispatchHaocaiEdit();
+      }
       if (name === "fanxiu") {
         this.getReason("FXYY");
       }
@@ -1914,7 +2142,6 @@ export default {
               };
             }
             option.action(params).then((response) => {
-              console.log("处理结果");
               if (response.state === "success") {
                 this.$message({
                   type: "success",
@@ -2051,7 +2278,18 @@ export default {
           }
         }
       }
-
+      if (formName === "carEvaluteForm") {
+        if (
+          this.carEvaluteForm.Attitude < 3 ||
+          this.carEvaluteForm.Quality < 3 ||
+          this.carEvaluteForm.Efficiency < 3
+        ) {
+          if (this.carEvaluteForm.Evaluation === "") {
+            this.$message.warning("请输入文字评价");
+            return;
+          }
+        }
+      }
       this.$refs[formName].validate((valid) => {
         if (valid) {
           console.log(formName);
@@ -2062,7 +2300,7 @@ export default {
             if (this.bbtags.indexOf("急查标本") < 0) {
               this.dealWorkForm.pslist = [];
               // this.dealWorkForm.recipient = "";
-              this.dealWorkForm.isabnormal = "";
+              this.dealWorkForm.isabnormal = "0";
             }
             if (this.dealWorkForm.file === "") {
               // this.$message.error('请上传附件')
@@ -2075,6 +2313,23 @@ export default {
             }
             console.log(this.dealWorkForm);
           }
+          if (formName === "dealEditWorkForm") {
+            const psarr = [];
+            this.dealEditWorkForm.pslist = this.dispatchhaocaiarrEdit;
+            if (this.bbtags.indexOf("急查标本") < 0) {
+              this.dealEditWorkForm.pslist = [];
+              this.dealEditWorkForm.isabnormal = "0";
+            }
+            if (this.dealEditWorkForm.file === "") {
+              // this.$message.error('请上传附件')
+              // return
+            } else {
+              this.dealEditWorkForm.file = this.dealEditWorkForm.file.slice(
+                0,
+                this.dealEditWorkForm.file.length - 1
+              );
+            }
+          }
           if (formName === "collectForm") {
             if (this.collectForm.file === "") {
               // this.$message.error('请上传附件')
@@ -2183,6 +2438,9 @@ export default {
             case "dealWorkForm":
               this.postEvent = postDispatchDealWorkOrder;
               break;
+            case "dealEditWorkForm":
+              this.postEvent = postDispatchDealEditWorkOrder;
+              break;
             case "collectForm":
               this.postEvent = postCollectSpecimens;
               break;
@@ -2289,7 +2547,12 @@ export default {
                     this.dealWorkForm.remark = "";
                     this.dealWorkFormFile = [];
                     this.dealWorkForm.isabnormal = "0";
-                    // this.dealWorkForm.recipient = "";
+                  }
+                  if (this.optionName == "schEdit") {
+                    this.dealEditWorkForm.file = "";
+                    this.dealEditWorkForm.remark = "";
+                    this.dealEditWorkFormFile = [];
+                    this.dealEditWorkForm.isabnormal = "0";
                   }
                   if (this.optionName == "dispatch_shouqubiaoben") {
                     this.collectForm.file = "";

CallCenterWeb.UI/RMYY/src/utils/fieldsData.js

@@ -445,6 +445,10 @@ export default {
     value: '送达地点'
   },
   {
+    key: 'details',
+    value: '配送信息'
+  },
+  {
     key: 'F_AssignTime',
     value: '申请时间'
   },

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

@@ -94,7 +94,7 @@
               >
                 <th :rowspan="orderDetailData.PSInfo.length + 1">配送信息:</th>
               </tr>
-              <tr v-for="(item, index) in orderDetailData.PSInfo" :key="index">
+              <tr v-for="(item, index) in orderDetailData.PSInfo" :key="index+0">
                 <th v-if="item.F_ToDept">送达科室:</th>
                 <th v-if="item.F_ToDept">
                   {{
@@ -133,7 +133,7 @@
                   异常配送信息:
                 </th>
               </tr>
-              <tr v-for="(item, index) in orderDetailData.SDInfo" :key="index">
+              <tr v-for="(item, index) in orderDetailData.SDInfo" :key="index+11">
                 <th v-if="item.F_ToDept">送达科室:</th>
                 <th v-if="item.F_ToDept">
                   {{

CallCenterWeb.UI/RMYY/src/views/comDispatch/scheduleList/index.vue

@@ -142,6 +142,12 @@
         align="center"
       />
       <el-table-column
+        v-if="fieldListFlag.details"
+        prop="details"
+        label="配送信息"
+        align="center"
+      />
+      <el-table-column
         v-if="fieldListFlag.GapTime"
         prop="GapTime"
         label="工单时效"

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

@@ -119,7 +119,43 @@
               </el-table>
             </el-tab-pane>
             <el-tab-pane label="评价" name="2">
-              <el-table :data="evaluateData" border style="width: 100%">
+              <div v-if="!evaluateData.F_Attitude">暂无评价</div>
+              <div class="evaluate" v-if="evaluateData.F_Attitude">
+                <span class="demonstration">服务态度：</span>
+                <el-rate
+                  v-model="evaluateData.F_Attitude"
+                  :texts="texts"
+                  show-text
+                  disabled
+                  style="display: inline-block"
+                />
+              </div>
+              <div class="evaluate" v-if="evaluateData.F_Quality">
+                <span class="demonstration">维修质量：</span>
+                <el-rate
+                  v-model="evaluateData.F_Quality"
+                  :texts="texts"
+                  show-text
+                  disabled
+                  style="display: inline-block"
+                />
+              </div>
+              <div class="evaluate" v-if="evaluateData.F_Efficiency">
+                <span class="demonstration">完工时效：</span>
+                <el-rate
+                  v-model="evaluateData.F_Efficiency"
+                  :texts="texts"
+                  show-text
+                  disabled
+                  style="display: inline-block"
+                />
+              </div>
+              <div v-if="evaluateData.F_Efficiency">
+                <el-col :md="24" style="font-size: 15px; color: #505050">
+                  文字评价：{{ evaluateData.F_Evaluator }}</el-col
+                >
+              </div>
+             <!-- <el-table :data="evaluateData" border style="width: 100%">
                 <el-table-column
                   prop="F_EvaluateUser"
                   label="评价人"
@@ -136,7 +172,7 @@
                   label="评价时间"
                   align="center"
                 />
-              </el-table>
+              </el-table> -->
             </el-tab-pane>
           </el-tabs>
         </el-card>
@@ -167,6 +203,7 @@ export default {
   },
   data() {
     return {
+      texts: ["不满意", "不满意", "基本满意", "满意", "满意"],
       activeName: "1",
       ChatList: [], // 备注详情列表
       isChatList: false, // 备注列表是否展示
@@ -235,7 +272,9 @@ export default {
       };
       getModelDetail(params).then((response) => {
         if (num == 2) {
-          this.evaluateData = response.data;
+          if(response.data.length>0){
+            this.evaluateData = response.data[0];
+          }
         }
         if (num === "1") {
           this.workOrderCirculationList = response.data;
@@ -339,6 +378,11 @@ export default {
 </style>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .evaluate {
+    margin: 10px;
+    font-size: 15px;
+    color: #505050;
+  }
 .order_detail {
   .order_detail_body {
     margin-bottom: 20px;

CallCenterWeb.UI/RMYY/src/views/orderManage/mySubmit/index.vue

@@ -346,6 +346,7 @@ export default {
           data: {
             wid: rid,
             isedit: "1",
+            typeDisabled:"1"
           }, // props
         },
         area: ["70%", "70%"],

CallCenterWeb.UI/RMYY/src/views/orderManage/mySubmit/repairEdit.vue

@@ -24,6 +24,7 @@
             <!-- :isedit="isedit" -->
             <el-form-item label="工单类别" prop="repairOrderType">
               <select-order-typeTwo
+                :isedit="typeDisabled"
                 :orderTypeparams="ruleForm.repairOrderType"
                 :second-order-type="secondOrderType"
                 @post-second-order-type="getSecondOOrderType"
@@ -98,6 +99,7 @@ import { GetPerson } from "@/api/commonAPI";
 import {
   GetFaultRepairDetail,
   MyUpdateFaultRepairWorkOrder,
+  UpdateFaultRepair
 } from "@/api/orderManagement/orderList";
 import { getAddRepairbase } from "@/api/faultRepairManagement/faultRepair";
 export default {
@@ -127,6 +129,10 @@ export default {
       type: String,
       default: "",
     },
+    typeDisabled: {
+      type: String,
+      default: "",
+    },
     // iswomanage:{
     //   type:Number,
     //   default:''
@@ -361,17 +367,33 @@ export default {
                   PlaceOfRepair: this.ruleForm.repairAddress, // 报修地点
                   File: this.ruleForm.repairImageid, // 附件
                 };
-                MyUpdateFaultRepairWorkOrder(params).then((res) => {
-                  if (res.state.toLowerCase() === "success") {
-                    this.$parent.$layer.close(this.layerid);
-                    this.$parent.getList();
-                    this.$message({
-                      message: "恭喜你，编辑工单成功！",
-                      type: "success",
-                      duration: 1000,
-                    });
-                  }
-                });
+                if(this.typeDisabled=='1'){
+                  MyUpdateFaultRepairWorkOrder(params).then((res) => {
+                    if (res.state.toLowerCase() === "success") {
+                      this.$parent.$layer.close(this.layerid);
+                      this.$parent.getList();
+                      this.$message({
+                        message: "恭喜你，编辑工单成功！",
+                        type: "success",
+                        duration: 1000,
+                      });
+                    }
+                  });
+                }
+                if(this.typeDisabled=='0'){
+                  UpdateFaultRepair(params).then((res) => {
+                    if (res.state.toLowerCase() === "success") {
+                      this.$parent.$layer.close(this.layerid);
+                      this.$parent.getList();
+                      this.$message({
+                        message: "恭喜你，编辑工单成功！",
+                        type: "success",
+                        duration: 1000,
+                      });
+                    }
+                  });
+                }
+
               }
             } else {
               return false;

CallCenterWeb.UI/RMYY/src/views/orderManage/orderList/index.vue

@@ -379,6 +379,7 @@
             data: {
               wid: rid,
               isedit: "1",
+              typeDisabled:"0"
             }, // props
           },
           area: ["70%", "70%"],

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

@@ -18,18 +18,19 @@
       <el-table-column prop="F_DepartPlace" label="出发地" align="center" />
       <el-table-column prop="F_Destination" label="目的地" align="center" />
       <el-table-column prop="F_UseTime" label="用车时间" align="center" />
-     <!-- <el-table-column label="操作" align="center" class-name="oparate_btn">
+      <el-table-column label="操作" align="center" class-name="oparate_btn">
         <template slot-scope="scope">
-          <el-button v-show="scope.$index==0" v-for="item in scope.row.Buttons" :key="item.key" type="text"
+          <el-button v-show="scope.$index==0" v-for="item in scope.row.Buttons" :key="item.key+0" type="text"
             @click="btnClickEvents(item, scope.row.F_WorkOrderCode, scope.row,scope.$index)">
             {{ item.value }}
           </el-button>
-          <el-button v-show="scope.$index!=0&&selectarr[scope.$index-1].F_State==10" v-for="item in scope.row.Buttons" :key="item.key" type="text"
+          <el-button v-show="scope.$index!=0&&(selectarr[scope.$index-1].F_State==7||selectarr[scope.$index-1].F_State==10)" v-for="item in scope.row.Buttons"
+            :key="item.key+1" type="text"
             @click="btnClickEvents(item, scope.row.F_WorkOrderCode, scope.row,scope.$index)">
             {{ item.value }}
           </el-button>
         </template>
-      </el-table-column> -->
+      </el-table-column>
     </el-table>
     <!-- 退回 -->
     <el-dialog :visible.sync="dialog_tuihui" :append-to-body="true" title="退回">
@@ -49,13 +50,19 @@
     <!-- 评价 -->
     <el-dialog :visible.sync="dialog_pingjia" :append-to-body="true" title="评价">
       <el-form ref="carEvaluteForm" :model="carEvaluteForm" :rules="rules" label-width="100px">
-        <el-form-item label="评价内容">
+        <el-form-item label="服务态度" prop="Attitude">
+          <el-rate v-model="carEvaluteForm.Attitude" :texts="evaluateText" show-text />
+        </el-form-item>
+        <el-form-item label="服务质量" prop="Quality">
+          <el-rate v-model="carEvaluteForm.Quality" :texts="evaluateText" show-text />
+        </el-form-item>
+        <el-form-item label="完成时效" prop="Efficiency">
+          <el-rate v-model="carEvaluteForm.Efficiency" :texts="evaluateText" show-text />
+        </el-form-item>
+        <el-form-item label="文字评价" prop="Evaluation">
           <el-input :autosize="{ minRows: 4, maxRows: 8 }" v-model="carEvaluteForm.Evaluation" show-word-limit
             maxlength="100" type="textarea" />
         </el-form-item>
-        <el-form-item label="分值">
-          <el-rate v-model="carEvaluteForm.score" :texts="evaluateText" show-text />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialog_pingjia = false">取 消</el-button>
@@ -113,12 +120,15 @@
     },
     data() {
       return {
-        carEvaluteForm:{
-          score:0,
-          Evaluation:''
+        carEvaluteForm: {
+          // score: 0,
+          Attitude: 0,
+          Quality: 0,
+          Efficiency: 0,
+          Evaluation: ''
         },
         evaluateText: ["不满意", "不满意", "基本满意", "满意", "满意"],
-        dialog_pingjia:false,
+        dialog_pingjia: false,
         dialog_tuihui: false,
         reasonStr: '',
         BackForm: {
@@ -143,12 +153,34 @@
           id: 0,
           name: ''
         },
-        rules: {},
+        rules: {
+          Attitude: [
+            {
+              required: true,
+              message: "请选择服务态度",
+              trigger: "blur",
+            },
+          ],
+          Quality: [
+            {
+              required: true,
+              message: "请选择维修质量",
+              trigger: "blur",
+            },
+          ],
+          Efficiency: [
+            {
+              required: true,
+              message: "请选择完工时效",
+              trigger: "blur",
+            },
+          ],
+        },
         ruleForm: {
           carid: '',
           driver: ''
         },
-        ordercode:'',
+        ordercode: '',
         deptid: [],
         selectarr: [],
         loading: false
@@ -193,17 +225,22 @@
           }
         })
       },
-      submitEvaluateForm(formName){
+      submitEvaluateForm(formName) {
         const params = {
           WorkOrderCode: this.ordercode,
           Evaluation: this.carEvaluteForm.Evaluation,
-          score: this.carEvaluteForm.score
+          Attitude:this.carEvaluteForm.Attitude,
+          Quality:this.carEvaluteForm.Quality,
+          Efficiency:this.carEvaluteForm.Efficiency
+          // score: this.carEvaluteForm.score
         }
-        getCarEvaluateWorkorder(params).then(res=>{
+        getCarEvaluateWorkorder(params).then(res => {
           if (res.state == "success") {
             this.dialog_pingjia = false
             this.carEvaluteForm.Evaluation = ''
-            this.carEvaluteForm.score = 0
+            this.carEvaluteForm.Attitude = 0
+            this.carEvaluteForm.Quality = 0
+            this.carEvaluteForm.Efficiency = 0
             this.$message.success("评价成功!");
             this.$parent.$layer.close(this.layerid)
             this.$parent.getList();
@@ -224,7 +261,7 @@
           title: "工单详情",
         });
       },
-      btnClickEvents(button, wocode, row,index) {
+      btnClickEvents(button, wocode, row, index) {
         console.log(index)
         if (button.value == '接单') {
           this.getJieDan()
@@ -316,7 +353,7 @@
           });
       },
       //评价
-      getPingJia(wocode){
+      getPingJia(wocode) {
 
       },
       getDetail() {

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

@@ -132,7 +132,43 @@
               </el-table>
             </el-tab-pane>
             <el-tab-pane label="评价" name="2">
-              <el-table :data="evaluateData" border style="width: 100%">
+              <div v-if="!evaluateData.F_Attitude">暂无评价</div>
+              <div class="evaluate" v-if="evaluateData.F_Attitude">
+                <span class="demonstration">服务态度：</span>
+                <el-rate
+                  v-model="evaluateData.F_Attitude"
+                  :texts="texts"
+                  show-text
+                  disabled
+                  style="display: inline-block"
+                />
+              </div>
+              <div class="evaluate" v-if="evaluateData.F_Quality">
+                <span class="demonstration">维修质量：</span>
+                <el-rate
+                  v-model="evaluateData.F_Quality"
+                  :texts="texts"
+                  show-text
+                  disabled
+                  style="display: inline-block"
+                />
+              </div>
+              <div class="evaluate" v-if="evaluateData.F_Efficiency">
+                <span class="demonstration">完工时效：</span>
+                <el-rate
+                  v-model="evaluateData.F_Efficiency"
+                  :texts="texts"
+                  show-text
+                  disabled
+                  style="display: inline-block"
+                />
+              </div>
+              <div v-if="evaluateData.F_Efficiency">
+                <el-col :md="24" style="font-size: 15px; color: #505050">
+                  文字评价：{{ evaluateData.F_Evaluator }}</el-col
+                >
+              </div>
+              <!-- <el-table :data="evaluateData" border style="width: 100%">
                 <el-table-column
                   prop="F_EvaluateUser"
                   label="评价人"
@@ -149,7 +185,7 @@
                   label="评价时间"
                   align="center"
                 />
-              </el-table>
+              </el-table> -->
             </el-tab-pane>
           </el-tabs>
         </el-card>
@@ -184,6 +220,7 @@ export default {
   },
   data() {
     return {
+      texts: ["不满意", "不满意", "基本满意", "满意", "满意"],
       activeName: "1",
       imgUrl: this.$store.getters.serverConfig.BASE_API,
       orderDetailData: {
@@ -237,7 +274,9 @@ export default {
           this.workOrderCirculationList = response.data;
         }
         if (num == 2) {
-          this.evaluateData = response.data;
+          if(response.data.length>0){
+            this.evaluateData = response.data[0];
+          }
         }
       });
     },
@@ -246,6 +285,11 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
+  .evaluate {
+    margin: 10px;
+    font-size: 15px;
+    color: #505050;
+  }
 .order_detail {
   // .el-col {
   //   margin-bottom: 20px;

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

@@ -32,6 +32,7 @@
 								</view>
 								<view class="uni-note">工单内容：{{item.F_Content}}</view>
 								<view class="uni-note">申请时间：{{item.F_CreateTime}}</view>
+								<view class="uni-note">科室位置：{{item.F_Location}}</view>
 							</view>
 							<view class="textState">{{ item.StateName}}</view>
 							<view class="textState" style="right: 85px;" v-show="item.F_UrgeCount>0">催办 {{item.F_UrgeCount}}</view>

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

@@ -28,6 +28,10 @@
           $mHelper.findParents(departList, detailContentData.F_ApplicationDept)
         }}</text>
       </view>
+	  <view class="contentTable">
+	    <text class="contentTitle">科室位置：</text>
+	    <text class="contentText">{{ detailContentData.F_Location }}</text>
+	  </view>
       <view class="contentTable">
         <text class="contentTitle">科室电话：</text>
         <text class="contentText">{{ detailContentData.F_DeptPhone }}</text>

CallCenterWeb.UI/RMYYAPP/pages/myTask/vehicleSchedulList/components/vehiccleDetail/evaluateDetail/evaluateDetail.vue

@@ -4,9 +4,18 @@
 		<view class="form">
 			<!-- 基础表单校验 -->
 			<uni-forms ref="valiForm" :rules="rules" :modelValue="valiFormData">
-				<uni-forms-item label="分值"  name="score" >
-					<htz-rate v-model="valiFormData.score" :type="2"></htz-rate>
+				<uni-forms-item label="服务态度" name="attitude">
+					<htz-rate v-model="valiFormData.attitude" :type="2"></htz-rate>
+				</uni-forms-item>
+				<uni-forms-item label="维修态度" name="quality">
+					<htz-rate v-model="valiFormData.quality" :type="2"></htz-rate>
 				</uni-forms-item>
+				<uni-forms-item label="完工时效" name="finishTime">
+					<htz-rate v-model="valiFormData.finishTime" :type="2"></htz-rate>
+				</uni-forms-item>
+				<!-- <uni-forms-item label="分值"  name="score" >
+					<htz-rate v-model="valiFormData.score" :type="2"></htz-rate>
+				</uni-forms-item> -->
 				<uni-forms-item label="评价内容" required  name="Evaluation">
 					<uni-easyinput type="textarea" v-model="valiFormData.Evaluation" placeholder="请输入完成说明(限100字)" maxlength="100"/>
 				</uni-forms-item>
@@ -32,7 +41,10 @@
 				// 校验表单数据
 				valiFormData: {
 					workorderid: '',
-					score:0, // 分值 score
+					// score:0, // 分值 score
+					attitude:0,
+					quality:0,
+					finishTime:0,
 					Evaluation: '', // 评价内容
 				},
 				// 校验规则
@@ -57,7 +69,10 @@
 					const params = {
 					  WorkOrderCode: this.valiFormData.workorderid,
 					  Evaluation: this.valiFormData.Evaluation,
-						score: this.valiFormData.score
+					  Attitude:this.valiFormData.attitude,
+					  Quality:this.valiFormData.quality,
+					  Efficiency:this.valiFormData.finishTime
+					  // score: this.valiFormData.score
 					}
 					console.log(this.valiFormData)
 					this.$mHelper.httpPost("T_Car_WorkOrder/EvaluateWorkorder",params,2,res=>this.disabledButton=res)