xiugai

CallCenterWeb.UI/RMYY/src/components/workOrder/dispatching/addOrEditDispatch.vue

@@ -48,8 +48,8 @@
             <el-col :span="12">
               <el-form-item prop="devname">
                 <el-select :disabled="butIsDisabled" v-model="item.devname" placeholder="请选择设备" @change="selectChange">
-                  <el-option v-for="item in equipArr" :key="item.F_EquipID" :label="item.F_EquipName"
-                    :value="`${item.F_EquipName},${item.F_EquipID}`" />
+                  <el-option v-for="item in equipArr" :key="item.F_DictionaryValueId" :label="item.F_Name"
+                    :value="`${item.F_Name},${item.F_DictionaryValueId}`" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -575,9 +575,15 @@
         }
       },
       getequis() {
-        const params = {}
-        GetequipList(params).then((res) => {
-          this.equipArr = res.data
+        const params = {
+          Flag: 'SBXX',
+          Name: ''
+        }
+        return new Promise(resolve => {
+          GetDicValueList(params).then(response => {
+            this.equipArr = response.rows
+          })
+          resolve()
         })
       },
       getgoods() {

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

@@ -114,7 +114,7 @@ export default {
     value: '科室'
   }, {
     key: 'F_EquipName',
-    value: '设备名称'
+    value: '耗材名称'
   }, {
     key: 'F_EquipAmount',
     value: '数量'

CallCenterWeb.UI/RMYY/src/views/reportForm/repairCostReport/index.vue

@@ -9,10 +9,8 @@
       <el-form-item label="科室">
         <select-dept-tree :deptparam="deptidArr" @post-deptid="getDeptid" />
       </el-form-item>
-      <el-form-item label="设备">
-        <el-select v-model="ruleForm.equipment" clearable placeholder="请选择设备">
-          <el-option v-for="item in equiarr" :key="item.F_DictionaryValueId" :label="item.F_Name" :value="item.F_DictionaryValueId" />
-        </el-select>
+      <el-form-item label="耗材">
+        <el-input v-model="ruleForm.equipment" clearable placeholder="请输入耗材名称" size="small" />
       </el-form-item>
       <el-form-item label="维修部门">
         <select-dept-tree :deptparam="deptidArr1" @post-deptid="getDeptid1" />
@@ -31,25 +29,18 @@
       </el-form-item>
     </el-form>
     <el-table ref="multipleTable" :data="dataLists" border highlight-current-row stripe>
-      <el-table-column v-if="fieldListFlag.F_CreateTime"  prop="F_CreateTime" label="日期" align="center" min-width />
-      <!-- <el-table-column v-if="fieldListFlag.F_ApplicationDept" prop="F_ApplicationDept" label="科室" align="center" min-width>
-        <template slot-scope="scope">
-          {{$store.getters.deptmap[parseInt(scope.row.F_ApplicationDept)].text}}
-        </template>
-      </el-table-column> -->
-      <el-table-column v-if="fieldListFlag.ApplicationDeptname" prop="ApplicationDeptname" label="科室" align="center" min-width />
-      <el-table-column v-if="fieldListFlag.F_EquipName" prop="F_EquipName" label="设备名称" align="center" min-width />
+      <el-table-column v-if="fieldListFlag.F_CreateTime" prop="F_CreateTime" label="日期" align="center" min-width />
+      <el-table-column v-if="fieldListFlag.ApplicationDeptname" prop="ApplicationDeptname" label="科室" align="center"
+        min-width />
+      <el-table-column v-if="fieldListFlag.F_EquipName" prop="F_EquipName" label="耗材名称" align="center" min-width />
       <el-table-column v-if="fieldListFlag.F_EquipAmount" prop="F_EquipAmount" label="数量" align="center" min-width />
       <el-table-column v-if="fieldListFlag.F_EquipPrice" prop="F_EquipPrice" label="金额(元)" align="center" min-width />
-      <!-- <el-table-column v-if="fieldListFlag.MaintenanceDeptName" prop="MaintenanceDeptName" label="维修部门" align="center" min-width>
-        <template slot-scope="scope">
-          {{$store.getters.deptmap[parseInt(scope.row.F_MaintenanceDept)].text}}
-        </template>
-      </el-table-column> -->
-      <el-table-column v-if="fieldListFlag.MaintenanceDeptName" prop="MaintenanceDeptName" label="维修部门" align="center" min-width />
+      <el-table-column v-if="fieldListFlag.MaintenanceDeptName" prop="MaintenanceDeptName" label="维修部门" align="center"
+        min-width />
       <el-table-column v-if="fieldListFlag.Maintenancer" prop="Maintenancer" label="维修人" align="center" min-width />
     </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" />
   </div>
 </template>
 
@@ -83,17 +74,17 @@
     data() {
       return {
         fieldListFlag: {},
-        equiarr:[],
+        equiarr: [],
         deptidArr: [],
         deptidArr1: [],
         assignman: [],
         dataLists: [],
         ruleForm: {
           startTime: [],
-          dept:'',
-          equipment:'',
-          wxdeptid:'',
-          assignMant:''
+          dept: '',
+          equipment: '',
+          wxdeptid: '',
+          assignMant: ''
         },
         pageParams: {
           pageindex: 1, // 当前第几页
@@ -113,7 +104,7 @@
     methods: {
       getEquiment() {
         const params = {
-          Flag: 'SJSB',
+          Flag: 'SBXX',
           Name: ''
         }
         return new Promise(resolve => {
@@ -129,14 +120,14 @@
       },
       getList() {
         const params = {
-          page:this.pageParams.pageindex,
-          pagesize:this.pageParams.pagesize,
+          page: this.pageParams.pageindex,
+          pagesize: this.pageParams.pagesize,
           stime: this.ruleForm.startTime && this.ruleForm.startTime[0],
           endtime: this.ruleForm.startTime && this.ruleForm.startTime[1],
-          applicationdept:this.ruleForm.dept,
-          equipId:this.ruleForm.equipment,
-          maintenanceDept:this.ruleForm.wxdeptid,
-          maintenancer:this.ruleForm.assignMant,
+          applicationdept: this.ruleForm.dept,
+          equipId: this.ruleForm.equipment,
+          maintenanceDept: this.ruleForm.wxdeptid,
+          maintenancer: this.ruleForm.assignMant,
           isExport: 0
         }
         return new Promise(resolve => {
@@ -151,14 +142,14 @@
       },
       btn_export() {
         const exporParams = {
-          page:this.pageParams.pageindex,
-          pagesize:this.pageParams.pagesize,
+          page: this.pageParams.pageindex,
+          pagesize: this.pageParams.pagesize,
           stime: this.ruleForm.startTime && this.ruleForm.startTime[0],
           endtime: this.ruleForm.startTime && this.ruleForm.startTime[1],
-          applicationdept:this.ruleForm.dept,
-          maintenanceDept:this.ruleForm.wxdeptid,
-          maintenancer:this.ruleForm.assignMant,
-          equipId:this.ruleForm.equipment,
+          applicationdept: this.ruleForm.dept,
+          maintenanceDept: this.ruleForm.wxdeptid,
+          maintenancer: this.ruleForm.assignMant,
+          equipId: this.ruleForm.equipment,
           isExport: 1
         }
         exportExcel(exporParams, getrepairListExpt)
@@ -223,10 +214,10 @@
         return result;
       },
       getDeptid(data) {
-        this.ruleForm.dept = data[data.length-1]
+        this.ruleForm.dept = data[data.length - 1]
       },
       getDeptid1(data) {
-        this.ruleForm.wxdeptid = data[data.length-1]
+        this.ruleForm.wxdeptid = data[data.length - 1]
         this.getRepairman(data[data.length - 1], 1)
       },
       getRepairman(id, state) {

CallCenterWeb.UI/RMYY/src/views/reportForm/repairReport/index.vue

@@ -2,15 +2,15 @@
   <div class="app-container">
     <el-row :gutter="20" />
     <el-form :inline="true" :model="ruleForm" class="demo-form-inline">
-      <el-form-item label="派单时间">
-        <el-date-picker v-model="ruleForm.startTime" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
+      <el-form-item label="派出时间">
+        <el-date-picker style="width: 500px;" v-model="ruleForm.startTime" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
           value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
-      <el-form-item label="申请科室">
+      <el-form-item label="报工科室">
         <select-dept-tree :deptparam="deptidArr" @post-deptid="getDeptid" />
       </el-form-item>
       <el-form-item label="维修人">
-        <el-input v-model="ruleForm.assignMant" placeholder="请输入维修人" clearable></el-input>
+        <el-input v-model="ruleForm.assignMant" placeholder="请输入维修人姓名" clearable></el-input>
         <!-- <el-select v-model="ruleForm.assignMant" placeholder="请选择维修人" clearable @change="changeUser">
           <el-option v-for="item in assignman" :key="item.usercode" :label="item.username" :value="item.usercode" />
         </el-select> -->