From 864d456592eac0b4da5e73e29aa86c084418427b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Fri, 4 Aug 2023 13:13:30 +0800
Subject: [PATCH] 2023-08-04

---
 src/api/knifemold/tool-info.js                |   9 +
 .../modules/knifemold/tool-info-list.vue      |   2 +-
 src/views/modules/knifemold/tool-info.vue     |  30 +-
 src/views/modules/knifemold/toolAttribute.vue | 261 +++++++++++++++
 src/views/modules/knifemold/toolCost.vue      | 300 ++++++++++++++++++
 .../print/label/print_tool_label_preview.js   |   4 +-
 6 files changed, 594 insertions(+), 12 deletions(-)
 create mode 100644 src/views/modules/knifemold/toolAttribute.vue
 create mode 100644 src/views/modules/knifemold/toolCost.vue

diff --git a/src/api/knifemold/tool-info.js b/src/api/knifemold/tool-info.js
index 26277d2..76ea6cf 100644
--- a/src/api/knifemold/tool-info.js
+++ b/src/api/knifemold/tool-info.js
@@ -56,3 +56,12 @@ export const getItemData = data => createAPI(`toolInfo/getItemData`, 'POST', dat
 export const deleteItemModal = data => createAPI(`toolInfo/deleteItemModal`, 'POST', data)
 export const checkAssessRecord = data => createAPI(`toolInfo/checkAssessRecord`, 'POST', data)
 export const refreshItemModal = data => createAPI(`toolInfo/refreshItemModal`, 'POST', data)
+
+// ============================================= 工具属性 ================================================
+export const getToolAttributeList = data => createAPI(`toolInfo/getToolAttributeList`, 'POST', data)
+
+// ============================================= 工具成本 ================================================
+export const getToolCostList = data => createAPI(`toolInfo/getToolCostList`, 'POST', data)
+
+
+
diff --git a/src/views/modules/knifemold/tool-info-list.vue b/src/views/modules/knifemold/tool-info-list.vue
index f1e691b..d43dd66 100644
--- a/src/views/modules/knifemold/tool-info-list.vue
+++ b/src/views/modules/knifemold/tool-info-list.vue
@@ -234,7 +234,7 @@ export default {
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: 'left',
+          fixed: '',
           columnWidth: 140
         },
         {
diff --git a/src/views/modules/knifemold/tool-info.vue b/src/views/modules/knifemold/tool-info.vue
index 5b30d5d..ef3c6f0 100644
--- a/src/views/modules/knifemold/tool-info.vue
+++ b/src/views/modules/knifemold/tool-info.vue
@@ -142,7 +142,7 @@
                 </el-row>
                 <el-row>
                   <el-col :span="12">
-                    <el-form-item :label="'预计刀模寿命'">
+                    <el-form-item :label="'预计寿命'">
                       <el-input style="width: 150px;" readonly v-model="currentDetailData.estUseQty"></el-input>
                     </el-form-item>
                   </el-col>
@@ -182,9 +182,16 @@
                       <el-input style="width: 150px;" readonly v-model="currentDetailData.locationId"></el-input>
                     </el-form-item>
                   </el-col>
+                  <el-col :span="12">
+                    <el-form-item :label="'金额'">
+                      <el-input style="width: 150px;" readonly v-model="currentDetailData.price"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
                   <el-col :span="12">
                     <el-form-item :label="'备注'">
-                      <el-input style="width: 150px;" readonly v-model="currentDetailData.remark"></el-input>
+                      <el-input style="width: 311px;" readonly v-model="currentDetailData.remark"></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -485,7 +492,7 @@
             style="width: 130px;">
           </el-date-picker>
         </el-form-item>
-        <el-form-item :label="'预计刀模寿命'">
+        <el-form-item :label="'预计寿命'">
           <el-input oninput="value=value.replace(/[^0-9]/g,'')" style="width: 130px;" v-model="editData.estUseQty"></el-input>
         </el-form-item>
         <el-form-item :label="'使用寿命'">
@@ -495,7 +502,10 @@
           <el-input style="width: 130px;" v-model="editData.locationId"></el-input>
         </el-form-item>
         <el-form-item :label="'备注'">
-          <el-input style="width: 418px;" v-model="editData.remark"></el-input>
+          <el-input style="width: 273px;" v-model="editData.remark"></el-input>
+        </el-form-item>
+        <el-form-item :label="'金额'">
+          <el-input style="width: 130px;" type="number" v-model="editData.price"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -664,7 +674,8 @@ export default {
         toolInstanceId: '',
         torNumacc: '',
         torNumdown: '',
-        workCenterNo: ''
+        workCenterNo: '',
+        price: ''
       },
       setUp: {
         toolEditFlag: false,
@@ -732,7 +743,8 @@ export default {
         strPhaseInDate: '',
         strPhaseOutDate: '',
         strPurchaseDate: '',
-        lifespan: ''
+        lifespan: '',
+        price: ''
       },
       detailList: [],
       headerData: {
@@ -2213,15 +2225,15 @@ export default {
     initToolModel(val) {
       this.setUp.toolEditFlag = true
       this.setUp.saveToolFlag = false
-      if (val === 'N') {
+      if (val === 'N') { // 修改
         this.toolDetailAddOrEdit = true
         this.editData = JSON.parse(JSON.stringify(this.currentDetailData))
         this.editData.flag = '2'
-      } else if (val === 'copy') {
+      } else if (val === 'copy') { // 复制
         this.editData = JSON.parse(JSON.stringify(this.currentDetailData))
         this.editData.toolInstanceId = ''
         this.editData.flag = '1'
-      } else {
+      } else { // 新增
         Object.assign(this.$data.editData, this.$options.data.call(this).editData)
         this.editData.flag = '1'
         this.toolDetailAddOrEdit = false
diff --git a/src/views/modules/knifemold/toolAttribute.vue b/src/views/modules/knifemold/toolAttribute.vue
new file mode 100644
index 0000000..bb65614
--- /dev/null
+++ b/src/views/modules/knifemold/toolAttribute.vue
@@ -0,0 +1,261 @@
+<template>
+  <div class="mod-config">
+    <el-row>
+      <el-col :span="24">
+        <el-form :inline="true" label-position="top">
+          <el-form-item :label="'工具编码'">
+            <el-input style="width: 100px" v-model="queryTool.partNo" ></el-input>
+          </el-form-item>
+          <el-form-item :label="'工具名称'">
+            <el-input style="width: 100px" v-model="queryTool.toolDescription" ></el-input>
+          </el-form-item>
+          <el-form-item :label="'属性编码'">
+            <el-input style="width: 100px" v-model="queryTool.propertiesItemNo" ></el-input>
+          </el-form-item>
+          <el-form-item :label="'属性名称'">
+            <el-input style="width: 100px" v-model="queryTool.itemDesc" ></el-input>
+          </el-form-item>
+          <el-form-item :label="' '">
+            <el-button @click="getDataList()" type="primary">查询</el-button>
+          </el-form-item>
+          <el-form-item :label="' '">
+            <download-excel
+              :fields="fields()"
+              :data="exportData"
+              type="xls"
+              :name="exportName"
+              :header="exportHeader"
+              :footer="exportFooter"
+              :defaultValue="exportDefaultValue"
+              :fetch="createExportData"
+              :before-generate="startDownload"
+              :before-finish="finishDownload"
+              worksheet="导出信息"
+              class="el-button el-button--primary el-button--medium">
+              导出
+            </download-excel>
+          </el-form-item>
+        </el-form>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24">
+        <el-table
+          :height="height"
+          :data="dataList"
+          border
+          v-loading="dataListLoading"
+          style="width: 100%;">
+          <el-table-column
+            v-for="(item,index) in columnList" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed==''?false:item.fixed"
+            :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          @size-change="sizeChangeHandle"
+          @current-change="currentChangeHandle"
+          :current-page="pageIndex"
+          :page-sizes="[20, 50, 100, 200, 500]"
+          :page-size="pageSize"
+          :total="totalPage"
+          layout="total, sizes, prev, pager, next, jumper">
+        </el-pagination>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import column from '../common/column'
+import {getToolAttributeList} from '@/api/knifemold/tool-info.js'
+export default {
+  components: {column},
+  data () {
+    return {
+      height: 0,
+      // 数据查询属性
+      dataListLoading: false,
+      queryTool: {
+        limit: 500,
+        page: 1,
+        site: this.$store.state.user.site,
+        recordType: 'T',
+        partNo: '',
+        toolDescription: '',
+        propertiesItemNo: '',
+        itemDesc: ''
+      },
+      pageIndex: 1,
+      pageSize: 50,
+      totalPage: 0,
+      dataList: [],
+      columnList: [
+        {
+          columnProp: 'partNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '工具编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: ''
+        },
+        {
+          columnProp: 'toolDescription',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '工具名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: ''
+        },
+        {
+          columnProp: 'propertiesItemNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '属性编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: ''
+        },
+        {
+          columnProp: 'itemDesc',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '属性名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: ''
+        },
+        {
+          columnProp: 'valueType',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '属性值类型',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: ''
+        },
+        {
+          columnProp: 'textValue',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '文本值',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: ''
+        },
+        {
+          columnProp: 'numValue',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '数值',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: ''
+        }
+      ],
+      exportData: [],
+      exportName: this.$route.meta.title,
+      exportHeader: [this.$route.meta.title],
+      exportFooter: [],
+      exportDefaultValue: ''
+    }
+  },
+  mounted () {
+    this.$nextTick(() => {
+      this.height = window.innerHeight - 220
+    })
+  },
+  methods: {
+    // ---------------  业务  -------------------
+    getDataList () {
+      this.dataListLoading = true
+      this.queryTool.limit = this.pageSize
+      this.queryTool.page = this.pageIndex
+      getToolAttributeList(this.queryTool).then(({data}) => {
+        if (data.code === 0) {
+          this.dataList = data.page.list
+          this.pageIndex = data.page.currPage
+          this.pageSize = data.page.pageSize
+          this.totalPage = data.page.totalCount
+        }
+        this.dataListLoading = false
+      })
+    },
+    //  --------- 分页 ----------
+    // 每页数
+    sizeChangeHandle (val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getDataList()
+    },
+    // 当前页
+    currentChangeHandle (val) {
+      this.pageIndex = val
+      this.getDataList()
+    },
+    //  --------- 分页 end ----------
+    //  --------- 导出 ----------
+    fields () {
+      let json = "{"
+      this.columnList.forEach((item, index) => {
+        if (index == this.columnList.length - 1) {
+          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+        } else {
+          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+        }
+      })
+      json += "}"
+      let s = eval("(" + json + ")")
+      return s
+    },
+    createExportData () {
+      // 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据
+      return this.dataList
+    },
+    startDownload () {
+    },
+    finishDownload () {
+    }
+    //  --------- 导出 end ----------
+  },
+  created () {
+    this.getDataList()
+  }
+}
+</script>
+<style>
+
+</style>
diff --git a/src/views/modules/knifemold/toolCost.vue b/src/views/modules/knifemold/toolCost.vue
new file mode 100644
index 0000000..e6fff1e
--- /dev/null
+++ b/src/views/modules/knifemold/toolCost.vue
@@ -0,0 +1,300 @@
+<template>
+  <div class="mod-config">
+    <el-row>
+      <el-col :span="24">
+        <el-form :inline="true" label-position="top">
+          <el-form-item :label="'工具编码'">
+            <el-input style="width: 100px" v-model="queryTool.toolId" ></el-input>
+          </el-form-item>
+          <el-form-item :label="'工具名称'">
+            <el-input style="width: 100px" v-model="queryTool.toolDescription" ></el-input>
+          </el-form-item>
+          <el-form-item :label="'实例编码'">
+            <el-input style="width: 100px" v-model="queryTool.toolInstanceId" ></el-input>
+          </el-form-item>
+          <el-form-item :label="'客户'">
+            <el-input style="width: 100px" v-model="queryTool.customer" ></el-input>
+          </el-form-item>
+          <el-form-item :label="'出资方'">
+            <el-input style="width: 100px" v-model="queryTool.contributor" ></el-input>
+          </el-form-item>
+          <el-form-item :label="' '">
+            <el-button @click="getDataList()" type="primary">查询</el-button>
+          </el-form-item>
+          <el-form-item :label="' '">
+            <download-excel
+              :fields="fields()"
+              :data="exportData"
+              type="xls"
+              :name="exportName"
+              :header="exportHeader"
+              :footer="exportFooter"
+              :defaultValue="exportDefaultValue"
+              :fetch="createExportData"
+              :before-generate="startDownload"
+              :before-finish="finishDownload"
+              worksheet="导出信息"
+              class="el-button el-button--primary el-button--medium">
+              导出
+            </download-excel>
+          </el-form-item>
+        </el-form>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24">
+        <el-table
+          :height="height"
+          :data="dataList"
+          border
+          v-loading="dataListLoading"
+          style="width: 100%;">
+          <el-table-column
+            v-for="(item,index) in columnList" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed==''?false:item.fixed"
+            :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          @size-change="sizeChangeHandle"
+          @current-change="currentChangeHandle"
+          :current-page="pageIndex"
+          :page-sizes="[20, 50, 100, 200, 500]"
+          :page-size="pageSize"
+          :total="totalPage"
+          layout="total, sizes, prev, pager, next, jumper">
+        </el-pagination>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import column from '../common/column'
+import {getToolCostList} from '@/api/knifemold/tool-info.js'
+export default {
+  components: {column},
+  data () {
+    return {
+      height: 0,
+      // 数据查询属性
+      dataListLoading: false,
+      queryTool: {
+        limit: 500,
+        page: 1,
+        site: this.$store.state.user.site,
+        toolId: '',
+        toolDescription: '',
+        toolInstanceId: '',
+        customer: '',
+        contributor: ''
+      },
+      pageIndex: 1,
+      pageSize: 50,
+      totalPage: 0,
+      dataList: [],
+      columnList: [
+        {
+          columnProp: 'toolId',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '工具编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: ''
+        },
+        {
+          columnProp: 'toolDescription',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '工具名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: ''
+        },
+        {
+          columnProp: 'toolInstanceId',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '工具实例编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: ''
+        },
+        {
+          columnProp: 'locationName',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '库位',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: ''
+        },
+        {
+          columnProp: 'status',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '状态',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: ''
+        },
+        {
+          columnProp: 'purchaseDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '购买日期',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: ''
+        },
+        {
+          columnProp: 'steelSeal',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '钢印编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: ''
+        },
+        {
+          columnProp: 'price',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '价格',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: ''
+        },
+        {
+          columnProp: 'customer',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '客户',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: ''
+        },
+        {
+          columnProp: 'contributor',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '出资方',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: ''
+        }
+      ],
+      exportData: [],
+      exportName: this.$route.meta.title,
+      exportHeader: [this.$route.meta.title],
+      exportFooter: [],
+      exportDefaultValue: ''
+    }
+  },
+  mounted () {
+    this.$nextTick(() => {
+      this.height = window.innerHeight - 220
+    })
+  },
+  methods: {
+    // ---------------  业务  -------------------
+    getDataList () {
+      this.dataListLoading = true
+      this.queryTool.limit = this.pageSize
+      this.queryTool.page = this.pageIndex
+      getToolCostList(this.queryTool).then(({data}) => {
+        if (data.code === 0) {
+          this.dataList = data.page.list
+          this.pageIndex = data.page.currPage
+          this.pageSize = data.page.pageSize
+          this.totalPage = data.page.totalCount
+        }
+        this.dataListLoading = false
+      })
+    },
+    //  --------- 分页 ----------
+    // 每页数
+    sizeChangeHandle (val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getDataList()
+    },
+    // 当前页
+    currentChangeHandle (val) {
+      this.pageIndex = val
+      this.getDataList()
+    },
+    //  --------- 分页 end ----------
+    //  --------- 导出 ----------
+    fields () {
+      let json = "{"
+      this.columnList.forEach((item, index) => {
+        if (index == this.columnList.length - 1) {
+          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+        } else {
+          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+        }
+      })
+      json += "}"
+      let s = eval("(" + json + ")")
+      return s
+    },
+    createExportData () {
+      // 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据
+      return this.dataList
+    },
+    startDownload () {
+    },
+    finishDownload () {
+    }
+    //  --------- 导出 end ----------
+  },
+  created () {
+    this.getDataList()
+  }
+}
+</script>
+<style>
+
+</style>
diff --git a/src/views/modules/print/label/print_tool_label_preview.js b/src/views/modules/print/label/print_tool_label_preview.js
index d8fed72..0549f3f 100644
--- a/src/views/modules/print/label/print_tool_label_preview.js
+++ b/src/views/modules/print/label/print_tool_label_preview.js
@@ -13,9 +13,9 @@ export function printToolLabelPreview(printList) {
       LODOP.NewPage();
 
       LODOP.PRINT_INIT("");
-      LODOP.SET_PRINT_PAGESIZE(0,750,200,"");
+      LODOP.SET_PRINT_PAGESIZE(0,700,200,"");
       LODOP.SET_PRINT_MODE("PRINT_NOCOLLATE",1);
-      LODOP.ADD_PRINT_BARCODE(6,205,189,88,"QRCode",printData.toolInstanceId);
+      LODOP.ADD_PRINT_BARCODE(6,201,189,88,"QRCode",printData.toolInstanceId);
       LODOP.ADD_PRINT_TEXT(0,3,76,28,"工具编码");
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);