2023-11-02 设备和质量修改

2 years ago · 38e1fb138d
10 changed files with 233 additions and 80 deletions
--- a/src/api/eam/eam.js
+++ b/src/api/eam/eam.js
@ -166,6 +166,7 @@ export const cancelFeedBack= data => createAPI(`/pms/eam/cancelFeedBack`,'post',
 export const saveDefectOrder= data => createAPI(`/pms/eam/saveDefectOrder`,'post',data)
 export const imageDelete= data => createAPI(`/pms/eam/imageDelete`,'post',data)
 export const getDeptList= data => createAPI(`/pms/eam/getDeptList`,'post',data)
+export const updateReportResult= data => createAPI(`/pms/eam/updateReportResult`,'post',data)


 //---------------快速添加-------------------
--- a/src/api/partspare/inventorystock.js
+++ b/src/api/partspare/inventorystock.js
@ -25,7 +25,7 @@ export function partSpareTemp(dataList) {
      LODOP.ADD_PRINT_TEXT(50, 189, 141, 21, row.umid);
      LODOP.ADD_PRINT_TEXT(95, 6, 68, 20, "规格型号:");
      LODOP.ADD_PRINT_TEXT(95, 73, 241, 21, row.spec);
-      LODOP.ADD_PRINT_TEXT(69, 98, 92, 20, "库位编码:");
+      LODOP.ADD_PRINT_TEXT(69, 98, 92, 20, "货位编码:");
      LODOP.ADD_PRINT_TEXT(70, 188, 141, 21, row.locationId);
    }
    // LODOP.PRINT_DESIGN();
--- a/src/views/modules/eam/eamWorkOrderForCheck.vue
+++ b/src/views/modules/eam/eamWorkOrderForCheck.vue
@ -11,6 +11,9 @@
      <el-form-item :label="'计划编码'">
        <el-input v-model="searchData.planID" style="width: 120px"></el-input>
      </el-form-item>
+      <el-form-item :label="'工单编码'">
+        <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
+      </el-form-item>
      <el-form-item :label="'设备编码'">
        <el-input v-model="searchData.objectID" style="width: 120px"></el-input>
      </el-form-item>
@ -87,33 +90,14 @@
        prop="checkResult"
        header-align="center"
        align="center"
-        label="点检结论">
+        label="点检结论"
+        width="80">
        <template slot-scope="scope">
          <div :style="{ color: scope.row.checkResult === '合格' ? 'green' : scope.row.checkResult === '不合格' ? 'red' : ''}">
            {{ scope.row.checkResult }}
          </div>
        </template>
      </el-table-column>
-      <el-table-column
-        prop="planID"
-        header-align="center"
-        align="center"
-        label="计划编码">
-      </el-table-column>
-      <el-table-column
-        prop="planDesc"
-        header-align="center"
-        align="left"
-        label="计划描述"
-        :width="flexColumnWidth('计划描述','planDesc')">
-      </el-table-column>
-      <el-table-column
-        prop="orderNo"
-        header-align="center"
-        align="center"
-        label="工单编码"
-        :width="flexColumnWidth('工单编码','orderNo')">
-      </el-table-column>
      <el-table-column
        v-for="(item,index) in columnList" :key="index"
        :sortable="item.columnSortable"
@ -404,6 +388,60 @@
        departmentList:[],
        // 展示列集
        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101014,
+            serialNumber: '101014TablePlanID',
+            tableId: "101014Table",
+            tableName: "common",
+            columnProp: 'planID',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '计划编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101014,
+            serialNumber: '101014TablePlanDesc',
+            tableId: "101014Table",
+            tableName: "common",
+            columnProp: 'planDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '计划描述',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101014,
+            serialNumber: '101014TableOrderNo',
+            tableId: "101014Table",
+            tableName: "common",
+            columnProp: 'orderNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '工单编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: true,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
          {
            userId: this.$store.state.user.name,
            functionId: 101014,
@ -420,6 +458,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 80,
          },
          {
            userId: this.$store.state.user.name,
@ -437,6 +476,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 120,
          },
          {
            userId: this.$store.state.user.name,
@ -454,6 +494,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 80,
          },
          {
            userId: this.$store.state.user.name,
@ -471,6 +512,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 80,
          },
          {
            userId: this.$store.state.user.name,
@ -484,10 +526,11 @@
            columnLabel: '状态',
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
+            columnSortable: true,
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 80,
          },
          {
            userId: this.$store.state.user.name,
@ -505,6 +548,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 120,
          },
          {
            userId: this.$store.state.user.name,
@ -522,6 +566,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 100,
          },
          {
            userId: this.$store.state.user.name,
@ -539,6 +584,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 100,
          },
          {
            userId: this.$store.state.user.name,
@ -556,6 +602,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 100,
          },
          {
            userId: this.$store.state.user.name,
@ -573,6 +620,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 130,
          },
          {
            userId: this.$store.state.user.name,
@ -582,7 +630,7 @@
            tableName: "common",
            columnProp: 'workTime',
            headerAlign: "center",
-            align: "center",
+            align: "right",
            columnLabel: '工作时长(m)',
            columnHidden: false,
            columnImage: false,
@ -590,6 +638,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 80,
          },
          {
            userId: this.$store.state.user.name,
@ -607,6 +656,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 120,
          }
        ],
        //执行结果
