2.7.5

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

@@ -1,6 +1,11 @@
 <template>
   <div v-loading="loading">
-    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px">
+    <el-form
+      ref="ruleForm"
+      :model="ruleForm"
+      :rules="rules"
+      label-width="150px"
+    >
       <el-col :span="24">
         <!-- <el-row v-if="wocode!=''">
           <el-col :span="24">
@@ -19,51 +24,92 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="申请人" prop="needman">
-              <el-select v-model="ruleForm.needman" placeholder="请选择申请人" style="width:100%;" @change="changeRepairman">
+              <el-select
+                v-model="ruleForm.needman"
+                placeholder="请选择申请人"
+                style="width: 100%"
+                @change="changeRepairman"
+              >
                 <el-option
                   v-for="item in repairman"
                   :key="item.usercode"
                   :label="item.username"
-                  :value="item.usercode" />
+                  :value="item.usercode"
+                />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="联系电话" prop="phon">
-              <el-input v-model="ruleForm.phon" placeholder="请输入联系电话" />
+            <el-form-item label="申请人电话" prop="phon">
+              <el-input
+                v-model="ruleForm.phon"
+                placeholder="请输入申请人电话"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="车辆要求" prop="cartype">
-              <el-select v-model="ruleForm.cartype" style="width: 100%;">
+              <el-select v-model="ruleForm.cartype" style="width: 100%">
                 <el-option
-                  v-for="(item,index) in carArr"
+                  v-for="(item, index) in carArr"
                   :key="index"
                   :label="item.F_Name"
-                  :value="item.F_DictionaryValueId"/>
+                  :value="item.F_DictionaryValueId"
+                />
               </el-select>
             </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-form-item label="联系人电话" prop="contactnumber">
+              <el-input
+                v-model="ruleForm.contactnumber"
+                placeholder="请输入联系人电话"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
             <el-form-item label="科室位置" prop="startplace">
-              <el-input v-model="ruleForm.startplace" placeholder="请输入科室位置" />
+              <el-input
+                v-model="ruleForm.startplace"
+                placeholder="请输入科室位置"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="目的地" prop="endplace">
-              <el-input v-model="ruleForm.endplace" placeholder="请输入目的地" />
+              <el-input
+                v-model="ruleForm.endplace"
+                placeholder="请输入目的地"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <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-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>
@@ -72,15 +118,16 @@
             <el-form-item label="发车时间" prop="usertime">
               <el-date-picker
                 v-model="ruleForm.usertime"
-                style="width: 100%;"
+                style="width: 100%"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 format="yyyy-MM-dd HH:mm:ss"
                 type="datetime"
-                placeholder="选择发车时间"/>
+                placeholder="选择发车时间"
+              />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="type&&type==9017">
+        <el-row v-if="type && type == 9017">
           <el-col :span="24">
             <el-form-item label="是否出生" prop="birth">
               <el-radio v-model="ruleForm.birth" :label="0">否</el-radio>
