1

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

@@ -197,16 +197,16 @@
         },
         postEvent: null,
         rules: {
-          todept: [{
-            required: true,
-            message: '请选择部门',
-            trigger: 'change'
-          }],
-          tousercode: [{
-            required: true,
-            message: '请选择维修人',
-            trigger: 'change'
-          }],
+          // todept: [{
+          //   required: true,
+          //   message: '请选择部门',
+          //   trigger: 'change'
+          // }],
+          // tousercode: [{
+          //   required: true,
+          //   message: '请选择维修人',
+          //   trigger: 'change'
+          // }],
           result: [{
               required: true,
               message: '请输入原因',

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

@@ -8,7 +8,7 @@
       </el-col>
       <!--业务咨询工单 -->
       <el-col v-if="orderTypeData.F_Type1===1000" :span="22">
-        <add-or-edit-inf-order :iswomanage='iswomanage' :wid='wid' :callid='callid' :order-type-data="orderTypeData" :person-parms-data="personParmsData"/>
+        <add-or-edit-inf-order :iswomanage='iswomanage' :rtype='rtype' :wid='wid' :callid='callid' :order-type-data="orderTypeData" :person-parms-data="personParmsData"/>
       </el-col>
       <!-- 综合调度 -->
       <el-col v-if="orderTypeData.F_Type1===2000" :span="22">
@@ -36,7 +36,7 @@
       </el-col>
       <!-- 车辆调度 -->
       <el-col v-if="orderTypeData.F_Type1===4000" :span="22">
-        <add-or-edit :order-type-data="orderTypeData"/>
+        <add-or-edit :r2type='r2type' :callid='callid' :order-type-data="orderTypeData"/>
       </el-col>
     </el-row>
   </div>

CallCenterWeb.UI/RMYY/src/views/equipmentManage/equipmentList/addOrEdit.vue

@@ -8,7 +8,7 @@
         <el-input v-model="ruleForm.equipnumber" type="text" placeholder="请输入规格型号" />
       </el-form-item>
       <el-form-item label="设备价格" prop="equipprice">
-        <el-input v-model="ruleForm.equipprice" type="text" placeholder="请输入设备价格" />
+        <el-input v-model="ruleForm.equipprice" type="number" placeholder="请输入设备价格" />
       </el-form-item>
       <el-form-item label="是否有效">
         <el-switch v-model="ruleForm.state" active-color="#13ce66" inactive-color="#ff4949" active-value="1"

CallCenterWeb.UI/RMYY/src/views/equipmentManage/equipmentList/index.vue

@@ -85,6 +85,7 @@
           GetEquipmentlist(params).then(response => {
             if (response.state.toLowerCase() === 'success') {
               this.dataLists = response.data
+              this.pageParams.total = response.data.length
             }
           })
           resolve()

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

@@ -23,7 +23,8 @@
             <el-col :span="22">
               <el-form-item label="投诉来源">
                 <el-select v-model="ruleForm.F_ComplaintSource" style="width: 100%;">
-                  <el-option v-for="(item,index) in tousuArr" :key="index" :label="item.F_Name" :value="item.F_DictionaryValueId">
+                  <el-option v-for="(item,index) in tousuArr" :key="index" :label="item.F_Name"
+                    :value="item.F_DictionaryValueId">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -212,6 +213,10 @@
         type: String,
         default: ''
       },
+      rtype: {
+        type: String,
+        default: ''
+      },
       // callid:{
       //   type:String,
       //   default:''
@@ -245,7 +250,6 @@
         typeid: 1,
         orderPid: 0,
         callid: window.localStorage.getItem('callidSave'),
-        // OrderDetailFlag: false,
         deptidArr: [],
         repairman: [],
         deptidArr1: [],
@@ -409,7 +413,7 @@
           clbm: '',
           clid: '',
           cont: '',
-          F_ComplaintSource:4010,
+          F_ComplaintSource: 4010,
           F_ComplaintDept: '',
           F_ComplaintUser: '',
           F_WorkOrderContents: '', // 工单内容
@@ -447,39 +451,27 @@
       if (this.callinNum) {
         this.ruleForm.telphone = this.callinNum
       }
-      // if (this.rowid) {
-      //   this.OrderDetail()
-      // } else {
-      //   this.OrderDetailFlag = true
-      //   setTimeout(() => {
-      //     this.genderParams()
-      //   }, 700)
-      // }
-      if (this.wid) {
+      if (this.wid && this.rtype == 1000) {
         this.OrderDetail()
       }
-      if(this.iswomanage){
+      if (this.iswomanage) {
         this.ruleForm.F_ComplaintSource = ''
       }
       this.gettsSelect()
     },
-    mounted() {
-      if (this.wid) {
-        this.OrderDetail()
-      }
-    },
     methods: {
       submitForm() {
         if (JSON.stringify(this.orderTypeData) !== '{}') {
+          console.log(this.orderTypeData)
           this.getParentOrderType()
         }
         this.$refs.ruleForm.validate((valid) => {
           if (valid) {
             this.loading = true
-            const data = {
+            const params = {
               F_CallID: this.ruleForm.F_CallID,
               F_ID: this.ruleForm.F_ID,
-              F_ComplaintSource:this.ruleForm.F_ComplaintSource,
+              F_ComplaintSource: this.ruleForm.F_ComplaintSource,
               F_Source: this.ruleForm.F_Source, // 业务类别
               F_Type1: this.ruleForm.F_Type1, // 工单类别
               F_Type2: this.ruleForm.F_Type2, // 工单子类
@@ -514,7 +506,7 @@
             }
             // 添加
             if (!this.wid) {
-              addOrEdittOrder(data)
+              addOrEdittOrder(params)
                 .then((response) => {
                   this.loading = false
                   if (response.state.toLowerCase() === 'success') {
@@ -539,23 +531,25 @@
                 })
               return
             }
-            // 编辑
-            updateWorkOrder(data)
-              .then((response) => {
-                this.loading = false
-                if (response.state.toLowerCase() === 'success') {
-                  this.$message({
-                    message: '恭喜你，工单信息编辑成功！',
-                    type: 'success',
-                    duration: 1000
-                  })
-                  this.$parent.getList()
-                  this.$parent.$layer.close(this.layerid)
-                }
-              })
-              .catch(() => {
-                this.loading = false
-              })
+            if (this.wid) {
+              // 编辑
+              updateWorkOrder(params)
+                .then((response) => {
+                  this.loading = false
+                  if (response.state.toLowerCase() === 'success') {
+                    this.$message({
+                      message: '恭喜你，工单信息编辑成功！',
+                      type: 'success',
+                      duration: 1000
+                    })
+                    this.$parent.$layer.closeAll()
+                    // this.$parent.$parent.getList()
+                  }
+                })
+                .catch(() => {
+                  this.loading = false
+                })
+            }
           } else {
             this.$message({
               type: 'error',
@@ -665,17 +659,15 @@
         this.thirdOrderTypeParam.pid = data.value
       },
       // 三级改变时触发
-      getThirdOrderType(data) {
-        this.ruleForm.F_Type3 = data.value
-        this.ruleForm.F_TypeName3 = data.name
-      },
-      getServiceProject(data) {
-        console.log(data)
-        this.ruleForm.F_ServiceItems = data.value
-
-        // this.ruleForm.F_ServiceItems = data.name
-      },
-
+      // getThirdOrderType(data) {
+      //   this.ruleForm.F_Type3 = data.value
+      //   this.ruleForm.F_TypeName3 = data.name
+      // },
+      // getServiceProject(data) {
+      //   console.log(data)
+      //   this.ruleForm.F_ServiceItems = data.value
+      //   this.ruleForm.F_ServiceItems = data.name
+      // },
       typeSecondState(data) {
         switch (data) {
           // case 1001: // 健康咨询
@@ -715,9 +707,9 @@
                 this.ruleForm.F_Type1 = res.F_type1 // 工单类别
                 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_Type2 = 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 // 工单三类
@@ -853,12 +845,12 @@
         this.ruleForm.F_IDNumber = ''
       },
       //投诉来源下拉框数据
-      gettsSelect(){
+      gettsSelect() {
         const params = {
           Flag: 'tsly',
           Name: ''
         }
-        getTouSuSelect(params).then(res=>{
+        getTouSuSelect(params).then(res => {
           this.tousuArr = res.rows
         })
       }

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

@@ -80,7 +80,6 @@
   import addDefinedList from '@/components/context/addDefinedList'
   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'

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

@@ -1,468 +1,375 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-date-picker
-        v-model="searchData.searchTime"
-        type="daterange"
-        format="yyyy年MM月dd日"
-        value-format="yyyy-MM-dd"
-        align="left"
-        unlink-panels
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        size="medium"
-      />
+      <el-date-picker v-model="searchData.searchTime" type="daterange" format="yyyy年MM月dd日" value-format="yyyy-MM-dd"
+        align="left" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" size="medium" />
       <!-- <el-input v-model="searchData.keyword" placeholder="请输入关键字" class="filter-item" size="medium" /> -->
-      <el-select
-        v-model="searchData.type"
-        clearable
-        placeholder="请选择业务类别"
-        size="medium"
-        @change="changeOrder"
-      >
-        <el-option
-          v-for="item in orderData"
-          :key="item.id"
-          :label="item.text"
-          :value="item.id"
-        />
+      <el-select v-model="searchData.type" clearable placeholder="请选择业务类别" size="medium" @change="changeOrder">
+        <el-option v-for="item in orderData" :key="item.id" :label="item.text" :value="item.id" />
       </el-select>
-      <el-cascader
-        ref="cascader"
-        v-model="searchData.orderids"
-        :options="subclassData"
-        :props="defaultProps"
-        size="medium"
-        placeholder="请选择工单类别"
-        filterable
-        clearable
-        @change="handleChange"
-      />
-      <el-button
-        type="primary"
-        class="filter-btn"
-        icon="el-icon-search"
-        @click="btn_search"
-      >
+      <el-cascader ref="cascader" v-model="searchData.orderids" :options="subclassData" :props="defaultProps"
+        size="medium" placeholder="请选择工单类别" filterable clearable @change="handleChange" />
+      <el-button type="primary" class="filter-btn" icon="el-icon-search" @click="btn_search">
         搜索
       </el-button>
-      <el-button
-        v-permission="'orderListSetList'"
-        type="primary"
-        class="filter-btn"
-        icon="el-icon-s-tools"
-        @click="btn_add_list"
-      >
+      <el-button v-permission="'orderListSetList'" type="primary" class="filter-btn" icon="el-icon-s-tools"
+        @click="btn_add_list">
         设置列
       </el-button>
     </div>
-    <el-table
-      v-loading="loading"
-      ref="multipleTable"
-      :data="dataLists"
-      border
-      stripe
-      row-key="F_Id"
-    >
-      <el-table-column
-        type="index"
-        label="编号"
-        align="center"
-        fixed
-        width="60"
-      />
-      <el-table-column
-        v-if="fieldListFlag.F_WoCode"
-        prop="F_WoCode"
-        label="工单编号"
-        align="center"
-        min-width="110"
-      >
+    <el-table v-loading="loading" ref="multipleTable" :data="dataLists" border stripe row-key="F_Id">
+      <el-table-column type="index" label="编号" align="center" fixed width="60" />
+      <el-table-column v-if="fieldListFlag.F_WoCode" prop="F_WoCode" label="工单编号" align="center" min-width="110">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="hadndleOrderCode(scope.row)"
-          >
+          <el-button type="text" size="small" @click="hadndleOrderCode(scope.row)">
             {{ scope.row.F_WoCode }}
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column
-        v-if="fieldListFlag.F_ProposerName"
-        prop="F_ProposerName"
-        label="姓名"
-        align="center"
-        min-width
-      />
-      <el-table-column
-        v-if="fieldListFlag.F_SonType"
-        :formatter="formtOrder"
-        prop="F_SonType"
-        label="工单类别"
-        align="center"
-      />
-      <el-table-column
-        v-if="fieldListFlag.F_Content"
-        prop="F_Content"
-        label="工单内容"
-        align="center"
-      />
-      <el-table-column
-        v-if="fieldListFlag.StateName"
-        prop="StateName"
-        label="工单状态"
-        align="center"
-      />
-      <el-table-column
-        v-if="fieldListFlag.F_CreateTime"
-        prop="F_CreateTime"
-        label="创建时间"
-        align="center"
-      />
+      <el-table-column v-if="fieldListFlag.F_ProposerName" prop="F_ProposerName" label="姓名" align="center" min-width />
+      <el-table-column v-if="fieldListFlag.F_SonType" :formatter="formtOrder" prop="F_SonType" label="工单类别"
+        align="center" />
+      <el-table-column v-if="fieldListFlag.F_Content" prop="F_Content" label="工单内容" align="center" />
+      <el-table-column v-if="fieldListFlag.StateName" prop="StateName" label="工单状态" align="center" />
+      <el-table-column v-if="fieldListFlag.F_CreateTime" prop="F_CreateTime" label="创建时间" align="center" />
       <el-table-column label="操作" align="center" class-name="oparate_btn">
         <template slot-scope="scope">
-          <el-button
-            v-for="item in scope.row.Buttons"
-            :key="item.key"
-            type="text"
-            @click="btnClickEvents(item, scope.row.F_WoCode, scope.row)"
-          >
+          <el-button v-for="item in scope.row.Buttons" :key="item.key" type="text"
+            @click="btnClickEvents(item, scope.row.F_WoCode, scope.row)">
             {{ item.value }}
           </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"
-    />
+    <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex"
+      :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getList" />
     <order-button-operation ref="butOption" @refList="refList" />
   </div>
 </template>
 
 <script>
-// import { getDictionaryValueList } from '@/api/commonAPI'
-import {
-  deleteOrder,
-  CompleteOrder,
-  comOrderList,
-  getOrderStateData
-} from '@/api/orderManagement/orderList'
-import { getOrderTypeDrop } from '@/api/systemSetup/roleSetting/menuSetup'
-import addDefinedList from '@/components/context/addDefinedList'
-import addOrEditFaultRepair from '../../faultRepair/clinicalReporting/components/addRepairbase.vue'
-import addOrEditOrder from '../../callScreen/components/AddOrEditOrder.vue'
-import detail from '../components/orderDetail.vue'
-import askDetail from '../components/askdetail.vue'
-import addAudit from './addAudit'
-import { GetFiledState, AddFiled } from '@/api/commonAPI'
-import fieldDATA from '@/utils/fieldsData.js'
-import orderDeal from './orderDeal'
-import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
-import OrderButtonOperation from '@/components/button/orderList'
+  // import { getDictionaryValueList } from '@/api/commonAPI'
+  import {
+    deleteOrder,
+    CompleteOrder,
+    comOrderList,
+    getOrderStateData
+  } from '@/api/orderManagement/orderList'
+  import {
+    getOrderTypeDrop
+  } from '@/api/systemSetup/roleSetting/menuSetup'
+  import addDefinedList from '@/components/context/addDefinedList'
+  import addOrEditFaultRepair from '../../faultRepair/clinicalReporting/components/addRepairbase.vue'
+  import addOrEditOrder from '../../callScreen/components/AddOrEditOrder.vue'
+  import detail from '../components/orderDetail.vue'
+  import askDetail from '../components/askdetail.vue'
+  import addAudit from './addAudit'
+  import {
+    GetFiledState,
+    AddFiled
+  } from '@/api/commonAPI'
+  import fieldDATA from '@/utils/fieldsData.js'
+  import orderDeal from './orderDeal'
+  import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
+  import OrderButtonOperation from '@/components/button/orderList'
 
-export default {
-  name: 'OrderList',
-  components: {
-    Pagination,
-    OrderButtonOperation
-  },
-  data() {
-    return {
-      isDisable: false, // 防止多次点击
-      loading: false,
-      isedit:'1',
-      deleteId: [],
-      fieldListFlag: {},
-      buttonName: '',
-      searchData: {
-        keyword: '', // 关键字
-        searchTime: '', // 时间
-        starttime: '', // 开始时间
-        endtime: '', // 结束时间
-        type: '', // 工单类型
-        orderids: [],
-        menutypeid: '',
-        menutype: '',
-        state: '' // 工单状态
-      },
-      pageParams: {
-        pageindex: 1, // 当前第几页
-        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-        total: 0 // 总共多少数据
-      },
-      dataLists: [], // 列表数据数据
-      defaultProps: {
-        checkStrictly: true,
-        children: 'children',
-        label: 'text',
-        value: 'id'
-      },
-      orderData: [],
-      subclassData: [],
-      orderstate: [], // 工单状态数据
-      DefinedId: ''
-    }
-  },
-  created() {
-    this.getList()
-    // console.log(this.$store.getters.workTypeMap[parseInt('8001')])
-    this.getTreeList()
-    this.getOrderStat()
-
-    this.getFiledTabDetail(this.$route.path.split('/').join('_'))
-    document.onkeyup = (e) => {
-      if (e.keyCode === 13) {
-        this.getList()
-      }
-    }
-  },
-  methods: {
-    refList() {
-      this.getList()
+  export default {
+    name: 'OrderList',
+    components: {
+      Pagination,
+      OrderButtonOperation
     },
-    handleClick(res) {
-      this.searchData.state = Number(res.name)
-      this.getList()
-    },
-    formtOrder(row, column) {
-      if (row.F_SonType) {
-        return this.$store.getters.workTypeMap[parseInt(row.F_SonType)].text
+    data() {
+      return {
+        isDisable: false, // 防止多次点击
+        loading: false,
+        isedit: '1',
+        deleteId: [],
+        fieldListFlag: {},
+        buttonName: '',
+        searchData: {
+          keyword: '', // 关键字
+          searchTime: '', // 时间
+          starttime: '', // 开始时间
+          endtime: '', // 结束时间
+          type: '', // 工单类型
+          orderids: [],
+          menutypeid: '',
+          menutype: '',
+          state: '' // 工单状态
+        },
+        pageParams: {
+          pageindex: 1, // 当前第几页
+          pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+          total: 0 // 总共多少数据
+        },
+        dataLists: [], // 列表数据数据
+        defaultProps: {
+          checkStrictly: true,
+          children: 'children',
+          label: 'text',
+          value: 'id'
+        },
+        orderData: [],
+        subclassData: [],
+        orderstate: [], // 工单状态数据
+        DefinedId: ''
       }
     },
-    btnClickEvents(button, wocode, row) {
-      this.buttonName = button.key
-      this.$refs.butOption.butOptionMethod(this.buttonName, wocode ,row)
-      if (this.buttonName === 'bianji') {
-        // this.btn_edit(wocode)
-        this.btn_edit(wocode,row.F_Type)
+    created() {
+      this.getList()
+      this.getTreeList()
+      this.getOrderStat()
+
+      this.getFiledTabDetail(this.$route.path.split('/').join('_'))
+      document.onkeyup = (e) => {
+        if (e.keyCode === 13) {
+          this.getList()
+        }
       }
     },
-    getList() {
-      this.loading = true
-      return new Promise((resolve) => {
-        const params = {
-          // keyword: this.searchData.keyword, // 关键字
-          starttime: this.searchData.searchTime[0], // 开始时间
-          endtime: this.searchData.searchTime[1], // 结束时间
-          type: this.searchData.type, // 工单类型
-          loweltype:this.searchData.orderids[this.searchData.orderids.length - 1],
-          state: this.searchData.state, // 工单状态
-          pageindex: this.pageParams.pageindex, // int 第几页
-          pagesize: this.pageParams.pagesize // int 每页几条信息
+    methods: {
+      refList() {
+        this.getList()
+      },
+      handleClick(res) {
+        this.searchData.state = Number(res.name)
+        this.getList()
+      },
+      formtOrder(row, column) {
+        if (row.F_SonType) {
+          return this.$store.getters.workTypeMap[parseInt(row.F_SonType)].text
+        }
+      },
+      btnClickEvents(button, wocode, row) {
+        this.buttonName = button.key
+        this.$refs.butOption.butOptionMethod(this.buttonName, wocode, row)
+        if (this.buttonName === 'bianji') {
+          this.btn_edit(wocode, row.F_Type)
         }
-        comOrderList(params).then((response) => {
-          this.loading = false
-          if (response.state.toLowerCase() === 'success') {
-            this.pageParams.total = response.total
-            this.dataLists = response.rows
+      },
+      getList() {
+        this.loading = true
+        return new Promise((resolve) => {
+          const params = {
+            // keyword: this.searchData.keyword, // 关键字
+            starttime: this.searchData.searchTime[0], // 开始时间
+            endtime: this.searchData.searchTime[1], // 结束时间
+            type: this.searchData.type, // 工单类型
+            loweltype: this.searchData.orderids[this.searchData.orderids.length - 1],
+            state: this.searchData.state, // 工单状态
+            pageindex: this.pageParams.pageindex, // int 第几页
+            pagesize: this.pageParams.pagesize // int 每页几条信息
           }
+          comOrderList(params).then((response) => {
+            this.loading = false
+            if (response.state.toLowerCase() === 'success') {
+              this.pageParams.total = response.total
+              this.dataLists = response.rows
+            }
+          })
+          resolve()
         })
-        resolve()
-      })
-    },
-    getFiledTabDetail(TableId) {
-      GetFiledState(TableId).then((res) => {
-        if (res.F_Fileds) {
-          this.fieldListFlag = fieldDATA.getFieldListFlag(res.F_Fileds)
-          this.$refs['multipleTable'].doLayout()
-        } else {
-          const Fileds = fieldDATA.getOptionsValue(fieldDATA[TableId])
-          AddFiled({ TableId, Fileds })
-            .then((response) => {
-              if (response.state.toLowerCase() === 'success') {
-                this.getFiledTabDetail(TableId)
-              }
-            })
-            .catch(() => {
-              this.loading = false
-            })
-        }
-      })
-    },
-    btn_search() {
-      this.pageParams.pageindex = 1
-      this.getList()
-    },
-    btn_add_list() {
-      this.$layer.iframe({
-        content: {
-          content: addDefinedList, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: {
-            definedId: this.$route.path
-          } // props
-        },
-        area: ['70%', '30%'],
-        title: '自定义字段'
-      })
-    },
-    // 编辑
-    btn_edit(rid,rtype) {
-      this.$layer.iframe({
-        content: {
-          content: addOrEditOrder, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: {
-            wid: rid,
-            rtype:rtype.toString(),
-            iswomanage:'1',
-            isedit:'1'
-          } // props
-        },
-        area: ['70%', '70%'],
-        title: '编辑工单'
-      })
-    },
-    hadndleOrderCode(row) {
-      if (row.F_Type === 3000) {
+      },
+      getFiledTabDetail(TableId) {
+        GetFiledState(TableId).then((res) => {
+          if (res.F_Fileds) {
+            this.fieldListFlag = fieldDATA.getFieldListFlag(res.F_Fileds)
+            this.$refs['multipleTable'].doLayout()
+          } else {
+            const Fileds = fieldDATA.getOptionsValue(fieldDATA[TableId])
+            AddFiled({
+                TableId,
+                Fileds
+              })
+              .then((response) => {
+                if (response.state.toLowerCase() === 'success') {
+                  this.getFiledTabDetail(TableId)
+                }
+              })
+              .catch(() => {
+                this.loading = false
+              })
+          }
+        })
+      },
+      btn_search() {
+        this.pageParams.pageindex = 1
+        this.getList()
+      },
+      btn_add_list() {
         this.$layer.iframe({
           content: {
-            content: detail, // 传递的组件对象
+            content: addDefinedList, // 传递的组件对象
             parent: this, // 当前的vue对象
             data: {
-              rowid: row.F_WoCode
+              definedId: this.$route.path
             } // props
           },
-          area: ['80%', '90%'],
-          title: '订单详情'
+          area: ['70%', '30%'],
+          title: '自定义字段'
         })
-      }
-      if (row.F_Type === 1000) {
+      },
+      // 编辑
+      btn_edit(rid, rtype) {
         this.$layer.iframe({
           content: {
-            content: askDetail,
-            parent: this,
+            content: addOrEditOrder, // 传递的组件对象
+            parent: this, // 当前的vue对象
             data: {
-              rowid: row.F_WoCode
+              wid: rid,
+              rtype: rtype.toString(),
+              iswomanage: '1',
+              isedit: '1'
             } // props
           },
-          area: ['80%', '90%'],
-          title: '订单详情'
+          area: ['70%', '70%'],
+          title: '编辑工单'
         })
-      }
-    },
-    // 删除弹框
-    btn_delete(operateId) {
-      this.deleteId = []
-      this.deleteId.push(operateId)
-      this.$confirm('此操作将永久删除当前工单, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          deleteOrder(this.deleteId).then((response) => {
-            if (response.state.toLowerCase() === 'success') {
-              this.getList()
-              this.$message.success('删除成功!')
+      },
+      hadndleOrderCode(row) {
+        if (row.F_Type === 3000) {
+          this.$layer.iframe({
+            content: {
+              content: detail, // 传递的组件对象
+              parent: this, // 当前的vue对象
+              data: {
+                rowid: row.F_WoCode
+              } // props
+            },
+            area: ['80%', '90%'],
+            title: '订单详情'
+          })
+        }
+        if (row.F_Type === 1000) {
+          this.$layer.iframe({
+            content: {
+              content: askDetail,
+              parent: this,
+              data: {
+                rowid: row.F_WoCode
+              } // props
+            },
+            area: ['80%', '90%'],
+            title: '订单详情'
+          })
+        }
+      },
+      // 删除弹框
+      btn_delete(operateId) {
+        this.deleteId = []
+        this.deleteId.push(operateId)
+        this.$confirm('此操作将永久删除当前工单, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            deleteOrder(this.deleteId).then((response) => {
+              if (response.state.toLowerCase() === 'success') {
+                this.getList()
+                this.$message.success('删除成功!')
+              }
+            })
+          })
+          .catch(() => {
+            this.$message.info('已取消删除')
+          })
+      },
+      // 工单完结
+      btn_Complete(operateId) {
+        this.$confirm('此操作完结当前工单, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            CompleteOrder(operateId).then((response) => {
+              if (response.state.toLowerCase() === 'success') {
+                this.getList()
+                this.$message.success('完结成功!')
+              }
+            })
+          })
+          .catch(() => {
+            this.$message.info('已取消完结')
+          })
+      },
+      // 工单处理 orderDeal
+      // btn_Deal(operateId) {
+      //   this.$layer.iframe({
+      //     content: {
+      //       content: orderDeal, // 传递的组件对象
+      //       parent: this, // 当前的vue对象
+      //       data: {
+      //         rowid: operateId
+      //       } // props
+      //     },
+      //     area: ['40%', '30%'],
+      //     title: '订单详情'
+      //   })
+      // },
+      // 工单审核
+      // btn_Audit(operateId) {
+      //   this.$layer.iframe({
+      //     content: {
+      //       content: addAudit, // 传递的组件对象
+      //       parent: this, // 当前的vue对象
+      //       data: {
+      //         rowid: operateId
+      //       } // props
+      //     },
+      //     area: ['40%', '30%'],
+      //     title: '订单详情'
+      //   })
+      // },
+      // 工单状态
+      getOrderStat() {
+        return new Promise((resolve) => {
+          const params = {}
+          getOrderStateData(params).then((response) => {
+            this.loading = false
+            if (response) {
+              this.orderstate = response
             }
           })
+          resolve()
         })
-        .catch(() => {
-          this.$message.info('已取消删除')
-        })
-    },
-    // 工单完结
-    btn_Complete(operateId) {
-      this.$confirm('此操作完结当前工单, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          CompleteOrder(operateId).then((response) => {
+      },
+      getTreeList() {
+        return new Promise((resolve) => {
+          getOrderTypeDrop(this.pid).then((response) => {
             if (response.state.toLowerCase() === 'success') {
-              this.getList()
-              this.$message.success('完结成功!')
+              this.orderData = response.data
             }
           })
+          resolve()
         })
-        .catch(() => {
-          this.$message.info('已取消完结')
-        })
-    },
-    // 工单处理 orderDeal
-    // btn_Deal(operateId) {
-    //   this.$layer.iframe({
-    //     content: {
-    //       content: orderDeal, // 传递的组件对象
-    //       parent: this, // 当前的vue对象
-    //       data: {
-    //         rowid: operateId
-    //       } // props
-    //     },
-    //     area: ['40%', '30%'],
-    //     title: '订单详情'
-    //   })
-    // },
-    // 工单审核
-    // btn_Audit(operateId) {
-    //   this.$layer.iframe({
-    //     content: {
-    //       content: addAudit, // 传递的组件对象
-    //       parent: this, // 当前的vue对象
-    //       data: {
-    //         rowid: operateId
-    //       } // props
-    //     },
-    //     area: ['40%', '30%'],
-    //     title: '订单详情'
-    //   })
-    // },
-    // 工单状态
-    getOrderStat() {
-      return new Promise((resolve) => {
-        const params = {}
-        getOrderStateData(params).then((response) => {
-          this.loading = false
-          if (response) {
-            this.orderstate = response
-          }
-        })
-        resolve()
-      })
-    },
-    getTreeList() {
-      return new Promise((resolve) => {
-        getOrderTypeDrop(this.pid).then((response) => {
-          if (response.state.toLowerCase() === 'success') {
-            this.orderData = response.data
-          }
+      },
+      handleChange(data) {
+        this.searchData.menutype = data[data.length - 1]
+        this.searchData.orderids = data
+      },
+      changeOrder(data) {
+        if (!data) {
+          return
+        }
+        this.searchData.menutypeid = data
+        const params = {
+          pid: data,
+          flag: 1
+        }
+        return new Promise((resolve) => {
+          getOrderTypeDrop(params).then((response) => {
+            if (response.state.toLowerCase() === 'success') {
+              this.subclassData = response.data
+            }
+          })
+          resolve()
         })
-        resolve()
-      })
-    },
-    handleChange(data) {
-      this.searchData.menutype = data[data.length - 1]
-      this.searchData.orderids = data
-    },
-    changeOrder(data) {
-      if (!data) {
-        return
-      }
-      this.searchData.menutypeid = data
-      const params = {
-        pid: data,
-        flag: 1
       }
-      return new Promise((resolve) => {
-        getOrderTypeDrop(params).then((response) => {
-          if (response.state.toLowerCase() === 'success') {
-            this.subclassData = response.data
-          }
-        })
-        resolve()
-      })
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

CallCenterWeb.UI/RMYY/src/views/systemSetup/sysSetting/orderTypeManage/addOrEditOrderType.vue

@@ -181,6 +181,8 @@ export default {
           this.ruleForm.F_TimeOut = res.cstime
           this.ruleForm.F_RepairTimeLimit = res.fxtime
           this.ruleForm.F_Identification = res.identification
+          this.ruleForm.F_AutoDept = res.autodept
+          this.deptidArr = this.$store.getters.deptmap[parseInt(res.autodept)].ids
         }
       })
     },

CallCenterWeb.UI/RMYY/src/views/systemSetup/sysSetting/orderTypeManage/index.vue

@@ -138,7 +138,7 @@ export default {
             orderGrade: this.orderGrade
           } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
         },
-        area: ['40%', '50%'],
+        area: ['60%', '60%'],
         shadeClose: false,
         title: '添加工单类型'
       })
@@ -177,7 +177,7 @@ export default {
             orderGrade: this.orderGrade
           } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
         },
-        area: ['40%', '50%'],
+        area: ['60%', '60%'],
         shadeClose: false,
         title: '编辑工单类型'
       })

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

@@ -1,7 +1,17 @@
 <template>
   <div v-loading="loading">
-    <el-form ref="ruleForm" :model="ruleForm" 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'>
+            <el-form-item label="工单类型" prop="type">
+              <el-select clearable v-model="ruleForm.type" placeholder="请选择工单类型" style="width: 100%;" size="medium">
+                <el-option v-for="item in typeList" :key="item.fid" :label="item.fname" :value="item.fid">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="申请部门" prop="deptid">
@@ -9,8 +19,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="申请人" prop="username">
-              <select-repairman :repairman-param="repairmanParam" @post-repairman="getRepairman" />
+            <el-form-item label="申请人" prop="needman">
+              <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" />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -22,8 +35,10 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="车辆要求" prop="cartype">
-              <el-radio v-model="ruleForm.cartype" :label="1">大车</el-radio>
-              <el-radio v-model="ruleForm.cartype" :label="2">小车</el-radio>
+              <el-select v-model="ruleForm.cartype" style="width: 100%;">
+                <el-option v-for="(item,index) in carArr" :key="index" :label="item.F_Name"
+                  :value="item.F_DictionaryValueId"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -39,20 +54,27 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row>
-          <el-col :span="10">
-            <el-form-item label="来源" prop="source">
-              <el-select v-model="ruleForm.source">
-                <el-option v-for="item in sourceList" :key="item.value" :label="item.label" :value="item.value">
-                </el-option>
-              </el-select>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="发车时间" prop="usertime">
+              <el-date-picker v-model="ruleForm.usertime" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss"
+                format='yyyy-MM-dd HH:mm:ss' type="datetime" placeholder="选择发车时间">
+              </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row> -->
+        </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="备注" prop="F_Remark">
-              <el-input type="textarea" v-model="ruleForm.remark" placeholder="请输入备注" />
+            <el-form-item label="是否出生" prop="birth">
+              <el-radio v-model="ruleForm.birth" :label="0">否</el-radio>
+              <el-radio v-model="ruleForm.birth" :label="1">是</el-radio>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="工单内容" prop="F_Remark">
+              <el-input type="textarea" v-model="ruleForm.content" placeholder="请输入工单内容" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -76,6 +98,12 @@
     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",
     props: {
@@ -85,10 +113,18 @@
           return {}
         }
       },
+      callid: {
+        type: String,
+        default: ''
+      },
       rowid: {
         type: String,
         default: "",
       },
+      wocode: {
+        type: String,
+        default: "",
+      },
       layerid: {
         type: String,
         default: "",
@@ -97,6 +133,8 @@
     data() {
       return {
         typeList: [],
+        carArr: [],
+        repairman: [], // 申请人数据
         sourceList: [{
           value: "电话",
           label: "电话"
@@ -119,6 +157,49 @@
           id: 0,
           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'
+          }],
+          // usertime: [{
+          //   type: 'string',
+          //   required: true,
+          //   message: '请选择',
+          //   trigger: 'change'
+          // }],
+          phon: [{
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          }],
+          startplace: [{
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          }],
+          endplace: [{
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          }],
+        },
         ruleForm: {
           F_ID: '',
           startplace: '',
@@ -130,25 +211,54 @@
           deptname: '', // 申请科室名称
           usercode: '', // 申请人编码
           username: '', //	申请人
+          needman: '',
+          birth: '',
           phon: '',
           type: '',
           cartype: '',
           F_CarMessage: '',
-          remark: ''
+          remark: '',
+          content: ''
         },
-        deptid:[],
+        deptid: [],
         loading: false,
       };
     },
     created() {
       this.getTypeOrder()
+      this.getCarlist()
       if (this.rowid) {
         this.ruleForm.F_ID = this.rowid;
-        this.getDetail();
+        this.getDetail('0');
         console.log(this.rowid)
       }
     },
     methods: {
+      // 获取申请人数据
+      getRepairman(id) {
+        return new Promise((resolve) => {
+          const params = {
+            deptid: id // 字典管理的工单标识
+          }
+          GetPerson(params).then((res) => {
+            this.repairman = res.rows
+          })
+          resolve()
+        })
+      },
+      // 申请人
+      changeRepairman(data) {
+        this.ruleForm.needman = data
+      },
+      getCarlist() {
+        const params = {
+          Flag: 'CLLX',
+          Name: ''
+        }
+        getCartype(params).then(res => {
+          this.carArr = res.rows
+        })
+      },
       getTypeOrder() {
         const params = {
           pid: 2,
@@ -160,36 +270,40 @@
       },
       getDeptid(data) {
         this.ruleForm.hosid = data[0]
-        this.ruleForm.deptid = data[data.length-1]
+        this.ruleForm.deptid = data[data.length - 1]
         this.deptid = data
-        // this.getRepairman(this.ruleForm.repairDeptid, 0)
+        this.getRepairman(data[data.length - 1])
       },
       submitForm() {
         this.$refs.ruleForm.validate((valid) => {
           if (valid) {
-            this.loading = true;
-            const datas = {
-              type: this.ruleForm.type,
-              hosid: this.ruleForm.hosid, //	院区id
-              detpid: this.ruleForm.deptid, //	申请科室id
-              startplace: this.ruleForm.startplace,
-              endplace: this.ruleForm.endplace,
-              needman: this.ruleForm.usercode, //	申请人
-              phon: this.ruleForm.phon,
-              cartype: this.ruleForm.cartype,
-              source: this.ruleForm.source,
-              remark: this.ruleForm.remark, //	备注
-            };
-
             // 添加
             if (!this.rowid) {
+              const datas = {
+                callid: this.callid,
+                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,
+                cartype: this.ruleForm.cartype,
+                usertime: this.ruleForm.usertime,
+                birth: this.ruleForm.birth,
+                content: this.ruleForm.content, //	备注
+              };
               getAddWorkOrder(datas)
                 .then((response) => {
                   this.loading = false;
                   if (response.state.toLowerCase() === "success") {
                     this.$parent.$layer.close(this.layerid);
                     this.$parent.getList(); // 重新加载父级数据
-                    this.$message.success("恭喜你，车辆添加成功!");
+                    this.$message({
+                      message: '恭喜你，添加工单成功！',
+                      type: 'success',
+                      duration: 1000
+                    })
                   }
                 })
                 .catch(() => {
@@ -198,31 +312,32 @@
             } else {
               // 编辑
               const datas = {
-                orderid: this.rowid,
+                WorkOrderCode: this.wocode,
                 type: this.ruleForm.type,
                 hosid: this.ruleForm.hosid, //	院区id
                 detpid: this.ruleForm.deptid, //	申请科室id
                 startplace: this.ruleForm.startplace,
                 endplace: this.ruleForm.endplace,
-                needman: this.ruleForm.usercode, //	申请人
-                needmanName: this.ruleForm.username, //	申请人
+                needman: this.ruleForm.needman, //	申请人
                 phon: this.ruleForm.phon,
                 cartype: this.ruleForm.cartype,
-                source: this.ruleForm.source,
-                remark: this.ruleForm.remark, //	备注
+                usertime: this.ruleForm.usertime,
+                birth: this.ruleForm.birth,
+                content: this.ruleForm.content, //	备注
               };
               getUpdateWorkOrder(datas)
                 .then((response) => {
-                  this.loading = false;
                   if (response.state.toLowerCase() === "success") {
                     this.$parent.$layer.close(this.layerid);
                     this.$parent.getList(); // 重新加载父级数据
-                    this.$message.success("恭喜你，车辆编辑成功!");
+                    this.$message({
+                      message: '恭喜你，编辑工单成功！',
+                      type: 'success',
+                      duration: 1000
+                    })
                   }
                 })
-                .catch(() => {
-                  this.loading = false;
-                });
+                .catch(() => {});
             }
           } else {
             this.$message.error("请输入有效的必填项信息!");
@@ -235,16 +350,18 @@
       },
 
       // 获取详情
-      getDetail() {
+      getDetail(num) {
         const params = {
-          orderid: this.rowid
+          orderid: this.rowid,
+          WorkOrderCode: this.wocode,
+          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.ruleForm.source = res.F_Source
             this.hospitalsParam.id = res.F_HosId
             this.hospitalsParam.name = res.HosName
             this.departmentsParam.id = res.F_ProposerDeptId
@@ -264,24 +381,29 @@
             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.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
-        this.ruleForm.deptname = data.name
-      },
+      // getDepartments(data) {
+      //   this.ruleForm.deptid = data.value
+      //   this.ruleForm.deptname = data.name
+      // },
       // 院区下拉改变事件
-      getHospitals(data) {
-        this.ruleForm.hosid = data.value
-        this.ruleForm.hosname = data.name
-      },
+      // getHospitals(data) {
+      //   this.ruleForm.hosid = data.value
+      //   this.ruleForm.hosname = data.name
+      // },
       //申请人下拉改变事件
-      getRepairman(data) {
-        this.ruleForm.usercode = data.value
-        this.ruleForm.username = data.name
-      },
+      // getRepairman(data) {
+      //   this.ruleForm.usercode = data.value
+      //   this.ruleForm.username = data.name
+      // },
     },
   };
 </script>

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

@@ -4,37 +4,85 @@
       <el-col :md="24" class="order_detail_body">
         <el-card shadow="hover">
           <el-col :md="21">
-            <h1 class="title">
-              <svg-icon class="title_icon" icon-class="hongqi" />工单单号：{{ orderDetailData.F_WorkOrderCode }}
-            </h1>
+            <el-col :md="18">
+              <h1 class="title" style="display: inline-block;">
+                <svg-icon class="title_icon" icon-class="hongqi" />工单编号：{{ orderDetailData.F_WorkOrderCode }}
+                <span v-if="orderDetailData.StateName" class="wostate">{{orderDetailData.StateName}}</span>
+              </h1>
+            </el-col>
           </el-col>
           <el-col :md="24" class="order_detail_content">
-            <el-col :md="6" class="order_detail_item"> 工单状态：{{ orderDetailData.F_Wostate }} </el-col>
-            <el-col :md="6" class="order_detail_item"> 来源：{{ orderDetailData.F_Source }} </el-col>
-            <el-col :md="6" class="order_detail_item"> 申请人：{{ orderDetailData.F_ProposerName }} </el-col>
-            <el-col :md="6" class="order_detail_item"> 协作人：{{ orderDetailData.F_AssistManName }} </el-col>
-            <el-col :md="6" class="order_detail_item"> 联系电话：{{ orderDetailData.F_Phon }} </el-col>
-            <el-col :md="6" class="order_detail_item">车辆信息：{{ orderDetailData.F_CarMessage }} </el-col>
-            <el-col :md="6" class="order_detail_item">司机信息：{{ orderDetailData.F_DriverName }} </el-col>
-            <el-col :md="6" class="order_detail_item"> 备注：{{ orderDetailData.F_Remark }} </el-col>
+            <table class="tabdept" cellspacing="0" cellpadding="0">
+              <tr>
+                <th>业务类别:</th>
+                <td>车辆调度</td>
+                <th>工单类别:</th>
+                <td>{{orderDetailData.F_TypeName2}}</td>
+                <th>创建时间:</th>
+                <td>{{orderDetailData.F_CreateTime}}</td>
+              </tr>
+              <tr>
+                <th>申请院区:</th>
+                <td>{{ orderDetailData.HosName }}</td>
+                <th>申请部门:</th>
+                <td>{{ orderDetailData.F_ProposerDeptName }}</td>
+                <th>申请人:</th>
+                <td>{{orderDetailData.F_ProposerName}}</td>
+              </tr>
+              <tr>
+                <th>联系电话:</th>
+                <td>{{orderDetailData.F_Phon}}</td>
+                <th>车辆要求:</th>
+                <td>{{orderDetailData.F_CarName}}</td>
+                <th>出发地点:</th>
+                <td>{{orderDetailData.F_DepartPlace}}</td>
+              </tr>
+              <tr>
+                <th>目的地:</th>
+                <td>{{orderDetailData.F_Destination}}</td>
+                <th>发车时间:</th>
+                <td>{{orderDetailData.F_UseTime}}</td>
+                <th>是否出生:</th>
+                <td>{{orderDetailData.F_Birth==0?'否':'是'}}</td>
+              </tr>
+              <tr>
+                <th>工单内容:</th>
+                <td colspan="5">{{orderDetailData.F_Content}}</td>
+              </tr>
+            </table>
           </el-col>
         </el-card>
-
       </el-col>
     </el-row>
     <el-row :gutter="20">
       <el-col :md="24" class="order_detail_body">
         <el-card shadow="hover">
-          <el-col :md="21">
-            <h1 class="title">工单流转</h1>
-          </el-col>
-
-          <el-table :data="workOrderCirculationList" border stripe row-key="F_Id">
-            <el-table-column prop="F_CreateUser" label="创建人" align="center" min-width />
-            <el-table-column prop="F_CreateTime" label="创建时间" align="center" min-width />
-            <el-table-column prop="F_OptContent" label="内容" align="center" min-width />
-          </el-table>
-
+          <el-tabs v-model="activeName" ref="tabs">
+            <el-tab-pane label="处理结果" name="1">
+              <el-col :md="24" class="order_detail_content">
+                <table class="tabdept" cellspacing="0" cellpadding="0">
+                  <tr>
+                    <th>处理意见:</th>
+                    <td colspan="5">{{orderDetailData.F_DealOpinions?orderDetailData.F_DealOpinions:'-'}}</td>
+                  </tr>
+                  <tr>
+                    <th>处理方式:</th>
+                    <td colspan="5">{{orderDetailData.F_DealType?orderDetailData.F_DealType:'-'}}</td>
+                  </tr>
+                </table>
+              </el-col>
+            </el-tab-pane>
+            <el-tab-pane label="工单流程" name="2">
+              <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_Message" label="内容" align="center">
+                </el-table-column>
+                <el-table-column prop="F_CreateTime" label="时间" align="center">
+                </el-table-column>
+              </el-table>
+            </el-tab-pane>
+          </el-tabs>
         </el-card>
       </el-col>
     </el-row>
@@ -60,6 +108,10 @@
         type: Number,
         default: 0
       },
+      wocode: {
+        type: String,
+        default: "",
+      },
       layerid: {
         type: String,
         default: ''
@@ -90,8 +142,8 @@
     },
     created() {
       if (this.rowid) {
-        this.getDetail()
-        // this.getItem()
+        this.getDetail('0')
+        this.getDetail('1')
       }
     },
     methods: {
@@ -99,22 +151,21 @@
         console.log(tab, event)
       },
       // 详情
-      getDetail() {
+      getDetail(num) {
         const params = {
-          orderid: this.rowid
+          orderid: this.rowid,
+          WorkOrderCode: this.wocode,
+          type: num
         }
         getModelDetail(params).then((response) => {
-          const res = response.model
-          this.orderDetailData.F_ID = res.F_ID
-          this.orderDetailData.F_Source = res.F_Source
-          this.orderDetailData.HosName = res.HosName
-          this.orderDetailData.F_ProposerDeptName = res.F_ProposerDeptName
-          this.orderDetailData.F_ProposerName = res.F_ProposerName
-          this.orderDetailData.F_AssistManName = res.F_AssistManName
-          this.orderDetailData.F_Phon = res.F_Phon
-          this.orderDetailData.F_CarMessage = res.F_CarMessage
-          this.orderDetailData.F_DriverName = res.F_DriverName
-          this.orderDetailData.F_Remark = res.F_Remark
+          if (num == 0) {
+            this.orderDetailData = response.model
+            this.orderDetailData.F_TypeName2 = this.$store.getters.workTypeMap[parseInt(response.model.F_Type)]
+              .text // 工单子类
+          }
+          if (num == 1) {
+            this.workOrderCirculationList = response.data
+          }
         })
       },
 
@@ -124,8 +175,39 @@
 
 <style rel="stylesheet/scss" lang="scss">
   .order_detail {
-    .el-col {
-      margin-bottom: 20px;
+
+    // .el-col {
+    //   margin-bottom: 20px;
+    // }
+    .tabdept {
+      width: 100%;
+      margin: 10px 0;
+      border: 1px solid #ccc;
+    }
+
+    .tabdept th {
+      width: 150px;
+      padding: 10px 0;
+      font-size: 14px;
+      text-align: center;
+      background-color: #ececec;
+      border: 1px solid #ccc;
+    }
+
+    .tabdept td {
+      font-size: 14px;
+      text-align: center;
+      background-color: #fafafa;
+      border: 1px solid #ccc;
+    }
+
+    .wostate {
+      color: #67aa60;
+      display: inline-block;
+      border: 1px solid #c1c1c1;
+      border-radius: 5px;
+      padding: 5px 10px 3px 10px;
+      font-size: 17px !important;
     }
 
     .el-icon-time {

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

@@ -8,15 +8,20 @@
       </el-select>
       <el-date-picker v-model="startTime" size="medium" type="daterange" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
         range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
-      <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
-      <el-button v-permission="'btnAdd'" type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
+      <el-button type="primary" class="filter-item" size="medium" @click="btn_search">搜索</el-button>
     </div>
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="全部" name="-1" />
+      <el-tab-pane label="待分配" name="0" />
+      <el-tab-pane label="已分配" name="1" />
+      <el-tab-pane label="已完成" name="10" />
+    </el-tabs>
     <el-table v-loading="loading" :data="dataLists" border stripe>
-
       <el-table-column type="index" label="编号" align="center" fixed width="80" />
       <el-table-column prop="F_WorkOrderCode" label="工单编号" align="center" min-width="110">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_ID)">{{ scope.row.F_WorkOrderCode }}
+          <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_ID,scope.row.F_WorkOrderCode)">
+            {{ scope.row.F_WorkOrderCode }}
           </el-button>
         </template>
       </el-table-column>
@@ -28,31 +33,33 @@
           <div v-if="scope.row.F_Type==8004">转运设备</div>
         </template>
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" prop="F_CarMessage" label="车辆信息" align="center">
-        <template slot-scope="scope">
-          <div v-if="scope.row.F_CarMessage">{{scope.row.F_CarMessage}}</div>
-          <div v-else>待派车</div>
-        </template>
-      </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" prop="F_Phon" label="电话" align="center" />
+      <el-table-column :show-overflow-tooltip="true" prop="F_Content" label="调度内容" align="center" />
       <el-table-column :show-overflow-tooltip="true" prop="F_DepartPlace" label="出发地点" align="center" />
       <el-table-column :show-overflow-tooltip="true" prop="F_Destination" label="目的地" align="center" />
       <el-table-column :show-overflow-tooltip="true" prop="F_CreateTime" label="申请时间" align="center" />
-      <el-table-column :show-overflow-tooltip="true" prop="F_Source" label="来源" align="center" />
-      <el-table-column :show-overflow-tooltip="true" prop="F_CarType" label="车辆类型" align="center">
+      <el-table-column :show-overflow-tooltip="true" prop="F_UseTime" label="用车时间" align="center" />
+      <el-table-column :show-overflow-tooltip="true" prop="F_CarTypeName" label="车辆类型" align="center" />
+      <el-table-column label="工单状态" align="center">
         <template slot-scope="scope">
-          <div v-if="scope.row.F_CarType==1">大车</div>
-          <div v-if="scope.row.F_CarType==2">小车</div>
+          <div v-if="scope.row.F_State==0">待分配</div>
+          <div v-if="scope.row.F_State==1">已分配</div>
+          <div v-if="scope.row.F_State==2">已接单</div>
+          <div v-if="scope.row.F_State==4">处理中</div>
+          <div v-if="scope.row.F_State==10">已完成</div>
         </template>
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" prop="F_Remark" label="备注" align="center" />
       <el-table-column label="操作" width="160" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="'btnEdit'" size="mini" type="text" @click="btn_edit(scope.row.F_ID)">编辑</el-button>
-          <el-button v-permission="'btnDel'" size="mini" type="text" @click="btn_delete(scope.row.F_ID)">删除</el-button>
-          <el-button v-permission="'btnAssign'" v-if="scope.row.F_State==0" size="mini" type="text" @click="btn_assign(scope.row.F_ID)">派车
+          <el-button size="mini" type="text"
+            @click="btn_edit(scope.row.F_ID,scope.row.F_WorkOrderCode)">编辑</el-button>
+          <el-button size="mini" type="text" @click="btn_delete(scope.row.F_WorkOrderCode)">删除
+          </el-button>
+          <el-button size="mini" type="text">分配</el-button>
+          <el-button size="mini" type="text">撤回</el-button>
+          <!-- <el-button v-permission="'btnAssign'" v-if="scope.row.F_State==0" size="mini" type="text"
+            @click="btn_assign(scope.row.F_ID)">派车
           </el-button>
-          <el-button v-permission="'btnSure'" size="mini" type="text" @click="btn_sure(scope.row.F_ID)">确定工单</el-button>
+          <el-button v-permission="'btnSure'" size="mini" type="text" @click="btn_sure(scope.row.F_ID)">确定工单</el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -89,10 +96,12 @@
     },
     data() {
       return {
+        activeName: '-1',
         loading: false,
         keyword: '',
-        typeList:[],
-        type:'',
+        state: '-1',
+        typeList: [],
+        type: '',
         startTime: '',
         pageParams: {
           pageindex: 1, //Number(this.$store.getters.serverConfig.PAGESIZE)
@@ -112,6 +121,10 @@
       }
     },
     methods: {
+      handleClick(res) {
+        this.state = res.name
+        this.getList()
+      },
       getTypeOrder() {
         const params = {
           pid: 2,
@@ -126,10 +139,9 @@
         return new Promise((resolve) => {
           const params = {
             type: this.type,
-            state: -1,
             pageindex: this.pageParams.pageindex, // 第几页
             pagesize: this.pageParams.pagesize, // 每页几条信息
-            // keyword: this.keyword.replace(/\s+/g, ''),
+            state: this.state,
             starttime: this.startTime && this.startTime[0],
             endtime: this.startTime && this.startTime[1]
           }
@@ -147,26 +159,14 @@
         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) {
+      btn_edit(editId, wocode) {
         this.$layer.iframe({
           content: {
             content: addOrEdit, // 传递的组件对象
             parent: this, // 当前的vue对象
             data: {
-              rowid: editId
+              rowid: editId.toString(),
+              wocode: wocode
             } // props
           },
           area: ['60%', '500px'],
@@ -174,13 +174,14 @@
         })
       },
       // 详情
-      hadndleOrderCode(ordercode) {
+      hadndleOrderCode(ordercode, wocode) {
         this.$layer.iframe({
           content: {
             content: detail, // 传递的组件对象
             parent: this, // 当前的vue对象
             data: {
-              rowid: ordercode
+              rowid: ordercode,
+              wocode: wocode
             } // props
           },
           area: ['80%', '90%'],
@@ -190,7 +191,7 @@
       //删除
       btn_delete(editId) {
         const params = {
-          orderid: editId
+          WorkOrderCode: editId
         }
         this.$confirm('您确定要删除此信息吗?', '提示', {
             confirmButtonText: '确定',
@@ -199,10 +200,8 @@
           })
           .then(() => {
             getDelete(params).then((response) => {
-              if (response.state.toLowerCase() === 'success') {
-                this.getList()
-                this.$message.success('删除成功!')
-              }
+              this.getList()
+              this.$message.success('删除成功!')
             })
           })
           .catch(() => {