@ -807,7 +857,7 @@
      controlRowStyle({row, rowIndex}) {
        // 区分不同的样式对应不同的颜色
        if (row.status === '待审核') {
-          return "background-color: #E2F1F5"
+          return "background-color: #D8ECF1"
        }
      },

@ -979,14 +1029,13 @@
          }).then(() => {
            checkWorkOrder(this.submitData).then(({data}) => {
              if (data && data.code === 0) {
-                this.getDataList();
+                this.getDataList()
                this.saveData.status = '待审核'
                this.$message({
                  message: '操作成功',
                  type: 'success',
                  duration: 1500,
-                  onClose: () => {
-                  }
+                  onClose: () => {}
                })
              } else {
                this.$alert(data.msg, '错误', {
@ -996,8 +1045,7 @@
            })
          }).catch(() => {
          })
-        }else if (this.submitData.status === '待审核'){
-          console.log(this.$store.state.user)
+        } else if (this.submitData.status === '待审核'){
          if (!this.submitData.checker.split(';').includes(tempData.mesUser)){
            this.$message.warning('审核人员与计划不符！')
            return
@ -1009,14 +1057,13 @@
          }).then(() => {
            checkWorkOrder(this.submitData).then(({data}) => {
              if (data && data.code === 0) {
-                this.getDataList();
+                this.getDataList()
                this.saveData.status = '已完工'
                this.$message({
                  message: '操作成功',
                  type: 'success',
                  duration: 1500,
-                  onClose: () => {
-                  }
+                  onClose: () => {}
                })
              } else {
                this.$alert(data.msg, '错误', {
--- a/src/views/modules/eam/eamWorkOrderForDefect.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect.vue
@ -8,13 +8,16 @@

    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
      <el-form-item :label="'反馈单号'">
-        <el-input v-model="searchData.planID" style="width: 100px"></el-input>
+        <el-input v-model="searchData.planID" style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'工单编码'">
+        <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
      </el-form-item>
      <el-form-item :label="'设备编码'">
-        <el-input v-model="searchData.objectID" style="width: 100px"></el-input>
+        <el-input v-model="searchData.objectID" style="width: 120px"></el-input>
      </el-form-item>
      <el-form-item :label="'计划机修人员编码'">
-        <el-input v-model="searchData.planOperator" style="width: 100px"></el-input>
+        <el-input v-model="searchData.planOperator" style="width: 120px"></el-input>
      </el-form-item>
      <el-form-item :label="'人员部门'">
 <!--        <span slot="label" @click="getDepartmentList()"><a>设备部门</a></span>-->
@ -196,10 +199,10 @@
          <el-date-picker style="width: 159px" v-model="detailData.planDate" type="datetime" readonly value-format='yyyy-MM-dd' format='yyyy-MM-dd'></el-date-picker>
        </el-form-item>
        <el-form-item :label="'到达时间'">
-          <el-date-picker style="width: 159px" v-model="detailData.reachDate" type="datetime" readonly value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss'></el-date-picker>
+          <el-date-picker style="width: 159px" v-model="detailData.reachDate" type="datetime" value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss'></el-date-picker>
        </el-form-item>
        <el-form-item :label="'实际执行时间'">
-          <el-date-picker style="width: 159px" v-model="detailData.actualDate" type="datetime" readonly value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss'></el-date-picker>
+          <el-date-picker style="width: 159px" v-model="detailData.actualDate" type="datetime" value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss'></el-date-picker>
        </el-form-item>
      </el-form>
      <el-form :inline="true" label-position="top">
@ -234,6 +237,7 @@
        </el-form-item>
      </el-form>
      <el-footer style="height:40px;margin-top: 90px;text-align:center">
+        <el-button type="primary" @click="updateResult()">保存</el-button>
        <el-button type="primary" @click="detailModelFlag = false">关闭</el-button>
      </el-footer>
    </el-dialog>
@ -314,10 +318,12 @@
    submitDefect,
    searchFileUrl,
    getEmpyDeptList,
-    getDeptList
+    getDeptList,
+    updateReportResult, // 修改执行结果
  } from "@/api/eam/eam.js"
  import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
  import Chooselist from '@/views/modules/common/Chooselist_eam'
+  import {isAuth} from '../../../utils'
  export default {
    components: {
      Chooselist
@ -394,11 +400,11 @@
            columnLabel: '紧急程度',
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
+            columnSortable: true,
            sortLv: 0,
            status: true,
            fixed: '',
-            columnWidth: 60,
+            columnWidth: 90,
          },
          {
            userId: this.$store.state.user.name,
@ -412,10 +418,11 @@
            columnLabel: '工单编码',
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
+            columnSortable: true,
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 100,
          },
          {
            userId: this.$store.state.user.name,
@ -429,10 +436,11 @@
            columnLabel: '反馈单号',
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
+            columnSortable: true,
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 100,
          },
          {
            userId: this.$store.state.user.name,
@ -450,6 +458,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 80,
          },
          {
            userId: this.$store.state.user.name,
@ -467,6 +476,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 80,
          },
          {
            userId: this.$store.state.user.name,
@ -484,6 +494,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 80,
          },
          {
            userId: this.$store.state.user.name,
@ -501,6 +512,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 120,
          },
          {
            userId: this.$store.state.user.name,
@ -518,6 +530,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 120,
          },
          {
            userId: this.$store.state.user.name,
@ -535,6 +548,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 100,
          },
          {
            userId: this.$store.state.user.name,
@ -552,6 +566,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 80,
          },
          {
            userId: this.$store.state.user.name,
@ -565,10 +580,11 @@
            columnLabel: '状态',
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
+            columnSortable: true,
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 80,
          },
          {
            userId: this.$store.state.user.name,
@ -582,10 +598,11 @@
            columnLabel: '维修结果',
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
+            columnSortable: true,
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 80,
          },
          {
            userId: this.$store.state.user.name,
@ -603,6 +620,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 80,
          },
          {
            userId: this.$store.state.user.name,
@ -620,6 +638,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 100,
          },
          {
            userId: this.$store.state.user.name,
@ -637,6 +656,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 100,
          },
          {
            userId: this.$store.state.user.name,
@ -650,10 +670,11 @@
            columnLabel: '计划执行日期',
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
+            columnSortable: true,
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 100,
          },
          {
            userId: this.$store.state.user.name,
@ -667,10 +688,11 @@
            columnLabel: '故障时间',
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
+            columnSortable: true,
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 130,
          },
          {
            userId: this.$store.state.user.name,
@ -684,10 +706,11 @@
            columnLabel: '到达时间',
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
+            columnSortable: true,
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 130,
          },
          {
            userId: this.$store.state.user.name,
@ -701,10 +724,11 @@
            columnLabel: '实际执行时间',
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
+            columnSortable: true,
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 130,
          },
          {
            userId: this.$store.state.user.name,
@ -722,6 +746,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 110,
          },
          {
            userId: this.$store.state.user.name,
@ -739,6 +764,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 80,
          },
          {
            userId: this.$store.state.user.name,
@ -756,6 +782,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 120,
          },
          {
            userId: this.$store.state.user.name,
@ -773,6 +800,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 80,
          },
          {
            userId: this.$store.state.user.name,
@ -790,6 +818,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 120,
          },
        ],
        changeModelFlag:false,
@ -870,7 +899,7 @@
      controlRowStyle({row, rowIndex}) {
        // 区分不同的样式对应不同的颜色
        if (row.status === '待审核') {
-          return "background-color: #E2F1F5"
+          return "background-color: #D8ECF1"
        }
      },

@ -1077,6 +1106,10 @@

      // 审核按钮
      checkModal(){
+        if (!this.isAuth(this.$route.meta.menuId+":check")) {
+          this.$message.warning('无审核权限！')
+          return
+        }
        this.submitData.site = this.detailData.site
        this.submitData.orderNo = this.detailData.orderNo
        this.submitData.planID = this.detailData.planID
@ -1096,14 +1129,13 @@
            this.submitData.status = '待审核'
            submitDefect(this.submitData).then(({data}) => {
              if (data && data.code === 0) {
-                this.getDataList();
+                this.getDataList()
                this.detailData.status = '待审核'
                this.$message({
                  message: '操作成功',
                  type: 'success',
                  duration: 1500,
-                  onClose: () => {
-                  }
+                  onClose: () => {}
                })
              } else {
                this.$alert(data.msg, '错误', {
@ -1166,11 +1198,47 @@
          actualDate: row.actualDate,
          planDesc: row.planDesc,
          disposalMeasures: row.disposalMeasures,
-          handlingMethod: row.handlingMethod
+          handlingMethod: row.handlingMethod,
+          functionType: row.functionType
        }
        this.detailModelFlag = true;
      },

+      updateResult () {
+        if (!this.isAuth(this.$route.meta.menuId+":check")) {
+          this.$message.warning('无审核权限！')
+          return
+        }
+        if(this.detailData.reachDate === '' || this.detailData.reachDate == null){
+          this.$message.warning('请选择到达时间！')
+          return
+        }
+        if(this.detailData.actualDate === '' || this.detailData.actualDate == null){
+          this.$message.warning('请选择实际执行时间！')
+          return
+        }
+        if (this.detailData.reachDate > this.detailData.actualDate) {
+          this.$message.warning('到达时间不能小于实际执行时间！')
+          return
+        }
+        updateReportResult(this.detailData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.getDataList()
+            this.detailModelFlag = false
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+
      /**
       * 查看故障图片
       */
--- a/src/views/modules/eam/eamWorkOrderForMaintenance.vue
+++ b/src/views/modules/eam/eamWorkOrderForMaintenance.vue
@ -9,6 +9,9 @@
      <el-form-item :label="'计划编码'">
        <el-input v-model="searchData.planID" style="width: 120px"></el-input>
      </el-form-item>
+      <el-form-item :label="'工单编码'">
+        <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
+      </el-form-item>
      <el-form-item :label="'设备编码'">
        <el-input v-model="searchData.objectID" style="width: 120px"></el-input>
      </el-form-item>
@ -86,7 +89,7 @@
        header-align="center"
        align="center"
        label="维保结论"
-        width="60">
+        width="80">
        <template slot-scope="scope">
          <div :style="{ color: scope.row.checkResult =='合格' ? 'green' : scope.row.checkResult =='异常' ? 'red' : ''}">
            {{ scope.row.checkResult }}
@ -454,6 +457,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 100,
          },
          {
            userId: this.$store.state.user.name,
@ -467,10 +471,11 @@
            columnLabel: '计划编码',
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
+            columnSortable: true,
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 100,
          },
          {
            userId: this.$store.state.user.name,
@ -484,10 +489,11 @@
            columnLabel: '工单编码',
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
+            columnSortable: true,
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 100,
          },
          {
            userId: this.$store.state.user.name,
@ -505,6 +511,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 80,
          },
          {
            userId: this.$store.state.user.name,
@ -522,6 +529,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 120,
          },
          {
            userId: this.$store.state.user.name,
@ -539,6 +547,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 80,
          },
          {
            userId: this.$store.state.user.name,
@ -556,6 +565,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 120,
          },
          {
            userId: this.$store.state.user.name,
@ -569,10 +579,11 @@
            columnLabel: '状态',
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
+            columnSortable: true,
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 80,
          },
          {
            userId: this.$store.state.user.name,
@ -590,6 +601,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 120,
          },
          {
            userId: this.$store.state.user.name,
@ -607,6 +619,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 100,
          },
          {
            userId: this.$store.state.user.name,
@ -624,6 +637,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 120,
          },
          {
            userId: this.$store.state.user.name,
@ -641,6 +655,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 100,
          },
          {
            userId: this.$store.state.user.name,
@ -654,10 +669,11 @@
            columnLabel: '计划执行日期',
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
+            columnSortable: true,
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 100,
          },
          {
            userId: this.$store.state.user.name,
@ -671,10 +687,11 @@
            columnLabel: '到达时间',
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
+            columnSortable: true,
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 130,
          },
          {
            userId: this.$store.state.user.name,
@ -688,10 +705,11 @@
            columnLabel: '实际执行时间',
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
+            columnSortable: true,
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 130,
          },
          {
            userId: this.$store.state.user.name,
@ -701,7 +719,7 @@
            tableName: "common",
            columnProp: 'workTime',
            headerAlign: "center",
-            align: "center",
+            align: "right",
            columnLabel: '工作时长(m)',
            columnHidden: false,
            columnImage: false,
@ -709,6 +727,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 80,
          },
          {
            userId: this.$store.state.user.name,
@ -726,6 +745,7 @@
            sortLv: 0,
            status: true,
            fixed: '',
+            columnWidth: 120,
          },
        ],
        changeModelFlag:false,
@ -962,7 +982,7 @@
      controlRowStyle({row, rowIndex}) {
        // 区分不同的样式对应不同的颜色
        if (row.status === '待审核') {
-          return "background-color: #E2F1F5"
+          return "background-color: #D8ECF1"
        }
      },

--- a/src/views/modules/partspare/inventorystock.vue
+++ b/src/views/modules/partspare/inventorystock.vue
@ -77,8 +77,8 @@
            -
            <el-input  style="width: 145px" v-model="queryForm.endQtyOnHand" clearable></el-input>
          </el-form-item>
-          <el-form-item label="库位编码">
-            <el-input v-model="queryForm.warehouseId" clearable></el-input>
+          <el-form-item label="货位编码">
+            <el-input v-model="queryForm.locationId" clearable></el-input>
          </el-form-item>
          <el-form-item label="安全库存汇总">
            <el-select v-model="queryForm.safetyStock" clearable style="width: 100px">
@ -228,7 +228,7 @@ export default {
          columnProp: 'locationId',
          headerAlign: "center",
          align: "left",
-          columnLabel: '库位编码',
+          columnLabel: '货位编码',
          columnHidden: false,
          columnImage: false,
          columnSortable: false,
@ -341,7 +341,7 @@ export default {
          columnProp: 'locationId',
          headerAlign: "center",
          align: "left",
-          columnLabel: '库位编码',
+          columnLabel: '货位编码',
          columnHidden: false,
          columnImage: false,
          columnSortable: false,
@ -525,7 +525,7 @@ export default {
      let minStock = row.minStock
      // 区分不同的样式对应不同的颜色
      if (qtyOnHand <= minStock) {
-        return "background-color: #E2F1F5"
+        return "background-color: #D8ECF1"
      }
    },

--- a/src/views/modules/partspare/partSpareLocation.vue
+++ b/src/views/modules/partspare/partSpareLocation.vue
@ -22,7 +22,7 @@
          <el-option value="N" label="否"></el-option>
        </el-select>
      </el-form-item>
-      <el-form-item label="库位">
+      <el-form-item label="仓库">
        <el-select v-model="searchData.warehouseId" clearable>
          <el-option
            v-for="(item,index) in wareHouseList "
@ -108,7 +108,7 @@
    </el-pagination>

    <!-- 新增编辑模态框 -->
-    <el-dialog title="库位" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
+    <el-dialog title="货位" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
        <el-form-item label="货位编码:" prop="locationId" :rules="rules.locationIdType">
          <el-input v-model="modalData.locationId" :disabled="modalDisableFlag" style="width: 221px"></el-input>
@ -119,10 +119,10 @@
      </el-form>
      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
        <el-form-item prop="warehouseId" :rules="rules.warehouseIdType">
-          <span slot="label" @click="getBaseList(111)"><a herf="#">库位编码</a></span>
+          <span slot="label" @click="getBaseList(111)"><a herf="#">仓库编码</a></span>
          <el-input v-model="modalData.warehouseId" style="width: 221px;"></el-input>
        </el-form-item>
-        <el-form-item label="库位名称" prop="warehouseName" :rules="rules.warehouseNameType">
+        <el-form-item label="仓库名称" prop="warehouseName" :rules="rules.warehouseNameType">
          <el-input v-model="modalData.warehouseName" disabled style="width: 221px"></el-input>
        </el-form-item>
      </el-form>
@ -497,11 +497,11 @@ export default {
        return false
      }
      if (this.modalData.warehouseId === '' || this.modalData.warehouseId == null) {
-        this.$message.warning("请选择库位编码!")
+        this.$message.warning("请选择仓库编码!")
        return false
      }
      if (this.modalData.warehouseName === '' || this.modalData.warehouseName == null) {
-        this.$message.warning("请选择库位名称!")
+        this.$message.warning("请选择仓库名称!")
        return false
      }
      if (this.modalData.active === '' || this.modalData.active == null) {
@ -547,7 +547,7 @@ export default {

    // 删除
    deleteModal (row) {
-      this.$confirm(`是否确认删除该库位?`, '提示', {
+      this.$confirm(`是否确认删除该货位?`, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
--- a/src/views/modules/partspare/partspare-add-or-update.vue
+++ b/src/views/modules/partspare/partspare-add-or-update.vue
@ -55,8 +55,8 @@
          <el-input v-model="dataForm.warehouseId"></el-input>
        </el-form-item>
        <el-form-item required>
-          <el-link v-if="dataForm.warehouseId" slot="label" @click="getBaseList(112)">库位编码</el-link>
-          <span v-if="!dataForm.warehouseId" slot="label">库位编码</span>
+          <el-link v-if="dataForm.warehouseId" slot="label" @click="getBaseList(112)">货位编码</el-link>
+          <span v-if="!dataForm.warehouseId" slot="label">货位编码</span>
          <el-input v-model="dataForm.locationId"></el-input>
        </el-form-item>
      </el-form>
@ -217,7 +217,7 @@ export default {
        return;
      }
      if (!this.dataForm.locationId) {
-        this.$message.warning("库位编码不能为空")
+        this.$message.warning("货位编码不能为空")
        return;
      }
      if (this.addOrUpdate) {
--- a/src/views/modules/partspare/partspare.vue
+++ b/src/views/modules/partspare/partspare.vue
@ -524,6 +524,23 @@ export default {
          status: true,
          fixed: '',
          columnWidth: 140,
+        }, {
+          userId: this.$store.state.user.name,
+          functionId: this.$route.meta.menuId,
+          serialNumber: 'toolDetail1101ToolId',
+          tableId: "toolOIRecord",
+          tableName: "common",
+          columnProp: 'warehouseName',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '仓库名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140,
        },
      ],
    }
--- a/src/views/modules/partspare/repairtransdetail.vue
+++ b/src/views/modules/partspare/repairtransdetail.vue
@ -21,7 +21,7 @@
              <el-option value="+" label="入库"></el-option>
            </el-select>
          </el-form-item>
-          <el-form-item label="库位编码">
+          <el-form-item label="货位编码">
            <el-input v-model="queryForm.locationId" clearable></el-input>
          </el-form-item>
          <el-form-item label="仓库">
@ -243,7 +243,7 @@ export default {
          columnProp: 'locationId',
          headerAlign: "center",
          align: "left",
-          columnLabel: '库位编码',
+          columnLabel: '货位编码',
          columnHidden: false,
          columnImage: false,
          columnSortable: false,