@@ -91,7 +138,11 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="工单内容" prop="content">
-              <el-input v-model="ruleForm.content" type="textarea" placeholder="请输入工单内容" />
+              <el-input
+                v-model="ruleForm.content"
+                type="textarea"
+                placeholder="请输入工单内容"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -109,190 +160,220 @@ import {
   // getList,
   getModelDetail,
   getAddWorkOrder,
-  getUpdateWorkOrder
-} from '@/api/vehicleDispatch/vehicleScheduling.js'
-import {
-    GetYuanqu
-  } from "@/api/telCall/report";
-import {
-  getOrderTypeList
-} from '@/api/commonAPI.js'
-  // import selectDeptTree from '@/components/context/commonSelect/selectDeptTree.vue'
-import {
-  getCartype
-} from '@/api/vehicleDispatch/vehicleManagement'
-import {
-  GetPerson
-} from '@/api/commonAPI'
+  getUpdateWorkOrder,
+} from "@/api/vehicleDispatch/vehicleScheduling.js";
+import { GetYuanqu } from "@/api/telCall/report";
+import { getOrderTypeList } from "@/api/commonAPI.js";
+// import selectDeptTree from '@/components/context/commonSelect/selectDeptTree.vue'
+import { getCartype } from "@/api/vehicleDispatch/vehicleManagement";
+import { GetPerson } from "@/api/commonAPI";
 export default {
-  name: 'AddOrEdit',
+  name: "AddOrEdit",
   props: {
     orderTypeData: {
       type: Object,
       default() {
-        return {}
-      }
+        return {};
+      },
     },
     callid: {
       type: String,
-      default: ''
+      default: "",
     },
     rowid: {
       type: String,
-      default: ''
+      default: "",
     },
     wid: {
       type: String,
-      default: ''
+      default: "",
     },
     fid: {
       type: String,
-      default: ''
+      default: "",
     },
     wocode: {
       type: String,
-      default: ''
+      default: "",
     },
     layerid: {
       type: String,
-      default: ''
+      default: "",
     },
     iswomanage: {
       type: String,
-      default: ''
-    }
+      default: "",
+    },
   },
   data() {
     return {
-      cid: '',
-      type:'',
+      cid: "",
+      type: "",
       yqarr: [],
       typeList: [],
       carArr: [],
       repairman: [], // 申请人数据
-      sourceList: [{
-        value: '电话',
-        label: '电话'
-      }, {
-        value: '电脑',
-        label: '电脑'
-      }, {
-        value: '微信',
-        label: '微信'
-      }],
+      sourceList: [
+        {
+          value: "电话",
+          label: "电话",
+        },
+        {
+          value: "电脑",
+          label: "电脑",
+        },
+        {
+          value: "微信",
+          label: "微信",
+        },
+      ],
       hospitalsParam: {
         id: 0,
-        name: ''
+        name: "",
       },
       departmentsParam: {
         id: 0,
-        name: ''
+        name: "",
       },
       repairmanParam: {
         id: 0,
-        name: ''
+        name: "",
       },
       rules: {
-        type: [{
-          required: true,
-          message: '请选择',
-          trigger: 'change'
-        }],
-        deptid: [{
-          required: true,
-          message: '请选择',
-          trigger: 'change'
-        }],
-        needman: [{
-          required: true,
-          message: '请选择',
-          trigger: 'change'
-        }],
-        cartype: [{
-          required: true,
-          message: '请选择',
-          trigger: 'change'
-        }],
+        type: [
+          {
+            required: true,
+            message: "请选择",
+            trigger: "change",
+          },
+        ],
+        deptid: [
+          {
+            required: true,
+            message: "请选择",
+            trigger: "change",
+          },
+        ],
+        needman: [
+          {
+            required: true,
+            message: "请选择",
+            trigger: "change",
+          },
+        ],
+        cartype: [
+          {
+            required: true,
+            message: "请选择",
+            trigger: "change",
+          },
+        ],
         // usertime: [{
         //   type: 'string',
         //   required: true,
         //   message: '请选择',
         //   trigger: 'change'
         // }],
-        phon: [{
-          required: true,
-          message: '请输入联系电话',
-          trigger: 'blur'
-        },
-        {
-          pattern: /^((0\d{2,3}-\d{5,8})|(1[345789]\d{9}))$/,
-          message: '请输入正确的电话号码或者固话号码',
-          trigger: 'blur'
-        }],
-        startplace: [{
-          required: true,
-          message: '请输入',
-          trigger: 'blur'
-        }],
-        endplace: [{
-          required: true,
-          message: '请输入',
-          trigger: 'blur'
-        }],
-        content: [{
-          required: true,
-          message: '请输入',
-          trigger: 'blur'
-        }]
+        phon: [
+          {
+            required: true,
+            message: "请输入电话",
+            trigger: "blur",
+          },
+          {
+            pattern: /^((0\d{2,3}-\d{5,8})|(1[345789]\d{9}))$/,
+            message: "请输入正确的电话号码或者固话号码",
+            trigger: "blur",
+          },
+        ],
+        contact: [
+          {
+            required: true,
+            message: "请输入联系人",
+            trigger: "blur",
+          },
+        ],
+        contactnumber: [
+          {
+            required: true,
+            trigger: "blur",
+            pattern: /^((0\d{2,3}-\d{5,8})|(1[345789]\d{9}))$/,
+            message: "请输入正确的电话号码",
+          },
+        ],
+        startplace: [
+          {
+            required: true,
+            message: "请输入",
+            trigger: "blur",
+          },
+        ],
+        endplace: [
+          {
+            required: true,
+            message: "请输入",
+            trigger: "blur",
+          },
+        ],
+        // content: [
+        //   {
+        //     required: true,
+        //     message: "请输入",
+        //     trigger: "blur",
+        //   },
+        // ],
       },
       ruleForm: {
-        F_ID: '',
-        startplace: '',
-        endplace: '',
-        source: '',
-        hosid: '', // 院区id
-        hosname: '', // 院区id
-        deptid: '', // 申请科室id
-        deptname: '', // 申请科室名称
-        usercode: '', // 申请人编码
-        username: '', //	申请人
-        needman: '',
-        birth: '',
-        phon: '',
-        type: '',
-        cartype: '',
-        F_CarMessage: '',
-        remark: '',
-        content: '',
-        dispatch:'',
+        F_ID: "",
+        startplace: "",
+        endplace: "",
+        source: "",
+        hosid: "", // 院区id
+        hosname: "", // 院区id
+        deptid: "", // 申请科室id
+        deptname: "", // 申请科室名称
+        usercode: "", // 申请人编码
+        username: "", //	申请人
+        needman: "",
+        birth: "",
+        phon: "",
+        contact: "",
+        contactnumber: "",
+        usertime: "",
+        type: "",
+        cartype: "",
+        F_CarMessage: "",
+        remark: "",
+        content: "",
+        dispatch: "",
       },
       deptid: [],
-      loading: false
-    }
+      loading: false,
+    };
   },
   created() {
-    this.cid = this.callid
+    this.cid = this.callid;
     if (!this.cid) {
-      this.cid = window.localStorage.getItem('callidSave')
+      this.cid = window.localStorage.getItem("callidSave");
     }
-    this.getTypeOrder()
-    this.getCarlist()
-    this.getHos()
+    this.getTypeOrder();
+    this.getCarlist();
+    this.getHos();
     if (this.wocode) {
-      this.wocode = this.wocode
-      this.getDetail('0')
+      this.wocode = this.wocode;
+      this.getDetail("0");
     }
     if (this.wid) {
-      this.wocode = this.wid
-      this.getDetail('0')
+      this.wocode = this.wid;
+      this.getDetail("0");
     }
-    if (this.iswomanage === '1') {
-      const dept = this.$store.getters.teamId
-      this.deptid = this.$store.getters.deptmap[parseInt(dept)].ids
-      this.ruleForm.deptid = dept
-      this.getRepairman(dept)
-      this.ruleForm.needman = this.$store.getters.usercode
-      this.ruleForm.phon = this.$store.getters.mobile
+    if (this.iswomanage === "1") {
+      const dept = this.$store.getters.teamId;
+      this.deptid = this.$store.getters.deptmap[parseInt(dept)].ids;
+      this.ruleForm.deptid = dept;
+      this.getRepairman(dept);
+      this.ruleForm.needman = this.$store.getters.usercode;
+      this.ruleForm.phon = this.$store.getters.mobile;
     }
   },
   methods: {
@@ -306,47 +387,47 @@ export default {
     getRepairman(id) {
       return new Promise((resolve) => {
         const params = {
-          deptid: id // 字典管理的工单标识
-        }
+          deptid: id, // 字典管理的工单标识
+        };
         GetPerson(params).then((res) => {
-          this.repairman = res.rows
-        })
-        resolve()
-      })
+          this.repairman = res.rows;
+        });
+        resolve();
+      });
     },
     // 申请人
     changeRepairman(data) {
-      this.ruleForm.needman = data
+      this.ruleForm.needman = data;
       const user = this.repairman.find((o) => {
-        return o.usercode === data.toString()
-      })
+        return o.usercode === data.toString();
+      });
       if (user) {
-        this.ruleForm.phon = user.usertelphone
+        this.ruleForm.phon = user.usertelphone;
       }
     },
     getCarlist() {
       const params = {
-        Flag: 'CLLX',
-        Name: ''
-      }
-      getCartype(params).then(res => {
-        this.carArr = res.rows
-      })
+        Flag: "CLLX",
+        Name: "",
+      };
+      getCartype(params).then((res) => {
+        this.carArr = res.rows;
+      });
     },
     getTypeOrder() {
       const params = {
         pid: 2,
-        typeid: 4000
-      }
-      getOrderTypeList(params.pid, params.typeid).then(res => {
-        this.typeList = res.rows
-      })
+        typeid: 4000,
+      };
+      getOrderTypeList(params.pid, params.typeid).then((res) => {
+        this.typeList = res.rows;
+      });
     },
     getDeptid(data) {
-      this.ruleForm.hosid = data[0]
-      this.ruleForm.deptid = data[data.length - 1]
-      this.deptid = data
-      this.getRepairman(data[data.length - 1])
+      this.ruleForm.hosid = data[0];
+      this.ruleForm.deptid = data[data.length - 1];
+      this.deptid = data;
+      this.getRepairman(data[data.length - 1]);
     },
     submitForm() {
       this.$refs.ruleForm.validate((valid) => {
@@ -356,38 +437,42 @@ export default {
             const datas = {
               callid: this.cid,
               LeaveRecordId: this.fid,
-              type: this.orderTypeData.type2Arr[this.orderTypeData.type2Arr.length - 1],
+              type: this.orderTypeData.type2Arr[
+                this.orderTypeData.type2Arr.length - 1
+              ],
               hosid: this.ruleForm.hosid, //	院区id
               detpid: this.ruleForm.deptid, //	申请科室id
               startplace: this.ruleForm.startplace,
               endplace: this.ruleForm.endplace,
               needman: this.ruleForm.needman, //	申请人
               phon: this.ruleForm.phon,
+              contact: this.ruleForm.contact,
+              contactnumber: this.ruleForm.contactnumber,
               cartype: this.ruleForm.cartype,
               usertime: this.ruleForm.usertime,
               birth: this.ruleForm.birth,
-              dispatch:this.ruleForm.dispatch,
-              content: this.ruleForm.content //	备注
-            }
+              dispatch: this.ruleForm.dispatch,
+              content: this.ruleForm.content, //	备注
+            };
             getAddWorkOrder(datas)
               .then((response) => {
-                this.loading = false
-                if (response.state.toLowerCase() === 'success') {
-                  this.$parent.$layer.closeAll()
+                this.loading = false;
+                if (response.state.toLowerCase() === "success") {
+                  this.$parent.$layer.closeAll();
                   // this.$parent.$layer.close(this.layerid)
                   // this.$parent.$parent.getList() // 重新加载父级数据
                   this.$message({
-                    message: '恭喜你，添加工单成功！',
-                    type: 'success',
-                    duration: 1000
-                  })
-                  this.$refs.ruleForm.resetFields()
-                  this.deptid = []
+                    message: "恭喜你，添加工单成功！",
+                    type: "success",
+                    duration: 1000,
+                  });
+                  this.$refs.ruleForm.resetFields();
+                  this.deptid = [];
                 }
               })
               .catch(() => {
-                this.loading = false
-              })
+                this.loading = false;
+              });
           } else {
             // 编辑
             const datas = {
@@ -399,35 +484,37 @@ export default {
               endplace: this.ruleForm.endplace,
               needman: this.ruleForm.needman, //	申请人
               phon: this.ruleForm.phon,
+              contact: this.ruleForm.contact,
+              contactnumber: this.ruleForm.contactnumber,
               cartype: this.ruleForm.cartype,
               usertime: this.ruleForm.usertime,
               birth: this.ruleForm.birth,
-              dispatch:this.ruleForm.dispatch,
-              content: this.ruleForm.content //	备注
-            }
+              dispatch: this.ruleForm.dispatch,
+              content: this.ruleForm.content, //	备注
+            };
             getUpdateWorkOrder(datas)
               .then((response) => {
-                if (response.state.toLowerCase() === 'success') {
-                  this.$parent.$layer.closeAll()
+                if (response.state.toLowerCase() === "success") {
+                  this.$parent.$layer.closeAll();
                   // this.$parent.$layer.close(this.layerid)
-                  this.$parent.getList() // 重新加载父级数据
+                  this.$parent.getList(); // 重新加载父级数据
                   this.$message({
-                    message: '恭喜你，编辑工单成功！',
-                    type: 'success',
-                    duration: 1000
-                  })
+                    message: "恭喜你，编辑工单成功！",
+                    type: "success",
+                    duration: 1000,
+                  });
                 }
               })
