mod:合并代码冲突

CallCenterWeb.UI/RMYY/src/api/orderManagement/vehicle.js

+import request from '@/utils/request'
+// 工单类型--车辆调度
+// 撤回
+export function getCarWithdrawWorkOrder(params) {
+  return request({
+    url: 'T_Car_WorkOrder/Withdraw',
+    method: 'get',
+    params
+  })
+}
+// 评价
+export function getCarEvaluateWorkorder(params) {
+  return request({
+    url: 'T_Car_WorkOrder/EvaluateWorkorder',
+    method: 'get',
+    params
+  })
+}

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

         <el-button type="primary" @click="submitForm('dealWorkForm')">确 定</el-button>
       </div>
     </el-dialog>
+    <!-- 车辆调度-评价 -->
+    <el-dialog :visible.sync="dialogStatus.dialog_cldu_pingjia" title="评价">
+      <el-form ref="carEvaluteForm" :model="carEvaluteForm" :rules="rules" label-width="100px">
+        <el-form-item label="评价内容">
+          <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-input-number v-model="carEvaluteForm.score" :min="0"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogStatus.dialog_cldu_pingjia = false">取 消</el-button>
+        <el-button type="primary" @click="submitForm('carEvaluteForm')">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 
 import {
   schedulRetractOrder,
-  	deleteSchedulingOrder
+  deleteSchedulingOrder
 } from '@/api/orderManagement/orderList'
 import {
   getSureWorkOrder,
   postDelDispatchWorkOrder,
   postwithdrawDispatchWorkOrder
 } from '@/api/comDispatch/addOrEditDispatch'
