rev：1.合同台账修改 2.混合料质检喷雾工序加质检抽样标签打印

2023-12-19 16:57:25 +08:00
parent c2b0f2e5ad
commit c01a367876
14 changed files with 346 additions and 45 deletions
--- a/mes/qd/src/api/wms/pcs/orderproc.js
+++ b/mes/qd/src/api/wms/pcs/orderproc.js
@@ -47,4 +47,12 @@ export function finish(data) {
  })
 }

-export default { add, edit, del, getProcStatus, importData, finish }
+export function saveRemark(data) {
+  return request({
+    url: 'api/purchaseorderproc/saveRemark',
+    method: 'post',
+    data: data
+  })
+}
+
+export default { add, edit, del, getProcStatus, importData, finish, saveRemark }
--- a/mes/qd/src/api/wms/pdm/workorder.js
+++ b/mes/qd/src/api/wms/pdm/workorder.js
@@ -61,4 +61,11 @@ export function getDepts(params) {
    params
  })
 }
-export default { add, edit, del, submit, confirmWork, openWork, createPcsn, getDepts }
+export function getInfo(data) {
+  return request({
+    url: 'api/workorder/getInfo',
+    method: 'post',
+    data
+  })
+}
+export default { add, edit, del, submit, confirmWork, openWork, createPcsn, getDepts, getInfo }
--- a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
+++ b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
@@ -218,6 +218,16 @@
        >
          导出Excel
        </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-printer"
+          size="mini"
+          @click="print"
+        >
+          打印标签
+        </el-button>
      </crudOperation>
      <!--表格渲染-->
      <el-table
@@ -311,6 +321,7 @@ import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
 import { download } from '@/api/data'
 import { downloadFile } from '@/utils'
 import producetask from '@/api/wms/pdm/producetask'
+import { mapGetters } from 'vuex'

 export default {
  name: 'Workorder',
@@ -587,6 +598,33 @@ export default {
      LODOP.PRINT()// 打印
      this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
      this.crud.toQuery()
+    },
+    print: function() {
+      const _selectData = this.$refs.table.selection
+      const param = _selectData[0]
+      const LODOP = getLodop()
+
+      workorder.getInfo(param).then(data => {
+        LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
+        // 打印纸张大小设置https://www.it610.com/article/2094844.html
+        LODOP.PRINT_INIT('')
+        LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
+        LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
+        LODOP.SET_PRINT_STYLE('FontSize', 12)
+        LODOP.SET_PRINT_STYLE('Bold', 1)
+        LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.workorder_code + '##' + data.material_code + '##' + data.old_mark + '##' + data.pcsn)
+        LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '日期：' + data.print_date)
+        LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + data.pcsn)
+        LODOP.ADD_PRINT_TEXT('25mm', '35mm', '50mm', '15mm', '打印人：' + data.print_name)
+        LODOP.ADD_PRINT_TEXT('34mm', '5mm', '80mm', '15mm', '工令：' + data.workorder_code + '')
+        LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '物料：' + data.material_code + '')
+        LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '牌号：' + data.old_mark + '')
+        // LODOP.PRINT_DESIGN() // 打印设置
+        // LODOP.PREVIEW()// 预览
+        LODOP.PRINT()// 打印
+        this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      })
    }
  }
 }
--- a/mes/qd/src/views/wms/statistics/ledgerQuery/index.vue
+++ b/mes/qd/src/views/wms/statistics/ledgerQuery/index.vue
@@ -62,33 +62,50 @@
        style="width: 100%;"
        @selection-change="crud.selectionChangeHandler"
      >
-        <el-table-column prop="vbillcode" label="订单编号" min-width="100" show-overflow-tooltip>
+       <!-- <el-table-column prop="vbillcode" label="订单编号" min-width="100" show-overflow-tooltip>
          <template slot-scope="scope">
            <el-link type="warning" @click="openReceive(scope.row)">{{ scope.row.vbillcode }}</el-link>
          </template>
+        </el-table-column>-->
+        <el-table-column label="合同内容" align="center">
+          <el-table-column prop="subscribedate" label="签订时间" width="150px" show-overflow-tooltip />
+          <el-table-column prop="contract_no" label="合同编码" width="120px" show-overflow-tooltip/>
+          <el-table-column prop="supp_name" label="供应商" min-width="220" show-overflow-tooltip/>
+          <el-table-column prop="material_code" label="物料编码" min-width="150" show-overflow-tooltip />
+          <el-table-column prop="material_name" label="物料名称" min-width="150" show-overflow-tooltip />
+          <el-table-column prop="price_tax" label="单价含税" min-width="120" :formatter="crud.formatNum3" show-overflow-tooltip/>
+          <el-table-column prop="qty" label="重量" show-overflow-tooltip :formatter="crud.formatNum3" />
+          <el-table-column prop="money" label="金额" show-overflow-tooltip :formatter="crud.formatNum3" width="110" />
+          <el-table-column prop="notqty" label="未到货重量" :formatter="crud.formatNum3" show-overflow-tooltip width="110"/>
+          <el-table-column prop="honour_days" label="账龄" width="150px" show-overflow-tooltip/>
+        </el-table-column>
+        <el-table-column label="到货情况" align="center">
+          <el-table-column prop="allqty" label="合计重量" show-overflow-tooltip :formatter="crud.formatNum3" />
+          <el-table-column prop="all_valmoney" label="合计金额" show-overflow-tooltip :formatter="crud.formatNum3" />
+          <el-table-column prop="input_time" label="到货时间" width="150px" show-overflow-tooltip />
+          <el-table-column prop="receive_qty" label="到货重量" show-overflow-tooltip :formatter="crud.formatNum3" />
+          <el-table-column prop="valmoney" label="到货金额" show-overflow-tooltip :formatter="crud.formatNum3" />
+          <el-table-column prop="plan_date" label="资金计划" width="150px" show-overflow-tooltip />
+        </el-table-column>
+        <el-table-column label="备注" align="center">
+          <el-table-column prop="remark" label="内容" width="200px" show-overflow-tooltip />
+          <el-table-column
+            label="操作"
+            width="115"
+            align="center"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button type="primary" icon="el-icon-edit" circle @click="openRemarkDaing(scope.row)" />
+            </template>
+          </el-table-column>
        </el-table-column>
