重庆刀模 2023年3月9日 sxm

3 years ago · 8bdd3455dc
13 changed files with 410 additions and 337 deletions
--- a/config/index.js
+++ b/config/index.js
@ -23,8 +23,8 @@ module.exports = {
    },

    // Various Dev Server settings
-    host: '192.168.1.110', // can be overwritten by process.env.HOST
-    port: 8002, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    host: 'localhost', // can be overwritten by process.env.HOST
+    port: 8003, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
    autoOpenBrowser: true,
    errorOverlay: true,
    notifyOnErrors: true,
--- a/package-lock.json
+++ b/package-lock.json
@ -9557,14 +9557,6 @@
        }
      }
    },
-    "kr-print-designer": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/kr-print-designer/-/kr-print-designer-1.1.8.tgz",
-      "integrity": "sha512-uQGv/XyjdpSNT3WZeCp1TswCvSywz3iU0Si7El+TGSRyyIBjKuawUe3MKzQWK0N2bWQdpZCnctTWw/C3buu4CQ==",
-      "requires": {
-        "nanoid": "^1.0.1"
-      }
-    },
    "last-call-webpack-plugin": {
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-2.1.2.tgz",
@ -10554,11 +10546,6 @@
      "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz",
      "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="
    },
-    "nanoid": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-1.3.4.tgz",
-      "integrity": "sha512-4ug4BsuHxiVHoRUe1ud6rUFT3WUMmjXt1W0quL0CviZQANdan7D8kqN5/maw53hmAApY/jfzMRkC57BNNs60ZQ=="
-    },
    "nanomatch": {
      "version": "1.2.13",
      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
--- a/package.json
+++ b/package.json
@ -25,7 +25,6 @@
    "gulp-load-plugins": "2.0.5",
    "gulp-replace": "1.0.0",
    "gulp-shell": "0.8.0",
-    "kr-print-designer": "^1.1.8",
    "lodash": "4.17.5",
    "node-sass": "4.13.1",
    "npm": "^6.9.0",
--- a/src/api/toolMan/tool-info.js
+++ b/src/api/toolMan/tool-info.js
@ -25,5 +25,8 @@ export const flagAdd = data => createAPI(`toolInfo/flagAdd`,'POST',data)
 // 获取工具使用记录
 export const updateSoToolInspectionApplyList = data => createAPI(`evaluated/updateSoToolInspectionApplyList`,'POST',data)

+// 工具实例出入记录
+export const getToolTransInfoList = data => createAPI(`toolInfo/getToolTransInfoList`,'POST',data)
+


--- a/src/assets/scss/global.scss
+++ b/src/assets/scss/global.scss
@ -114,3 +114,4 @@
 /* el-form-item 间距 end*/


+
--- a/src/main.js
+++ b/src/main.js
@ -14,10 +14,6 @@ import JsonExcel from 'vue-json-excel'
 import i18n from '@/i18n/i18n'
 import './directives'
 import decimalUtil from '@/utils/decimalUtil'
-import KrPrintDesigner from "kr-print-designer";
-import "kr-print-designer/lib/kr-print-designer.css";
-
-Vue.use(KrPrintDesigner);

 Vue.component('downloadExcel', JsonExcel)

--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@ -1,7 +1,7 @@
 <template>
  <nav class="site-navbar" :class="'site-navbar--' + navbarLayoutType">
    <div class="site-navbar__header">
-      <h1 class="site-navbar__brand" @click="$router.push({ name: 'home' })">
+      <h1 class="site-navbar__brand">
        <el-menu
          class="site-navbar__menu"
          mode="horizontal">
--- a/src/views/modules/bulletinBoard/toolDetailBoard.vue
+++ b/src/views/modules/bulletinBoard/toolDetailBoard.vue
@ -24,9 +24,20 @@
      <el-form-item :label="inputLabel.headerInput.label6">
        <el-input style="width: 100px;" v-model="queryData.endDays" onkeyup="value=value.replace(/[^\d]/g,'')"></el-input>
      </el-form-item>
+      <el-form-item :label="'状态'">
+        <el-select style="width: 100px;"  v-model="queryData.status">
+          <el-option value="" label="全部"></el-option>
+          <el-option value="已启用" label="已启用"></el-option>
+          <el-option value="在库" label="在库"></el-option>
+          <el-option value="出库" label="出库"></el-option>
+          <el-option value="退库" label="退库"></el-option>
+          <el-option value="维修中" label="维修中"></el-option>
+          <el-option value="已报废" label="已报废"></el-option>
+        </el-select>
+      </el-form-item>
      <el-form-item>
        <el-button @click="getDataList()" type="primary">{{buttons.search}}</el-button>
-        <el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}}
+        <el-button @click="saveColumnList()" type="primary" v-show="false">{{buttons.defaultTable}}
        </el-button>
        <el-button @click="userSetting" type="primary">{{ buttons.settingTable}}</el-button>
        <download-excel