-              .catch(() => {})
+              .catch(() => {});
           }
         } else {
-          this.$message.error('请输入有效的必填项信息!')
-          return false
+          this.$message.error("请输入有效的必填项信息!");
+          return false;
         }
-      })
+      });
     },
     resetForm() {
-      this.$refs.ruleForm.resetFields()
+      this.$refs.ruleForm.resetFields();
     },
 
     // 获取详情
@@ -435,43 +522,46 @@ export default {
       const params = {
         // orderid: this.rowid,
         WorkOrderCode: this.wocode,
-        type: num
-      }
+        type: num,
+      };
       getModelDetail(params).then((response) => {
-        if (response.state.toLowerCase() === 'success') {
-          const res = response.model
-          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
-          this.departmentsParam.name = res.F_ProposerDeptName
-          this.repairmanParam.id = res.F_ProposerCode
-          this.repairmanParam.name = res.F_ProposerName
-          this.ruleForm.username = res.F_ProposerName
-          this.ruleForm.hosid = res.F_HosId
-          this.ruleForm.hosname = res.HosName
-          this.ruleForm.deptid = res.F_ProposerDeptId
-          this.ruleForm.deptname = res.F_ProposerDeptName
-          this.ruleForm.usercode = res.F_ProposerCode
-          this.ruleForm.username = res.F_ProposerName
-          this.ruleForm.phon = res.F_Phon
-          this.ruleForm.cartype = res.F_CarType
-          this.ruleForm.startplace = res.F_DepartPlace
-          this.ruleForm.endplace = res.F_Destination
-          this.ruleForm.F_CarMessage = res.F_CarMessage
-          this.ruleForm.remark = res.F_Remark
-          this.ruleForm.usertime = res.F_UseTime
-          this.ruleForm.birth = res.F_Birth
-          this.ruleForm.dispatch = res.F_Dispatch
-          this.ruleForm.content = res.F_Content
-          this.deptid = this.$store.getters.deptmap[parseInt(res.F_ProposerDeptId)].ids
-          this.ruleForm.needman = res.F_ProposerCode
+        if (response.state.toLowerCase() === "success") {
+          const res = response.model;
+          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;
+          this.departmentsParam.name = res.F_ProposerDeptName;
+          this.repairmanParam.id = res.F_ProposerCode;
+          this.repairmanParam.name = res.F_ProposerName;
+          this.ruleForm.username = res.F_ProposerName;
+          this.ruleForm.hosid = res.F_HosId;
+          this.ruleForm.hosname = res.HosName;
+          this.ruleForm.deptid = res.F_ProposerDeptId;
+          this.ruleForm.deptname = res.F_ProposerDeptName;
+          this.ruleForm.usercode = res.F_ProposerCode;
+          this.ruleForm.username = res.F_ProposerName;
+          this.ruleForm.phon = res.F_Phon;
+          this.ruleForm.contact = res.F_Contact;
+          this.ruleForm.contactnumber = res.F_ContactNumber;
+          this.ruleForm.cartype = res.F_CarType;
+          this.ruleForm.startplace = res.F_DepartPlace;
+          this.ruleForm.endplace = res.F_Destination;
+          this.ruleForm.F_CarMessage = res.F_CarMessage;
+          this.ruleForm.remark = res.F_Remark;
+          this.ruleForm.usertime = res.F_UseTime;
+          this.ruleForm.birth = res.F_Birth;
+          this.ruleForm.dispatch = res.F_Dispatch;
+          this.ruleForm.content = res.F_Content;
+          this.deptid =
+            this.$store.getters.deptmap[parseInt(res.F_ProposerDeptId)].ids;
+          this.ruleForm.needman = res.F_ProposerCode;
         }
-      })
-    }
+      });
+    },
     // 科室下拉改变事件
     // getDepartments(data) {
     //   this.ruleForm.deptid = data.value