-        <el-table-column prop="create_date" label="订单日期" width="150px" show-overflow-tooltip />
-        <el-table-column prop="contract_no" label="合同编码" width="120px" show-overflow-tooltip/>
-        <el-table-column prop="supp_name" label="供应商" min-width="220" show-overflow-tooltip/>
-        <el-table-column prop="material_code" label="物料编码" min-width="150" show-overflow-tooltip />
-        <el-table-column prop="material_name" label="物料名称" min-width="150" show-overflow-tooltip />
-        <el-table-column prop="price_tax" label="单价含税" min-width="120" :formatter="crud.formatNum3" show-overflow-tooltip/>
-        <el-table-column prop="price" label="单价不含税" min-width="120" :formatter="crud.formatNum3" show-overflow-tooltip/>
-        <el-table-column prop="qty" label="重量" show-overflow-tooltip :formatter="crud.formatNum3" />
-        <el-table-column prop="money" label="金额" width="120px" :formatter="crud.formatNum3" show-overflow-tooltip/>
-        <el-table-column prop="allqty" label="到货重量" :formatter="crud.formatNum3" show-overflow-tooltip/>
-        <el-table-column prop="notqty" label="未到货重量" :formatter="crud.formatNum3" show-overflow-tooltip/>
-        <el-table-column prop="ivt_qty" label="待检重量" :formatter="crud.formatNum3" show-overflow-tooltip/>
-        <el-table-column prop="input_time" label="最后一次到货时间" min-width="140" show-overflow-tooltip/>
-        <el-table-column prop="honor_time" label="合同要求履约时间" min-width="140" show-overflow-tooltip/>
-        <el-table-column prop="delayDay" label="延迟天数" show-overflow-tooltip/>
-        <el-table-column prop="honour_days" label="资金计划履约天数" width="150px" show-overflow-tooltip/>
-        <el-table-column prop="allqty" label="累计到货重量" :formatter="crud.formatNum3" width="150px" show-overflow-tooltip/>
      </el-table>
      <!--分页组件-->
      <pagination />
    </div>
    <ReceiveDialog :dialog-show.sync="receiveDialog" :open-param="openParam"/>
+    <remarkDaing :dialog-show.sync="remarkDaing" :open-param="openParam" />
  </div>
 </template>

@@ -100,10 +117,11 @@ import crudOperation from '@crud/CRUD.operation'
 import crudOrderproc from '@/api/wms/pcs/orderproc'
 import DateRangePicker from '@/components/DateRangePicker'
 import ReceiveDialog from '@/views/wms/statistics/ledgerQuery/ReceiveDialog'
+import remarkDaing from '@/views/wms/statistics/ledgerQuery/remarkDaing'

 export default {
  name: 'LedgerQuery',
-  components: { pagination, rrOperation, crudOperation, DateRangePicker, ReceiveDialog},
+  components: { pagination, rrOperation, crudOperation, DateRangePicker, ReceiveDialog, remarkDaing},
  mixins: [presenter(), header(), crud()],
  cruds() {
    return CRUD({
@@ -129,7 +147,8 @@ export default {
  data() {
    return {
      openParam: '',
-      receiveDialog: false
+      receiveDialog: false,
+      remarkDaing: false
    }
  },
  created() {
@@ -145,6 +164,10 @@ export default {
    openReceive(row) {
      this.openParam = row.vbillcode
      this.receiveDialog = true
+    },
+    openRemarkDaing(row) {
+      this.openParam = row.id
+      this.remarkDaing = true
    }
  }
 }
--- a/mes/qd/src/views/wms/statistics/ledgerQuery/remarkDaing.vue
+++ b/mes/qd/src/views/wms/statistics/ledgerQuery/remarkDaing.vue
@@ -0,0 +1,93 @@
+<template>
+  <el-dialog
+    title="编辑"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    :show-close="true"
+    width="700px"
+    v-loading.fullscreen.lock="fullscreenLoading"
+    @close="close"
+    @open="open"
+  >
+    <div class="head-container">
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="form"
+        :rules="rules"
+        size="mini"
+        label-width="85px"
+        label-suffix=":"
+      >
+        <el-form-item label="备注" prop="remark">
+          <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
+          <el-input
+            v-model.trim="form.remark"
+            style="width: 380px;"
+            rows="2"
+            type="textarea"
+          />
+        </el-form-item>
+        <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="saveRemark">确认</el-button>
+      </el-form>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import crudOrderproc from '@/api/wms/pcs/orderproc'
+
+export default {
+  name: 'RemarkDaing',
+  components: { rrOperation, pagination },
+  cruds() {
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      fullscreenLoading: false,
+      dialogVisible: false,
+      form: {}
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    close() {
+      this.form = {}
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged', this.rows)
+    },
+    open() {
+      this.form.id = this.openParam
+    },
+    saveRemark() {
+      crudOrderproc.saveRemark(this.form).then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.close()
+        this.crud.toQuery()
+      })
+    }
+  }
+}
+</script>
+