@ -117,7 +128,7 @@ import {
            label3 : '开始使用次数',
            label4 : '结束使用次数',
            label5 : '呆滞天数',
-            label6 : '————',
+            label6 : '—',
          },
        },
        queryData : {
@ -128,6 +139,7 @@ import {
          endActualuseQty : '',
          startDays : '',
          endDays : '',
+          status: ''
        },
        site : this.$store.state.user.site,
        userName : this.$store.state.user.name,
@ -267,6 +279,23 @@ import {
            status: true,
            fixed: false
          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 2701,
+            serialNumber: 'toolDetail2701SupplierName',
+            tableId: "toolDetail2701",
+            tableName: "common",
+            columnProp: "status",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "状态",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false
+          },
          {
            userId: this.$store.state.user.name,
            functionId: 2701,
--- a/src/views/modules/sys/menu.vue
+++ b/src/views/modules/sys/menu.vue
@ -2,7 +2,7 @@
  <div class="mod-menu">
    <el-form :inline="true" :model="dataForm">
      <el-form-item>
-        <el-button v-if="isAuth('sys:menu:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+        <el-button  v-if="isAuth('sys:menu:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
      </el-form-item>
    </el-form>

--- a/src/views/modules/toolMan/location.vue
+++ b/src/views/modules/toolMan/location.vue
@ -781,13 +781,13 @@ import {
              LODOP.SET_PRINT_STYLE("LineHeight",-2);
              LODOP.ADD_PRINT_BARCODE(3,3,300,120,"QRCode",row.locationId);
              LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
-              LODOP.ADD_PRINT_TEXT(10,205,400,150,row.locationId );
-              LODOP.SET_PRINT_STYLEA(0,"FontSize",40);
+              LODOP.ADD_PRINT_TEXT(39,122,331,43,row.locationId );
+              LODOP.SET_PRINT_STYLEA(0,"FontSize",25);
            }

-            LODOP.PRINT_DESIGN();
+           // LODOP.PRINT_DESIGN();
            //LODOP.PREVIEW();
-            // LODOP.PRINT();
+             LODOP.PRINT();
            console.log("操作成功！")
          }
        }
--- a/src/views/modules/toolMan/quarantineLibrary.vue
+++ b/src/views/modules/toolMan/quarantineLibrary.vue
@ -328,6 +328,40 @@ import {
            status: true,
            fixed: false,
          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 2101,
+            serialNumber: 'library2101OactualuseQty',
+            tableId: "library2101",
+            tableName: "libraryTable",
+            columnProp: "actualuseQty",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "使用次数",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 2101,
+            serialNumber: 'library2101OrepairQty',
+            tableId: "library2101",
+            tableName: "libraryTable",
+            columnProp: "repairQty",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "维修次数",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false,
+          },
          {
            userId: this.$store.state.user.name,
            functionId: 2101,
@ -860,7 +894,7 @@ import {
        saveTableDefaultList(this.columnList).then(({data}) => {
          if (data.code == 0) {
            this.$message.success(data.msg)
-            this.showDefault = false
+            //this.showDefault = false
          } else {
            this.$message.error(data.msg)
          }
@ -868,7 +902,7 @@ import {
        saveTableDefaultList(this.columnList1).then(({data}) => {
          if (data.code == 0) {
            this.$message.success(data.msg)
-            this.showDefault = false
+           // this.showDefault = false
          } else {
            this.$message.error(data.msg)
          }
@ -883,10 +917,10 @@ import {
      getColumnList() {
        getTableDefaultListLanguage(this.queryTable).then(({data}) => {
          if (!data.rows.length == 0) {
-            this.showDefault = false
+           // this.showDefault = false
            this.columnList = data.rows
          } else {
-            this.showDefault = true
+           // this.showDefault = true
          }
        })
      },
--- a/src/views/modules/toolMan/tool-info.vue
+++ b/src/views/modules/toolMan/tool-info.vue
--- a/src/views/modules/toolMan/toolResume.vue
+++ b/src/views/modules/toolMan/toolResume.vue
@ -17,7 +17,7 @@
      </el-form-item>
      <el-form-item>
        <el-button @click="getDataList()" type="primary">{{buttons.search}}</el-button>
-        <el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}}
+        <el-button @click="saveColumnList()"  type="primary" v-show="showDefault">{{buttons.defaultTable}}
        </el-button>
        <el-button @click="userSetting" type="primary">{{ buttons.settingTable}}</el-button>
        <download-excel
@ -374,7 +374,7 @@ import {
            columnProp: "actualuseQty",
            headerAlign: "center",
            align: "center",
-            columnLabel: "已使用米数",
+            columnLabel: "已使用次数",
            columnHidden: false,
            columnImage: false,
            columnSortable: false,
@ -392,7 +392,7 @@ import {
            columnProp: "estuseQty",
            headerAlign: "center",
            align: "right",
-            columnLabel: "预计使用米数",
+            columnLabel: "预计使用次数",
            columnHidden: false,
            columnImage: false,
            columnSortable: false,
@ -784,7 +784,7 @@ import {
      })
    },
    activated() {
-      this.getDataList()
+      //this.getDataList()
      this.getLanguageList()
    },
    methods: {