@@ -487,8 +577,8 @@ export default {
     //   this.ruleForm.usercode = data.value
     //   this.ruleForm.username = data.name
     // },
-  }
-}
+  },
+};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

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

@@ -34,7 +34,7 @@
                 <td>{{ orderDetailData.F_ProposerName }}</td>
               </tr>
               <tr>
-                <th>联系电话:</th>
+                <th>申请人电话:</th>
                 <td>{{ orderDetailData.F_Phon }}</td>
                 <th>车辆要求:</th>
                 <td>{{ orderDetailData.F_CarName }}</td>
@@ -42,8 +42,12 @@
                 <td>{{ orderDetailData.F_DepartPlace }}</td>
               </tr>
               <tr>
+                <th>联系人:</th>
+                <td>{{ orderDetailData.F_Contact || "-" }}</td>
+                <th>联系人电话:</th>
+                <td>{{ orderDetailData.F_ContactNumber || "-" }}</td>
                 <th>出车地点:</th>
-                <td colspan="5">{{ orderDetailData.F_Dispatch || '-'}}</td>
+                <td>{{ orderDetailData.F_Dispatch || "-" }}</td>
               </tr>
               <tr>
                 <th>目的地:</th>
@@ -55,7 +59,9 @@
               </tr>
               <tr>
                 <th>紧急情况:</th>
-                <td colspan="5">{{ orderDetailData.F_EmergencyTypes || '-'}}</td>
+                <td colspan="5">
+                  {{ orderDetailData.F_EmergencyTypes || "-" }}
+                </td>
               </tr>
               <tr>
                 <th>工单内容:</th>

CallCenterWeb.UI/RMYY/src/views/versionUpdate/versionUpdate/cpns/addOrEdit.vue