+import { getCarWithdrawWorkOrder, getCarEvaluateWorkorder } from '@/api/orderManagement/vehicle'
 import {
   GetPerson
 } from '@/api/commonAPI'
     return {
       optionName: '',
       wocode: '',
+      fid: '',
       dialogStatus: {
         dialog_zixingjiejue: false,
         dialog_zhdd_chehui: false,
         dialog_haocai: false,
         dialog_dispatch_tuihui: false,
         dialog_schbianji: false,
+        dialog_dispatch_daoda: false,
         dialog_schshanchu: false,
         dialog_schchehui: false,
+        dialog_cldu_chehui: false,
+        dialog_cldu_bianji: false,
+        dialog_cldu_pingjia: false,
+        dialog_cldu_chehui: {
+          text: '确定要撤回吗？',
+          action: getCarWithdrawWorkOrder,
+          type: 'confirm'
+        },
         dialog_yw_shanchu: {
           text: '确定要删除吗？',
           action: getDelWorkOrder,
           action: deleteSchedulingOrder,
           type: 'confirm'
         },
-        dialog_dispatch_daoda: false,
         dialog_ywzx_jiedan: {
           text: '确定要接单吗？',
           action: getSureWorkOrder,
       evaluateText: [
         '极差', '失望', '一般', '满意', '惊喜'
       ],
+      carEvaluteForm: {
+        Evaluation: '',
+        score: 0
+      },
       evaluateForm: {
         Attitude: 0,
         Quality: 0,
     butOptionMethod(name, code, row) {
       this.optionName = name
       this.wocode = code
+      this.fid = row.F_ID
       if (this.dialogStatus[`dialog_${name}`] === false) {
         this.dialogStatus[`dialog_${name}`] = true
       } else {
         type: 'warning'
       }).then(() => {
         new Promise((resolve) => {
-          if (this.optionName == 'ywzx_jiedan' || this.optionName == 'ywzx_tuihui' || this.optionName == 'dispatch_jiedan' || this.optionName == 'schshanchu' || this.optionName == 'yw_shanchu') {
+          if (this.optionName == 'ywzx_jiedan' || this.optionName == 'ywzx_tuihui' || this.optionName == 'dispatch_jiedan' || this.optionName == 'schshanchu' || this.optionName == 'yw_shanchu' || this.optionName == 'cldu_chehui') {
             var params = {
               WorkOrderCode: this.wocode
             }
             case 'dealWorkForm':
               this.postEvent = postDispatchDealWorkOrder
               break
+            case 'carEvaluteForm':
+              this.postEvent = getCarEvaluateWorkorder
+              break
             default:
               break
           }

CallCenterWeb.UI/RMYY/src/components/context/commonSelect/selectOrderType.vue

       inserted(el, binging) {
         // console.log(el.id)
         if ((el.id.split(',')[0] == 'nav2' && el.id.split(',')[1] == '3000') || (el.id.split(',')[0] == 'nav0' && el
-          .id.split(',')[1] == '1000') || (el.id.split(',')[0] == 'nav1' && el.id.split(',')[1] == '2000')) {
+          .id.split(',')[1] == '1000') || (el.id.split(',')[0] == 'nav1' && el.id.split(',')[1] == '2000') || (el.id.split(',')[0] == 'nav3' && el.id.split(',')[1] == '4000')) {
           el.click()
         } else {
           el.id.split(',')[0] == 'nav0' ? el.click() : null

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

     value: '10'
   }],
   stateOptions_4000: [{
+    label: '待提交',
+    value: '-1'
+  },
+  {
     label: '待分配',
     value: '0'
   },
     value: '4'
   },
   {
+    label: '待评价',
+    value: '7'
+  },
+  {
     label: '已完成',
     value: '10'
   }],

CallCenterWeb.UI/RMYY/src/views/callScreen/components/AddOrEditOrder.vue

       <!-- 车辆调度 -->
       <el-col v-if="orderTypeData.F_Type1 === 4000" :span="22">
         <add-or-edit
+          :wid="wid"
+          :iswomanage="iswomanage"
+          :rtype="rtype"
           :r2type="r2type"
           :callid="callid"
           :order-type-data="orderTypeData"

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

       if (this.buttonName === 'ywzx_bianji') {
         this.btn_ywzxedit(wocode, row.F_Type, row.F_SonType)
       }
+      if (this.buttonName === 'cldu_bianji') {
+        this.btn_ywzxedit(wocode, row.F_Type, row.F_SonType)
+      }
     },
     // 编辑
     btn_edit(rid) {

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

 
 <script>
 import {
-  getList,
+  // getList,
   getModelDetail,
   getAddWorkOrder,
   getUpdateWorkOrder
 import {
   getOrderTypeList
 } from '@/api/commonAPI.js'
-import selectDeptTree from '@/components/context/commonSelect/selectDeptTree.vue'
+  // import selectDeptTree from '@/components/context/commonSelect/selectDeptTree.vue'
 import {
   getCartype
 } from '@/api/vehicleDispatch/vehicleManagement'
       type: String,
       default: ''
     },
+    wid: {
+      type: String,
+      default: ''
+    },
     wocode: {
       type: String,
       default: ''
   created() {
     this.getTypeOrder()
     this.getCarlist()
-    if (this.rowid) {
-      this.ruleForm.F_ID = this.rowid
+    if (this.wid) {
+      this.wocode = this.wid
       this.getDetail('0')
-      console.log(this.rowid)
     }
   },
   methods: {
               .then((response) => {
                 this.loading = false
                 if (response.state.toLowerCase() === 'success') {
-                  this.$parent.$layer.close(this.layerid)
-                  this.$parent.getList() // 重新加载父级数据
+                  this.$parent.$layer.closeAll()
+                  // this.$parent.$layer.close(this.layerid)
+                  this.$parent.$parent.getList() // 重新加载父级数据
                   this.$message({
                     message: '恭喜你，添加工单成功！',
                     type: 'success',
             // 编辑
             const datas = {
               WorkOrderCode: this.wocode,
-              type: this.ruleForm.type,
+              type: this.type,
               hosid: this.ruleForm.hosid, //	院区id
               detpid: this.ruleForm.deptid, //	申请科室id
               startplace: this.ruleForm.startplace,
             getUpdateWorkOrder(datas)
               .then((response) => {
                 if (response.state.toLowerCase() === 'success') {
-                  this.$parent.$layer.close(this.layerid)
-                  this.$parent.getList() // 重新加载父级数据
+                  this.$parent.$layer.closeAll()
+                  // this.$parent.$layer.close(this.layerid)
+                  this.$parent.$parent.getList() // 重新加载父级数据
                   this.$message({
                     message: '恭喜你，编辑工单成功！',
                     type: 'success',
     // 获取详情
     getDetail(num) {
       const params = {
-        orderid: this.rowid,
+        // orderid: this.rowid,
         WorkOrderCode: this.wocode,
         type: num
       }
           this.getRepairman(res.F_ProposerDeptId)
           this.ruleForm.F_ID = res.F_ID
           this.ruleForm.type = res.F_Type
+          this.type = res.F_Type
           this.hospitalsParam.id = res.F_HosId
           this.hospitalsParam.name = res.HosName
           this.departmentsParam.id = res.F_ProposerDeptId