工单管理

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

@@ -125,6 +125,7 @@
           dialog_zhipai: false,
           dialog_chehuibianji: false,
           dialog_bianji: false,
+          dialog_ywzx_bianji: false,
           dialog_ywzx_chuli: false,
           dialog_ywzx_jiedan: false,
           dialog_ywzx_tuihui: false,
@@ -275,7 +276,7 @@
               var params = {
                 workordercode: this.wocode
               }
-            }       
+            }
             option.action(params).then((response) => {
               console.log('处理结果')
               if (response.state === 'success') {

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

@@ -1,218 +1,224 @@
 <template>
-  <el-cascader ref="cascader" v-model="orderType" :options="orderData" :props="TagProps" clearable style="width:100%;" @change="handleChange" />
+  <el-cascader ref="cascader" v-model="orderType" :options="orderData" :props="TagProps" clearable style="width:100%;"
+    @change="handleChange" />
 </template>
 
 <script>
-import {
-  getOrderTypeList
-} from '@/api/commonAPI'
-import { getOrderTypeLists } from '@/api/systemSetup/roleSetting/orderTypeManage'
-import {
-  eventBus
-} from './eventBus.js'
-export default {
-  name: 'SelectOrderType',
-  filters: {
-    orderFilter(status) {
-      const statusMap = {
-        // 2003: true,
-        // 2008: true,
-        // 2009: true
-      }
-      return statusMap[status]
-    }
-  },
-  props: {
-    firstOrderType: {
-      type: Object,
-      default() {
-        return {}
+  import {
+    getOrderTypeList
+  } from '@/api/commonAPI'
+  import {
+    getOrderTypeLists
+  } from '@/api/systemSetup/roleSetting/orderTypeManage'
+  import {
+    eventBus
+  } from './eventBus.js'
+  export default {
+    name: 'SelectOrderType',
+    filters: {
+      orderFilter(status) {
+        const statusMap = {
+          // 2003: true,
+          // 2008: true,
+          // 2009: true
+        }
+        return statusMap[status]
       }
     },
-    secondOrderType: {
-      type: Object,
-      default() {
-        return {}
+    props: {
+      firstOrderType: {
+        type: Object,
+        default () {
+          return {}
+        }
+      },
+      secondOrderType: {
+        type: Object,
+        default () {
+          return {}
+        }
+      },
+      thirdOrderType: {
+        type: Object,
+        default () {
+          return {}
+        }
+      },
+      orderTypeparams: {
+        type: Array,
+        default () {
+          return []
+        }
+      },
+      r2type:{
+        type:String,
+        default:''
       }
     },
-    thirdOrderType: {
-      type: Object,
-      default() {
-        return {}
+    data() {
+      return {
+        TagProps: {
+          checkStrictly: true,
+          value: 'id',
+          label: 'text',
+          children: 'children',
+        },
+        orderTypeData: {
+          name: '',
+          value: 0,
+          identification: '',
+          type2Arr: []
+        },
+        typeid: 1,
+        pid: 0,
+        orderData: [], // 业务类别数据
+        orderType: []
       }
     },
-    orderTypeparams:{
-      type: Array,
-      default() {
-        return []
-      }
-    }
-  },
-  data() {
-    return {
-      TagProps: {
-        checkStrictly: true,
-        value: 'id',
-        label: 'text',
-        children: 'children',
-      },
-      orderTypeData: {
-        name: '',
-        value: 0,
-        identification:'',
-        type2Arr:[]
+    watch: {
+      orderTypeparams(val) {
+        this.orderType = val
       },
-      typeid: 1,
-      pid: 0,
-      orderData: [], // 业务类别数据
-      orderType:[]
-    }
-  },
-  watch: {
-    orderTypeparams(val){
-      this.orderType = val
-    },
-    'firstOrderType.pid': function() {
-      // console.log(this.firstOrderType)
-      this.orderTypeData.name = ''
-      this.orderTypeData.value = 0
-      this.$emit('post-first-order-type', this.orderTypeData)
-      this.typeid = this.firstOrderType.typeid
-      this.commonOrderType(this.firstOrderType.typeid, this.firstOrderType.pid)
-    },
-    'secondOrderType.pid': function() {
-      // console.log(this.secondOrderType.pid)
-      this.orderTypeData.name = ''
-      this.orderTypeData.value = 0
-      this.$emit('post-second-order-type', this.orderTypeData)
-      this.typeid = this.secondOrderType.typeid
-      this.commonOrderType(this.secondOrderType.typeid, this.secondOrderType.pid)
-    },
-    'thirdOrderType.pid': function() {
-      this.orderTypeData.name = ''
-      this.orderTypeData.value = 0
-      this.$emit('post-third-order-type', this.orderTypeData)
-      this.typeid = this.thirdOrderType.typeid
-      this.commonOrderType(this.thirdOrderType.typeid, this.thirdOrderType.pid)
-    }
-
-  },
-  created() {
-    // 默认数据加载
-    this.defaultData()
-    // 编辑详情展示
-    this.showDetail()
-
-    this.getEventBus()
-    // if(this.orderTypeData.name==''){
-    //   console.log(this.orderTypeData)
-    //   this.getTreeList(1000)
-    // }
-  },
-  methods: {
-    getEventBus() {
-      eventBus.$on('typeId', (data) => {
-        // console.log(data);
-        this.secondOrderType.pid = data
-      })
-    },
-    defaultData() {
-      if (JSON.stringify(this.firstOrderType) !== '{}') {
-        console.log(this.firstOrderType)
-        console.log(JSON.stringify(this.firstOrderType))
+      'firstOrderType.pid': function() {
+        this.orderTypeData.name = ''
+        this.orderTypeData.value = 0
+        this.$emit('post-first-order-type', this.orderTypeData)
+        this.typeid = this.firstOrderType.typeid
         this.commonOrderType(this.firstOrderType.typeid, this.firstOrderType.pid)
-      }
-      if (JSON.stringify(this.thirdOrderType) !== '{}' && this.thirdOrderType.pid) {
-        this.typeid = this.thirdOrderType.typeid
-        this.commonOrderType(this.thirdOrderType.typeid, this.thirdOrderType.pid)
-      }
-      if (JSON.stringify(this.secondOrderType) !== '{}' && this.secondOrderType.pid) {
+      },
+      'secondOrderType.pid': function() {
+        this.orderTypeData.name = ''
+        this.orderTypeData.value = 0
+        this.$emit('post-second-order-type', this.orderTypeData)
         this.typeid = this.secondOrderType.typeid
         this.commonOrderType(this.secondOrderType.typeid, this.secondOrderType.pid)
+      },
+      'thirdOrderType.pid': function() {
+        this.orderTypeData.name = ''
+        this.orderTypeData.value = 0
+        this.$emit('post-third-order-type', this.orderTypeData)
+        this.typeid = this.thirdOrderType.typeid
+        this.commonOrderType(this.thirdOrderType.typeid, this.thirdOrderType.pid)
       }
+
     },
-    showDetail() {
-      if (this.firstOrderType.name) {
-        this.orderTypeData.name = this.firstOrderType.name
-      }
-      if (this.secondOrderType.name) {
-        this.orderTypeData.name = this.secondOrderType.name
-      }
-      if (this.thirdOrderType.name) {
-        this.orderTypeData.name = this.thirdOrderType.name
+    created() {
+      // 默认数据加载
+      this.defaultData()
+      // 编辑详情展示
+      this.showDetail()
+
+      this.getEventBus()
+      
+      if(this.r2type){
+        var arr = this.$store.getters.workTypeMap[parseInt(this.r2type)].ids
+        this.orderType = arr.slice(1)
       }
     },
-    commonOrderType(id, pid) {
-      console.log(pid)
-      this.getTreeList(pid)
-    },
-    getTreeList(pid) {
-      return new Promise((resolve) => {
-        const params = {
-          pid: pid,
-          flag: 1
+    methods: {
+      getEventBus() {
+        eventBus.$on('typeId', (data) => {
+          // console.log(data);
+          this.secondOrderType.pid = data
+        })
+      },
+      defaultData() {
+        if (JSON.stringify(this.firstOrderType) !== '{}') {
+          console.log(this.firstOrderType)
+          console.log(JSON.stringify(this.firstOrderType))
+          this.commonOrderType(this.firstOrderType.typeid, this.firstOrderType.pid)
+        }
+        if (JSON.stringify(this.thirdOrderType) !== '{}' && this.thirdOrderType.pid) {
+          this.typeid = this.thirdOrderType.typeid
+          this.commonOrderType(this.thirdOrderType.typeid, this.thirdOrderType.pid)
+        }
+        if (JSON.stringify(this.secondOrderType) !== '{}' && this.secondOrderType.pid) {
+          this.typeid = this.secondOrderType.typeid
+          this.commonOrderType(this.secondOrderType.typeid, this.secondOrderType.pid)
+        }
+      },
+      showDetail() {
+        if (this.firstOrderType.name) {
+          this.orderTypeData.name = this.firstOrderType.name
+        }
+        if (this.secondOrderType.name) {
+          this.orderTypeData.name = this.secondOrderType.name
+        }
+        if (this.thirdOrderType.name) {
+          this.orderTypeData.name = this.thirdOrderType.name
         }
-        getOrderTypeLists(params).then((response) => {
-          if (response.state.toLowerCase() === 'success') {
-            this.orderData = response.data
+      },
+      commonOrderType(id, pid) {
+        // console.log(id,pid)
+        this.getTreeList(pid)
+      },
+      getTreeList(pid) {
+        return new Promise((resolve) => {
+          const params = {
+            pid: pid,
+            flag: 1
           }
+          getOrderTypeLists(params).then((response) => {
+            if (response.state.toLowerCase() === 'success') {
+              this.orderData = response.data
+            }
+          })
+          resolve()
         })
-        resolve()
-      })
-    },
-    filterTreeDatas(treeDatas) {
-      const accessedRouters = []
-      let j = -1
-      for (const i in treeDatas) {
-        j++
-        accessedRouters.push({
-          id: treeDatas[i].id,
-          label: treeDatas[i].text,
-          typeId: treeDatas[i].TypeId,
-          children: []
-        })
-        if (treeDatas[i].children) {
-          accessedRouters[j].children = this.filterTreeDatas(treeDatas[i].children)
+      },
+      filterTreeDatas(treeDatas) {
+        const accessedRouters = []
+        let j = -1
+        for (const i in treeDatas) {
+          j++
+          accessedRouters.push({
+            id: treeDatas[i].id,
+            label: treeDatas[i].text,
+            typeId: treeDatas[i].TypeId,
+            children: []
+          })
+          if (treeDatas[i].children) {
+            accessedRouters[j].children = this.filterTreeDatas(treeDatas[i].children)
+          }
         }
-      }
-      return accessedRouters
-    },
-    handleChange(data) {
-      console.log(Number(data[data.length - 1]))
-      this.orderTypeData.value = Number(data[data.length - 1])
-      this.orderTypeData.name = this.$refs["cascader"].getCheckedNodes()[0].label
-      this.orderTypeData.identification = Number(this.$refs["cascader"].getCheckedNodes()[0].data.identification)
-      this.orderTypeData.type2Arr = data
-      console.log(this.orderTypeData)
-      switch (this.typeid) {
-        case 1:
-          this.$emit('post-first-order-type', this.orderTypeData)
-          break
-        case 2:
-          this.$emit('post-second-order-type', this.orderTypeData)
-          break
-        case 3:
-          this.$emit('post-third-order-type', this.orderTypeData)
-          break
-      }
-    },
-    // changedOrderType(data) {
-    //   this.orderTypeData.value = data
-    //   this.orderTypeData.name = data ? this.orderData.find(ele => ele.fid === data).text : ''
-    //   switch (this.typeid) {
-    //     case 1:
-    //       this.$emit('post-first-order-type', this.orderTypeData)
-    //       break
-    //     case 2:
-    //       this.$emit('post-second-order-type', this.orderTypeData)
-    //       break
-    //     case 3:
-    //       this.$emit('post-third-order-type', this.orderTypeData)
-    //       break
-    //   }
-    // }
+        return accessedRouters
+      },
+      handleChange(data) {
+        console.log(Number(data[data.length - 1]))
+        this.orderTypeData.value = Number(data[data.length - 1])
+        this.orderTypeData.name = this.$refs["cascader"].getCheckedNodes()[0].label
+        this.orderTypeData.identification = Number(this.$refs["cascader"].getCheckedNodes()[0].data.identification)
+        this.orderTypeData.type2Arr = data
+        console.log(this.orderTypeData)
+        switch (this.typeid) {
+          case 1:
+            this.$emit('post-first-order-type', this.orderTypeData)
+            break
+          case 2:
+            this.$emit('post-second-order-type', this.orderTypeData)
+            break
+          case 3:
+            this.$emit('post-third-order-type', this.orderTypeData)
+            break
+        }
+      },
+      // changedOrderType(data) {
+      //   this.orderTypeData.value = data
+      //   this.orderTypeData.name = data ? this.orderData.find(ele => ele.fid === data).text : ''
+      //   switch (this.typeid) {
+      //     case 1:
+      //       this.$emit('post-first-order-type', this.orderTypeData)
+      //       break
+      //     case 2:
+      //       this.$emit('post-second-order-type', this.orderTypeData)
+      //       break
+      //     case 3:
+      //       this.$emit('post-third-order-type', this.orderTypeData)
+      //       break
+      //   }
+      // }
+    }
   }
-}
 </script>
 
 <style lang="scss" scoped>

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

@@ -4,11 +4,11 @@
 
       <!--工单类型 -->
       <el-col :span="24">
-        <order-type :rtype='rtype' @order-type-data="getOrderTypeData" />
+        <order-type :rtype='rtype' :r2type='r2type' @order-type-data="getOrderTypeData" />
       </el-col>
       <!--业务咨询工单 -->
       <el-col v-if="orderTypeData.F_Type1===1000" :span="22">
-        <add-or-edit-inf-order :callid='callid' :order-type-data="orderTypeData" :person-parms-data="personParmsData"/>
+        <add-or-edit-inf-order :wid='wid' :callid='callid' :order-type-data="orderTypeData" :person-parms-data="personParmsData"/>
       </el-col>
       <!-- 综合调度 -->
       <el-col v-if="orderTypeData.F_Type1===2000" :span="22">
@@ -91,6 +91,10 @@ export default {
       type:String,
       default:''
     },
+    r2type:{
+      type:String,
+      default:''
+    },
     iswomanage:{
       type:String,
       default:''

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

@@ -14,7 +14,7 @@
 
             <el-col :span="20" v-if="isshowtype==true">
               <el-form-item label="工单类别" prop="F_Type2">
-                <select-order-type-two :second-order-type="secondOrderTypeParam"
+                <select-order-type-two :r2type='r2type' :second-order-type="secondOrderTypeParam"
                   @post-second-order-type="getSecondOrderType" />
               </el-form-item>
             </el-col>
@@ -36,6 +36,10 @@
         type:String,
         default:''
       },
+      r2type:{
+        type:String,
+        default:''
+      },
     },
     data() {
       return {
@@ -80,7 +84,8 @@
     computed: {
       ...mapGetters(['screenState'])
     },
-    created() {},
+    created() {
+    },
     methods: {
       // 一级改变时触发
       getFirstOrderType(data) {

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

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="24" style="padding: 0 10px;">
+    <el-row :gutter="24">
       <!-- <el-col :span="24">
       <div class="msgbox">客户信息</div>
       <el-card class="customer_info">
@@ -16,12 +16,12 @@
     </el-col> -->
       <!-- 添加工单 -->
       <el-col :span="24">
-        <el-card class="customer_info">
-          <div style="margin-bottom: 10px;">
-            <div class="msgbox"></div><span style="line-height: 30px;font-size: 14px;color: #333;">新建工单</span>
-          </div>
-          <add-or-edit-order :iswomanage="'1'" :callid="callinCallid" @order-type-data="getOrderTypeData" />
-        </el-card>
+        <!-- <el-card class="customer_info"> -->
+        <div style="margin-bottom: 10px;">
+          <div class="msgbox"></div><span style="line-height: 30px;font-size: 14px;color: #333;">新建工单</span>
+        </div>
+        <add-or-edit-order :iswomanage="'1'" :callid="callinCallid" @order-type-data="getOrderTypeData" />
+        <!-- </el-card> -->
       </el-col>
     </el-row>
   </div>
@@ -194,9 +194,12 @@
   }
 </style>
 <style rel="stylesheet/scss" lang="scss" scoped>
+  // .app-container {
+  //   margin: 0;
+  //   padding: 0;
+  // }
   .app-container {
-    margin: 0;
-    padding: 0;
+    padding: 15px 15px;
   }
 
   .msgbox {
@@ -265,7 +268,7 @@
   }
 
   .customer_info {
-    width: 99%;
+    width: 97%;
     margin: 15px auto 0 auto;
     border-radius: 4px;
 

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

@@ -193,7 +193,7 @@
             <el-col :span="12">
               <el-form-item label="接收人" prop="clid">
                 <el-select v-model="ruleForm.clid" placeholder="请选择接收人" style="width: 100%;" @change="changeRepairman1">
-                  <el-option v-for="item in repairman" :key="item.usercode" :label="item.username"
+                  <el-option v-for="item in repairman1" :key="item.usercode" :label="item.username"
                     :value="item.usercode" />
                 </el-select>
               </el-form-item>
@@ -233,14 +233,18 @@
         type: String,
         default: ''
       },
+      wid: {
+        type: String,
+        default: ''
+      },
       // callid:{
       //   type:String,
       //   default:''
       // },
-      rowid: {
-        type: Number,
-        default: 0
-      },
+      // rowid: {
+      //   type: Number,
+      //   default: 0
+      // },
       layerid: {
         type: String,
         default: ''
@@ -266,7 +270,7 @@
         typeid: 1,
         orderPid: 0,
         callid: window.localStorage.getItem('callidSave'),
-        OrderDetailFlag: false,
+        // OrderDetailFlag: false,
         deptidArr: [],
         repairman: [],
         deptidArr1: [],
@@ -440,7 +444,6 @@
     },
     computed: {
       ...mapGetters(['screenState'])
-
     },
     watch: {
       'orderTypeData.F_Type2': function() {
@@ -448,7 +451,7 @@
         this.ruleForm.F_Type2 = this.orderTypeData.F_Type2
         this.ruleForm.identification = this.orderTypeData.identification
         this.ruleForm.type2Arr = this.orderTypeData.type2Arr
-        console.log(this.orderTypeData, '999')
+        // console.log(this.orderTypeData, '999')
         if (this.orderTypeData.type2Arr[0] == '8023') {
           this.zpdptname = '建议部门'
           this.zppername = '建议人'
@@ -467,16 +470,23 @@
       if (this.callinNum) {
         this.ruleForm.telphone = this.callinNum
       }
-      if (this.rowid) {
+      // if (this.rowid) {
+      //   this.OrderDetail()
+      // } else {
+      //   this.OrderDetailFlag = true
+      //   setTimeout(() => {
+      //     this.genderParams()
+      //   }, 700)
+      // }
+      if (this.wid) {
+        this.OrderDetail()
+      }
+    },
+    mounted() {
+      if (this.wid) {
         this.OrderDetail()
-      } else {
-        this.OrderDetailFlag = true
-        setTimeout(() => {
-          this.genderParams()
-        }, 700)
       }
     },
-
     methods: {
       submitForm() {
         if (JSON.stringify(this.orderTypeData) !== '{}') {
@@ -521,7 +531,7 @@
               F_DealOpinions: this.ruleForm.F_DealOpinions // 处理意见
             }
             // 添加
-            if (!this.rowid) {
+            if (!this.wid) {
               addOrEdittOrder(data)
                 .then((response) => {
                   this.loading = false
@@ -605,7 +615,7 @@
           }
           GetPerson(params).then((res) => {
             if (state === 0) {
-              this.repairman = res.rows
+              this.repairman1 = res.rows
             } else if (state === 1) {
               this.assignman1 = res.rows
             }
@@ -709,10 +719,13 @@
       // 获取详情
       OrderDetail() {
         return new Promise((resolve) => {
-          GetOrderDetail(this.rowid).then((response) => {
+          const params = {
+            WorkOrderCode: this.wid
+          }
+          GetOrderDetail(params).then((response) => {
             this.loading = false
             if (response.state.toLowerCase() === 'success') {
-              const res = response.model
+              const res = response.data[0]
               if (res) {
                 this.rowid = res.F_ID
                 this.ruleForm.F_ID = res.F_ID
@@ -721,12 +734,13 @@
                 this.ruleForm.F_TypeName1 = res.typename1 // 工单类别
                 this.firstOrderTypeParam.name = res.typename1
                 this.ruleForm.F_Type2 = res.F_type2 // 工单子类
+                this.$emit('r2type', res.F_type2)
                 this.typeSecondState(res.F_type2)
                 this.ruleForm.F_TypeName2 = res.typename2 // 工单子类
                 this.secondOrderTypeParam.name = res.typename2
-                this.ruleForm.F_Type3 = res.F_type3 // 工单三类
-                this.ruleForm.F_TypeName3 = res.typename3 // 工单三类
-                this.thirdOrderTypeParam.name = res.typename3
+                // this.ruleForm.F_Type3 = res.F_type3 // 工单三类
+                // this.ruleForm.F_TypeName3 = res.typename3 // 工单三类
+                // this.thirdOrderTypeParam.name = res.typename3
                 this.ruleForm.F_Customer = res.F_Customer // 姓名
                 this.ruleForm.F_Sex = res.F_Sex.toString() // 性别
                 this.ruleForm.F_Phon = res.F_Phon // 电话
@@ -755,7 +769,39 @@
                 }
                 this.ruleForm.F_WorkOrderContents = res.F_WorkOrderContents // 工单内容
                 this.ruleForm.F_DealOpinions = res.F_DealOpinions // 处理意见
-                this.OrderDetailFlag = true
+                // this.OrderDetailFlag = true
+                this.ruleForm.F_FullName = res.F_FullName
+                this.ruleForm.F_IDNumber = res.F_IDNumber
+                this.ruleForm.F_Relationship = res.F_Relationship
+                if (res.F_type2) {
+                  this.ruleForm.type2Arr = this.$store.getters.workTypeMap[parseInt(res.F_type2)].ids.slice(1)
+                }
+                console.log(this.ruleForm.type2Arr, '99')
+                if (this.ruleForm.type2Arr[0] == '8023') {
+                  this.zpdptname = '建议部门'
+                  this.zppername = '建议人'
+                }
+                if (this.ruleForm.type2Arr[0] == '8015') {
+                  this.zpdptname = '投诉部门'
+                  this.zppername = '投诉人'
+                }
+                if (this.ruleForm.type2Arr[0] == '8031') {
+                  this.zpdptname = '表扬部门'
+                  this.zppername = '表扬人'
+                }
+                if (res.F_ComplaintDept) {
+                  this.deptidArr = this.$store.getters.deptmap[parseInt(res.F_ComplaintDept)].ids
+                  this.getRepairman(res.F_ComplaintDept, 0)
+                  this.ruleForm.F_ComplaintDept = res.F_ComplaintDept
+                  this.ruleForm.F_ComplaintUser = res.F_ComplaintUser
+                }
+                if (res.DealDept) {
+                  this.deptidArr1 = this.$store.getters.deptmap[parseInt(res.DealDept)].ids
+                  console.log(this.$store.getters.deptmap[parseInt(res.DealDept)].ids, '00000')
+                  this.getRepairman1(res.DealDept, 0)
+                  this.ruleForm.clbm = res.DealDept
+                  this.ruleForm.clid = res.DealUser
+                }
               }
             }
           })

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

@@ -45,10 +45,6 @@
                 <th>患者身份证号:</th>
                 <td>{{orderDetailData.F_IDNumber}}</td>
               </tr>
-              <!-- <tr v-show="isFamily">
-                <th>服务项目:</th>
-                <td colspan="5">{{orderDetailData.F_ServiceItems}}</td>
-              </tr> -->
               <tr v-show="isSpecial">
                 <th>首次检查医院:</th>
                 <td>{{orderDetailData.F_FirstCheckHospital}}</td>
@@ -108,9 +104,9 @@
               <el-table :data="workOrderCirculationList" border style="width: 100%">
                 <el-table-column prop="F_CreateUser" label="操作人" align="center">
                 </el-table-column>
-                <el-table-column prop="F_CreateTime" label="内容" align="center">
+                <el-table-column prop="F_OptContent" label="内容" align="center">
                 </el-table-column>
-                <el-table-column prop="F_OptContent" label="时间" align="center">
+                <el-table-column prop="F_CreateTime" label="时间" align="center">
                 </el-table-column>
               </el-table>
             </el-tab-pane>
@@ -212,33 +208,28 @@
           type: num
         }
         GetOrderDetail(params).then((response) => {
-          const res = response.data[0]
-          this.orderDetailData = res
-          if (this.$store.getters.workTypeMap[parseInt(res.F_type2)].ids[1] == '8008') {
-            this.isSpecial = true
-          }
-          // if (res.F_type2 === 8008) {
-          //   this.isSpecial = true
-          // }
-          // if (res.F_type2 === 1004) {
-          //   this.isFamily = true
-          // }
-          // if (res.F_type2 === 1005) {
-          //   this.isConduit = true
-          // }
-          this.orderDetailData.F_TypeName2 = this.$store.getters.workTypeMap[parseInt(response.data[0].F_type2)]
-            .text // 工单子类
-          this.orderDetailData.F_Sex = res.F_Sex // 性别
-          if (res.F_Sex === 0) {
-            this.orderDetailData.F_Sex = '男'
-          } else if (res.F_Sex === 1) {
-            this.orderDetailData.F_Sex = '女'
-          }
-          this.orderDetailData.F_Urgency = res.F_Urgency // 紧急程度
-          if (res.F_Urgency === 0) {
-            this.orderDetailData.F_Urgency = '常规'
-          } else if (res.F_Urgency === 1) {
-            this.orderDetailData.F_Urgency = '紧急'
+          if(num=='1'){
+            this.workOrderCirculationList = response.data
+          }else{
+            const res = response.data[0]
+            this.orderDetailData = res
+            if (this.$store.getters.workTypeMap[parseInt(res.F_type2)].ids[1] == '8008') {
+              this.isSpecial = true
+            }
+            this.orderDetailData.F_TypeName2 = this.$store.getters.workTypeMap[parseInt(res.F_type2)]
+              .text // 工单子类
+            this.orderDetailData.F_Sex = res.F_Sex // 性别
+            if (res.F_Sex === 0) {
+              this.orderDetailData.F_Sex = '男'
+            } else if (res.F_Sex === 1) {
+              this.orderDetailData.F_Sex = '女'
+            }
+            this.orderDetailData.F_Urgency = res.F_Urgency // 紧急程度
+            if (res.F_Urgency === 0) {
+              this.orderDetailData.F_Urgency = '常规'
+            } else if (res.F_Urgency === 1) {
+              this.orderDetailData.F_Urgency = '紧急'
+            }
           }
         })
       },

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

@@ -81,6 +81,7 @@
   import addOrEditFaultRepair from '../../faultRepair/clinicalReporting/components/addRepairbase.vue'
   import RepairEdit from './repairEdit.vue'
   // import AddOrEditInfOrder from '@/views/orderManage/components/addOrEditInfOrder'
+  import addOrEditOrder from '../../callScreen/components/AddOrEditOrder.vue'
   import detail from '../components/orderDetail.vue'
   import askDetail from '../components/askdetail.vue'
   import evaluate from './evaluate.vue'
@@ -165,6 +166,9 @@
         if (this.buttonName === 'chehuibianji') {
           this.btn_edit(wocode)
         }
+        if(this.buttonName === 'ywzx_bianji'){
+          this.btn_ywzxedit(wocode,row.F_Type,row.F_SonType)
+        }
       },
       // 编辑
       btn_edit(rid) {
@@ -180,6 +184,22 @@
           title: '编辑工单'
         })
       },
+      btn_ywzxedit(rid,rtype,r2type) {
+        this.$layer.iframe({
+          content: {
+            content: addOrEditOrder, // 传递的组件对象
+            parent: this, // 当前的vue对象
+            data: {
+              wid: rid,
+              rtype:rtype.toString(),
+              r2type:r2type.toString(),
+              iswomanage:'1'
+            } // props
+          },
+          area: ['70%', '70%'],
+          title: '编辑工单'
+        })
+      },
       getList() {
         this.loading = true
         return new Promise((resolve) => {