@@ -0,0 +1,289 @@
+<template>
+  <div v-loading="loading">
+    <el-form
+      ref="ruleForm"
+      :rules="rules"
+      :model="ruleForm"
+      label-width="100px"
+    >
+      <el-row>
+        <el-col :span="16">
+          <el-form-item label="应用分类" prop="F_Type">
+            <el-select
+              @change="typechange"
+              v-model="ruleForm.F_Type"
+              placeholder="请选择分类"
+            >
+              <el-option
+                v-for="item in typeData"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="16">
+          <el-form-item label="版本名称" prop="F_VersionName">
+            <el-input
+              v-model="ruleForm.F_VersionName"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="16">
+          <el-form-item label="版本号" prop="F_VersionCode">
+            <el-input
+              v-model="ruleForm.F_VersionCode"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="versionType">
+        <el-col :span="16">
+          <el-form-item
+            v-if="versionType"
+            label="上传附件"
+            prop="repairImageid"
+          >
+            <el-upload
+              :headers="headers"
+              :file-list="fileList"
+              :on-remove="handle_remove"
+              :on-success="handle_success"
+              :action="imgUrl"
+              :limit="1"
+              list-type="text"
+            >
+              <el-button size="small" type="primary">点击上传</el-button>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="!versionType">
+        <el-col :span="16">
+          <el-form-item label="ios链接地址" prop="F_Url">
+            <el-input v-model="ruleForm.F_Url" placeholder="请输入"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="16">
+          <el-form-item label="排序" prop="F_Sort">
+            <el-input v-model="ruleForm.F_Sort" placeholder="请输入"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="16">
+          <el-form-item label="备注" prop="F_Remarks">
+            <el-input
+              type="textarea"
+              v-model="ruleForm.F_Remarks"
+              placeholder="请输入备注"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-form-item>
+        <el-button type="primary" @click="submitForm">保存</el-button>
+        <el-button @click="resetForm">重置</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import {
+  getDeatil,
+  addData,
+  editData,
+} from "@/api/versionUpdate/versionUpdate";
+
+export default {
+  name: "AddOrEdit",
+  props: {
+    rowid: {
+      type: String,
+      default: "",
+    },
+    layerid: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      typeData: [
+        {
+          value: 0,
+          label: "安卓",
+        },
+        {
+          value: 1,
+          label: "ios",
+        },
+      ],
+      imgUrl:
+        this.$store.getters.serverConfig.BASE_API + "FaultRepair/UploadFile",
+      headers: {
+        Authorization: localStorage.getItem("Admin-Token"),
+      },
+      fileList: [],
+      versionType: true,
+      ruleForm: {
+        F_ID: "",
+        F_Type: 0, //	应用分类
+        F_VersionName: "", //	版本名称
+        F_VersionCode: "", //版本号
+        F_Files: "", //附件id
+        F_Url: "", //ios链接地址
+        F_Sort: "", //排序
+        F_Remarks: "", //备注
+      },
+      rules: {
+        F_Type: [
+          {
+            required: true,
+            message: "请选择分类",
+            trigger: "change",
+          },
+        ],
+        F_VersionName: [
+          {
+            required: true,
+            message: "请输入版本名称",
+            trigger: "change",
+          },
+        ],
+        F_VersionCode: [
+          {
+            required: true,
+            message: "请输入版本号",
+            trigger: "change",
+          },
+        ],
+      },
+      loading: false,
+    };
+  },
+  created() {
+    if (this.rowid) {
+      this.ruleForm.F_Id = this.rowid;
+      this.getDetail(this.rowid);
+    }
+  },
+  methods: {
+    typechange(value) {
+      console.log(value);
+      if (value === 0) {
+        this.versionType = true;
+      } else if (value === 1) {
+        this.versionType = false;
+      }
+    },
+    handle_remove(res) {
+      this.ruleForm.F_Files = "";
+    },
+    handle_success(res) {
+      this.ruleForm.F_Files += res.data[0].F_FileId;
+    },
+    submitForm() {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          this.loading = true;
+          const datas = {
+            F_ID: this.ruleForm.F_ID, //  主键id
+            F_Type: this.ruleForm.F_Type, //	应用分类
+            F_VersionName: this.ruleForm.F_VersionName, //	版本名称
+            F_VersionCode: this.ruleForm.F_VersionCode, //	版本号
+            F_Files: this.ruleForm.F_Files, //	附件id
+            F_Url: this.ruleForm.F_Url, //	ios链接地址
+            F_Sort: this.ruleForm.F_Sort, //	排序
+            F_Remarks: this.ruleForm.F_Remarks, //	备注
+          };
+
+          // 添加
+          if (!this.rowid) {
+            addData(datas)
+              .then((response) => {
+                this.loading = false;
+                if (response.state.toLowerCase() === "success") {
+                  this.fileList = [];
+                  this.ruleForm.F_Files = "";
+                  this.$parent.$layer.close(this.layerid);
+                  this.$parent.getList(); // 重新加载父级数据
+                  this.$message.success("恭喜你，添加成功!");
+                }
+              })
+              .catch(() => {
+                this.loading = false;
+              });
+          } else {
+            console.log(datas);
+            // 编辑
+            editData(datas)
+              .then((response) => {
+                this.loading = false;
+                if (response.state.toLowerCase() === "success") {
+                  this.fileList = [];
+                  this.ruleForm.F_Files = "";
+                  this.$parent.$layer.close(this.layerid);
+                  this.$parent.getList(); // 重新加载父级数据
+                  this.$message.success("恭喜你，编辑成功!");
+                }
+              })
+              .catch(() => {
+                this.loading = false;
+              });
+          }
+        } else {
+          this.$message.error("请输入有效的必填项信息!");
+          return false;
+        }
+      });
+    },
+    resetForm() {
+      this.$refs.ruleForm.resetFields();
+    },
+
+    // 获取详情
+    getDetail(rid) {
+      getDeatil(rid).then((response) => {
+        if (response.state.toLowerCase() === "success") {
+          const res = response.rows[0];
+          this.ruleForm.F_ID = res.F_ID; //主键id
+          this.ruleForm.F_Type = res.F_Type; //应用分类
+          this.versionType = !res.F_Type;
+          this.ruleForm.F_VersionName = res.F_VersionName; //版本名称
+          this.ruleForm.F_VersionCode = res.F_VersionCode; //版本号
+          this.ruleForm.F_Files = res.F_Files; //附件id
+          this.ruleForm.F_Url = res.F_Url; //ios链接地址
+          this.ruleForm.F_Sort = res.F_Sort; //排序
+          this.ruleForm.F_Remarks = res.F_Remarks; //备注
+          if (res.FileUrl) {
+            for (var i = 0; i < res.FileUrl.length; i++) {
+              this.ruleForm.repairImageid += res.FileUrl[i].F_FileId + ",";
+              this.fileList.push({
+                F_FileId: res.FileUrl[i].F_FileId,
+                name: res.FileUrl[i].F_FileName,
+                url: res.FileUrl[i].F_FileUrl,
+              });
+            }
+          }
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>

CallCenterWeb.UI/RMYY/src/views/versionUpdate/versionUpdate/index.vue

@@ -0,0 +1,219 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <el-input
+        v-model="keyword"
+        placeholder="请输入关键词"
+        class="filter-item"
+      />
+      <el-button
+        type="primary"
+        class="filter-item"
+        icon="el-icon-search"
+        @click="btn_search"
+        >搜索</el-button
+      >
+      <el-button
+        type="primary"
+        class="filter-item"
+        icon="el-icon-plus"
+        @click="btn_add"
+        >添加</el-button
+      >
+    </div>
+    <el-table v-loading="loading" :data="dataLists" border stripe>
+      <el-table-column
+        type="index"
+        label="编号"
+        align="center"
+        fixed
+        width="80"
+      />
+      <el-table-column label="应用分类" align="center">
+        <template slot-scope="scope">{{
+          scope.row.F_Type | typeFilter
+        }}</template>
+      </el-table-column>
+      <el-table-column
+        :show-overflow-tooltip="true"
+        prop="F_VersionName"
+        label="版本名称"
+        align="center"
+      />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        prop="F_VersionCode"
+        label="版本号"
+        align="center"
+      />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        label="下载地址"
+        align="center"
+      >
+        <template slot-scope="scope">
+          <el-link
+            :href="scope.row.FileUrl[0].F_FileUrl"
+            v-if="scope.row.FileUrl.length && !scope.row.F_Type"
+            type="primary"
+            :download="scope.row.FileUrl[0].F_FileUrl"
+            >{{ scope.row.FileUrl[0].F_FileName }}</el-link
+          >
+          <el-link
+            :href="scope.row.F_Url"
+            v-if="scope.row.F_Url && scope.row.F_Type"
+            type="primary"
+            target="_blank"
+            >{{ scope.row.F_Url }}</el-link
+          >
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        label="操作"
+        width="180"
+        align="center"
+        class-name="oparate_btn"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            plain
+            type="primary"
+            @click="btn_edit(scope.row.F_ID)"
+            >编辑</el-button
+          >
+          <el-button
+            size="mini"
+            plain
+            type="danger"
+            @click="btn_delete(scope.row.F_ID)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="pageParams.total > 0"
+      :total="pageParams.total"
+      :pageindex.sync="pageParams.pageindex"
+      :pagesize.sync="pageParams.pagesize"
+      class="pagination"
+      @pagination="getList"
+    />
+  </div>
+</template>
+<script>
+import { getList, deleteData } from "@/api/versionUpdate/versionUpdate";
+import addOrEdit from "./cpns/addOrEdit";
+// import detail from './components/detail'
+
+import Pagination from "@/components/context/Pagination";
+
+export default {
+  name: "vehicleManagement",
+  components: {
+    Pagination,
+  },
+  data() {
+    return {
+      loading: false,
+      keyword: "",
+      pageParams: {
+        pageindex: 1, //Number(this.$store.getters.serverConfig.PAGESIZE)
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE),
+        total: 0,
+      },
+      dataLists: [],
+    };
+  },
+  created() {
+    this.getList();
+    document.onkeyup = (e) => {
+      if (e.keyCode === 13) {
+        this.getList();
+      }
+    };
+  },
+  filters: {
+    // 应用分类
+    typeFilter(status) {
+      const statusMap = {
+        0: "安卓",
+        1: "ios",
+      };
+      return statusMap[status];
+    },
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      return new Promise((resolve) => {
+        const params = {
+          pageindex: this.pageParams.pageindex, // 第几页
+          pagesize: this.pageParams.pagesize, // 每页几条信息
+
+          keywords: this.keyword.replace(/\s+/g, ""),
+        };
+        getList(params).then((response) => {
+          this.loading = false;
+          if (response.rows) {
+            this.pageParams.total = response.total;
+            this.dataLists = response.rows;
+          } else {
+            this.dataLists = [];
+          }
+        });
+        resolve();
+      });
+    },
+    btn_search() {
+      this.pageParams.pageindex = 1;
+      this.getList();
+    },
+    btn_add() {
+      this.$layer.iframe({
+        content: {
+          content: addOrEdit, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: "" },
+        },
+        area: ["60%", "500px"],
+        title: "添加",
+      });
+    },
+    btn_edit(editId) {
+      this.$layer.iframe({
+        content: {
+          content: addOrEdit, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: editId.toString() }, // props
+        },
+        area: ["60%", "500px"],
+        title: "编辑",
+      });
+    },
+    btn_delete(editId) {
+      this.$confirm("您确定要删除此信息吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          deleteData(editId).then((response) => {
+            if (response.state.toLowerCase() === "success") {
+              this.getList();
+              this.$message.success("删除成功!");
+            }
+          });
+        })
+        .catch(() => {
+          this.$message.info("已取消删除");
+        });
+    },
+  },
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>

