xg

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

@@ -249,7 +249,11 @@ export default {
     value: '申请人'
   },
   {
-    key: 'F_DeptLocation',
+    key: 'F_Location',
+    value: '报工位置'
+  },
+  {
+    key: 'F_LocationNew',
     value: '科室位置'
   },
   {

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

@@ -69,8 +69,8 @@
       <el-table-column v-if="fieldListFlag.F_ProposerDeptName" prop="F_ProposerDept" :formatter="formtDept" label="申请科室"
         align="center" min-width />
       <el-table-column v-if="fieldListFlag.F_ProposerName" prop="F_ProposerName" label="申请人" align="center" min-width />
-      <el-table-column v-if="fieldListFlag.F_DeptLocation" prop="F_Location" label="报工位置" align="center" min-width />
-      <el-table-column prop="F_LocationNew" label="科室位置" align="center" min-width />
+      <el-table-column v-if="fieldListFlag.F_Location" prop="F_Location" label="报工位置" align="center" min-width />
+      <el-table-column v-if="fieldListFlag.F_LocationNew" prop="F_LocationNew" label="科室位置" align="center" min-width />
       <el-table-column v-if="fieldListFlag.F_Type" prop="F_Type" label="业务类别" align="center" min-width>
         <template slot-scope="scope">
           <span v-if="scope.row.F_Type==1000">业务咨询</span>