CallCenterWeb.UI/RMYYAPP/config/constData.config.js

@@ -20,15 +20,16 @@ export default {
 		}],
 		// 管理员
 		administratorList: [
-			
+
+
 			
 			{
-				id: "1",
-				imagePath: "../../static/icon_repair.png",
-				imageBg: "#fe940a",
-				text: "维修工单", //WorkOrder/GetLDDealList
-				navigateToUrl: "/pages/myTask/repairList/repairList?segmenter=0",
-			},
+					id: "1",
+					imagePath: "../../static/icon_repair.png",
+					imageBg: "#fe940a",
+					text: "维修工单", //WorkOrder/GetLDDealList
+					navigateToUrl: "/pages/myTask/repairList/repairList?segmenter=0",
+				},
 			{
 				id: "2",
 				imagePath: "../../static/icon_leasing.png",
@@ -153,13 +154,22 @@ export default {
 			}
 		],
 		// 基础工单
-		applyRepairList: [{
-			id: "11",
-			imagePath: "../../static/reppair.png",
-			imageBg: "#1ccd8d",
-			text: "故障报修", //WorkOrder/GetLDDealList
-			navigateToUrl: "/pages/myTask/repairList/myRepairOrderList/myRepairOrderList?segmenter=0&urlIndex=0",
-		}, {
+		applyRepairList: [
+		// 	{
+		// 	id: "11",
+		// 	imagePath: "../../static/reppair.png",
+		// 	imageBg: "#1ccd8d",
+		// 	text: "故障报修", //WorkOrder/GetLDDealList
+		// 	navigateToUrl: "/pages/myTask/repairList/myRepairOrderList/myRepairOrderList?segmenter=0&urlIndex=0",
+		// }, 
+		{
+				id: "1",
+				imagePath: "../../static/icon_repair.png",
+				imageBg: "#fe940a",
+				text: "维修工单", //WorkOrder/GetLDDealList
+				navigateToUrl: "/pages/myTask/repairList/repairList?segmenter=0",
+			},
+		{
 			id: "2",
 			imagePath: "../../static/consult.png",
 			imageBg: "#1ccd8d",

CallCenterWeb.UI/RMYYAPP/config/index.config.js

@@ -3,8 +3,8 @@ const CONFIG = {
     development: {
         assetsPath: '/static', // 静态资源路径
 				// baseUrl: 'http://192.168.8.10:8033/',
-				baseUrl: 'https://zyfb.zzrmyy.com/', // 本地外网地址
-				// baseUrl: 'http://39.164.159.192:8000/', // 本地外网地址s
+				// baseUrl: 'https://zyfb.zzrmyy.com/', // 本地外网地址
+				baseUrl: 'http://39.164.159.192:8000/', // 本地外网地址s
 		// baseUrl: 'http://172.16.10.22:8000/',	
         hostUrl: '', // H5地址(前端运行地址)
         weixinAppId: '' // 微信公众号appid

CallCenterWeb.UI/RMYYAPP/manifest.json

@@ -2,7 +2,7 @@
     "name" : "郑州人民医院综合服务保障调度平台",
     "appid" : "__UNI__5A5207D",
     "description" : "",
-    "versionName" : "1.2.12",
+    "versionName" : "1.2.13",
     "versionCode" : 1211,
     "transformPx" : false,
     /* 5+App特有相关 */

CallCenterWeb.UI/RMYYAPP/pages/login/login.vue

@@ -90,7 +90,7 @@
 						
 						const code = uni.getStorageSync("roleCode"); 
 						 // ||code == 'GLY' || code == 'DDZX'
-						if(code == 'WXY' || code == 'DDZX' || code == 'jcgn'  || code == 'GQY' || code == 'SJ' || code == 'WXBZZ' || code == 'APRY' || code == 'APRY') {
+						if(code == 'WXY' || code == 'DDZX'|| code == 'GLY' || code == 'jcgn'  || code == 'GQY' || code == 'SJ' || code == 'WXBZZ' || code == 'APRY' || code == 'APRY') {
 							uni.switchTab({
 								url: '/pages/myTask/myTask'
 							});

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

@@ -86,7 +86,7 @@
 					});	
 				}, 5000)
 				
-				this.upData()
+				// this.upData()
 				// #endif
 				this.bannnerData = this.$mConstDataConfig.bannnerData
 				this.getMenuPermissions() //获取用户权限
@@ -146,33 +146,37 @@
 				});
 				let typeUp = ''
 				if (plus.device.model.indexOf('iPhone') > -1) {
-					typeUp='ios'; 
+					typeUp=1; 
 				}else{
-					typeUp='android'; 
+					typeUp=0; 
 				}
 				const params = {
-					versionName: typeUp,
+					type:typeUp,
+					isNew: true, 
 				}
-				this.$http.get('/ApplicationsRefresh/GetAllList', params).then((response) => {
-					if (response.rows.length > 0) {
-						let data = response.rows
+				this.$http.get('/ApplicationsVersion/GetAndroid', params).then((response) => {
+					if (response.state == "success") {
+						let data = response.data
+						console.log(data)
+						//NewCode_ = data.data.F_VersionCode; 
 						const nowVersionCode = uni.getStorageSync('versionCode')
-						const serveVersionCode = data[0].F_VersionCode
+						const serveVersionCode = data.F_VersionCode
 						console.log(nowVersionCode + "---" +serveVersionCode)
 						if (nowVersionCode !== serveVersionCode) {
-							if(typeUp === 'android'){
+							if(typeUp === 0){
 								uni.showModal({
 									title: '更新',
 									content: '是否更新',
 									success: function (res) {
 										if (res.confirm) {
-											plus.runtime.openURL(data[0].F_DownUrl);
+											console.log(data.F_FileUrl)
+											plus.runtime.openURL(data.FileUrl[0].F_FileUrl);
 										} else if (res.cancel) {
 											this.$mHelper.toast("取消更新");
 										}
 									}
 								});
-							}else if(typeUp === 'ios'){
+							}else if(typeUp === 1){
 								plus.runtime.openURL('https://apps.apple.com/cn/app/%E9%83%91%E5%B7%9E%E4%BA%BA%E6%B0%91%E5%8C%BB%E9%99%A2%E7%BB%BC%E5%90%88%E6%9C%8D%E5%8A%A1%E4%BF%9D%E9%9A%9C%E8%B0%83%E5%BA%A6%E5%B9%B3%E5%8F%B0/id6444557705');
 							}
 							

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

@@ -19,14 +19,20 @@
 					<uni-easyinput disabled v-model="valiFormData.F_ProposerName" v-if="detpReadonly" />
 					<!-- <uni-data-select v-model="valiFormData.needman" :localdata="ApplicantData" @change="changeApplicant" /> -->
 				</uni-forms-item>
-				<uni-forms-item label="联系电话" required name="Phone">
+				<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-easyinput v-model="valiFormData.contact" placeholder="请输入联系人" />
+				</uni-forms-item>
+				<uni-forms-item label="联系电话" required name="contactnumber">
+					<uni-easyinput v-model="valiFormData.contactnumber" placeholder="请输入联系电话" />
+				</uni-forms-item>
 				<uni-forms-item label="车辆要求" required name="cartype">
 					<uni-data-select v-model="valiFormData.cartype" :localdata="cartypeData" />
 				</uni-forms-item>
-				<uni-forms-item label="调度内容" name="content">
-					<uni-easyinput type="textarea" v-model="valiFormData.content" placeholder="请输入调度内容" />
+				<uni-forms-item label="工单内容" name="content">
+					<uni-easyinput type="textarea" v-model="valiFormData.content" placeholder="请输入工单内容" />
 				</uni-forms-item>
 				<uni-forms-item label="科室位置" required name="startplace">
 					<uni-easyinput v-model="valiFormData.startplace" placeholder="请输入科室位置" />
@@ -86,13 +92,15 @@
 					F_ProposerDeptName:'',
 					F_ProposerName:'',
 					needman: '', //申请人
-					phone: '', //电话
+					Phone: '', //电话
+					contact: "",
+					contactnumber: "",
 					cartype:'',	//	车辆类型
 					content: '', // 调度内容
 					startplace:'', // 出发地
 					endplace:'', // 目的地
 					usertime:'',	//	用车时间
-					birth:0,	//	是否新生儿转运0否1是
+					birth:1,	//	是否新生儿转运0否1是
 					remark:'',	//	备注
 					EmergencyTypes: '一般',
 					dispatch:''
@@ -139,9 +147,30 @@
 					Phone: {
 						rules: [{
 							required: true,
-							errorMessage: '请输入联系电话'
+							errorMessage: '请输入正确的电话号码'
+						},
+						{ 
+							pattern: "^[1][3,4,5,6,7,8,9][0-9]{9}$", 
+							errorMessage: "请输入正确的手机号码", 
+						},
+						]
+					}, 
+					contact: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入联系人'
 						}]
 					},
+					contactnumber: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入正确的电话号码'
+						},
+						{
+							pattern: "^[1][3,4,5,6,7,8,9][0-9]{9}$", 
+							errorMessage: "请输入正确的手机号码", 
+						},]
+					},
 					cartype: {
 						rules: [{
 							required: true,
@@ -300,14 +329,21 @@
 			submit(ref) {
 				this.disabledButton = false
 				this.$refs[ref].validate().then(res => {
+					if(this.valiFormData.birth ===0&&this.valiFormData.content ===""){
+						this.$mHelper.toast('请输入工单内容') 
+						return
+					}
 					const params = {
 						type: this.valiFormData.WorkOrderCategory, //工单类型
 						hosid: this.valiFormData.hosid, //申请院区
 						detpid: this.valiFormData.detpid.split('_')[1], //申请部门
 						needman: this.valiFormData.needman, //申请人
 						phon: this.valiFormData.Phone, //电话
+						contact: this.valiFormData.contact, //联系人
+						contactnumber: this.valiFormData.contactnumber, //联系电话
+
 						cartype: this.valiFormData.cartype, //车辆类型
-						content: this.valiFormData.content, //调度内容
+						content: this.valiFormData.content, //工单内容
 						startplace: this.valiFormData.startplace, //出发地
 						endplace: this.valiFormData.endplace, //目的地
 						usertime: this.valiFormData.usertime, //用车时间
@@ -317,6 +353,7 @@
 						EmergencyTypes: this.valiFormData.EmergencyTypes,
 						dispatch:this.valiFormData.dispatch
 					}
+
 					if(this.workorderid){
 						this.$mHelper.httpPost("T_Car_WorkOrder/UpdateWorkOrder", params, 2,res=>this.disabledButton=res)
 					}else{
@@ -348,6 +385,9 @@
 							this.valiFormData.F_ProposerName = this.detailContentData.F_ProposerName.toString() //申请人姓名
 							
 							this.valiFormData.Phone = this.detailContentData.F_Phon //电话
+							this.valiFormData.contact = this.detailContentData.F_Contact //联系人
+							this.valiFormData.contactnumber = this.detailContentData.F_ContactNumber //联系人电话
+							
 							this.valiFormData.cartype = this.detailContentData.F_CarType.toString() //车辆类型 F_CarType F_CarName 
 							this.valiFormData.content = this.detailContentData.F_Content //调度内容
 							this.valiFormData.startplace = this.detailContentData.F_DepartPlace //出发地

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

@@ -3,8 +3,14 @@
 		<page-meta :root-font-size="getFontSizeValue"></page-meta>
 		<view class="wrapper">
 
-			<view class="uniStep" v-if="listFlag">
+			<view class="uniStep" v-if="listFlag" style="display: flex;">
+				<uni-icons type="left" style="margin-left: 20px; color: #1e90ff;" size="30" @click="changeListSub"></uni-icons>
 				<uni-steps :options="list1" :active="active" />
+				<uni-icons type="right" style="margin-right: 20px; color: #1e90ff;" size="30" @click="changeListAdd"></uni-icons>
+				<!-- <div style="margin: 15px 0px 0px 0px; display: flex;">
+					<button type="primary" size="mini" style="text-align: left; margin-left: 15px;">左移</button>
+					<button type="primary" size="mini" style="text-align: right; margin-right: 15px;">右移</button>
+				</div> -->
 			</view>
 
 			<view class="detailContent">
@@ -31,13 +37,25 @@
 						class="contentText">{{ $mHelper.findUserName(userCodeList, detailContentData.F_ProposerCode ) }}</text>
 				</view>
 				<view class="contentTable">
-					<text class="contentTitle">联系电话：</text>
+					<text class="contentTitle">申请人电话：</text>
 					<text class="contentText" style="margin-top: -5px;">{{ detailContentData.F_Phon  }}
 						<uni-icons @click="callHandle(detailContentData.F_Phon)" class="frContentText" type="phone"
 							size="30"></uni-icons>
 					</text>
 				</view>
 				<view class="contentTable">
+					<text class="contentTitle">联系人：</text>
+					<text class="contentText" style="margin-top: -5px;">{{ detailContentData.F_Contact  }}
+					</text>
+				</view>
+				<view class="contentTable">
+					<text class="contentTitle">联系电话：</text>
+					<text class="contentText" style="margin-top: -5px;">{{ detailContentData.F_ContactNumber  }}
+						<uni-icons @click="callHandle(detailContentData.F_ContactNumber)" class="frContentText" type="phone"
+							size="30"></uni-icons>
+					</text>
+				</view>
+				<view class="contentTable">
 					<text class="contentTitle">工单内容：</text>
 					<text class="contentText">{{ detailContentData.F_Content }}</text>
 				</view>
@@ -158,6 +176,25 @@
 				if (res.state.toLowerCase() === "success") this.orderTypeList = res.data
 				console.log(this.orderTypeList, 'this.orderTypeList')
 			},
+			changeListAdd(){
+				if (this.active < this.list1.length - 1) {
+					this.active += 1
+				} else {
+					this.active = 0
+				}
+				this.workorderid = this.list1[this.active].workid
+				this.getDetail(3)
+			},
+			changeListSub(){
+				if (this.active ===0) {
+					this.active = this.list1.length - 1
+				} else {
+					this.active -= 1
+				}
+				console.log(this.list1[this.active].workid)
+				this.workorderid = this.list1[this.active].workid
+				this.getDetail(3)
+			},
 			callHandle(phone) {
 				if (!phone) {
 					this.$mHelper.toast('无号码信息')
@@ -209,14 +246,17 @@
 							// }
 
 						} else if (type === 3) {
-							let activeFlag = 0
+							// let activeFlag = 0
+							this.list1 = []
+							this.workOrderButton = []
 							response.Carlist.forEach((ele) => {
-								this.active = activeFlag
-								if (ele.Buttons.length === 0) {
-									activeFlag++
-								}
+								// this.active = activeFlag
+								// if (ele.Buttons.length === 0) {
+								// 	activeFlag++
+								// }
 								const obj = {}
-								obj.title = ele.F_WorkOrderCode
+								obj.workid = ele.F_WorkOrderCode
+								obj.title = ""
 								this.list1.push(obj)
 							})
 							this.detailContentData = response.Carlist[this.active]
@@ -244,6 +284,7 @@
 								this.orderButtonData = this.workOrderButton
 							});
 						}
+						console.log(this.orderButtonData)
 						pageData.getApplicant(this.detailContentData.F_ProposerDeptId, (res) => {
 							this.userCodeList = res
 						})

CallCenterWeb.UI/RMYYAPP/unpackage/cache/certdataios

@@ -1,3 +1,3 @@
-iosProfile=D:/YJF_work/五院/CallCenterWeb.UI/4.0/正式/wuyuan (2).mobileprovision
-ioscertFile=D:/YJF_work/五院/CallCenterWeb.UI/4.0/正式/证书.p12
+iosProfile=E:/desktopFile/证书/RMYY证书/ios/4.0/正式/wuyuan (2).mobileprovision
+ioscertFile=E:/desktopFile/证书/RMYY证书/ios/4.0/正式/证书.p12
 ioscertPassword=LN4Bq2cDrCPQMwql//0+Pw==