From 0521790cf8e22f0e2a015a4b6989500727459342 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 19 一月 2024 16:46:34 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/equipment/mould/mould-from.vue | 200 +++++++++++++++++++++++++++++++++
vue.config.js | 4
src/api/equipment/mould.js | 9 +
src/views/equipment/mould/index.vue | 3
src/views/quality/Packaging_ledger/index.vue | 87 ++++++++++++++
5 files changed, 299 insertions(+), 4 deletions(-)
diff --git a/src/api/equipment/mould.js b/src/api/equipment/mould.js
new file mode 100644
index 0000000..3f7cb9d
--- /dev/null
+++ b/src/api/equipment/mould.js
@@ -0,0 +1,9 @@
+import request from '@/router/axios'
+
+export function page(query) {
+ return request({
+ url:'/mes/mould/page',
+ method:'get',
+ params: query
+ })
+}
\ No newline at end of file
diff --git a/src/views/equipment/mould/index.vue b/src/views/equipment/mould/index.vue
index 8439374..c9f1616 100644
--- a/src/views/equipment/mould/index.vue
+++ b/src/views/equipment/mould/index.vue
@@ -131,7 +131,8 @@
...mapGetters(['permissions'])
},
components: {
- ttable
+ ttable,
+ TableForm
},
watch: {
dialogVisible(newVal){
diff --git a/src/views/equipment/mould/mould-from.vue b/src/views/equipment/mould/mould-from.vue
new file mode 100644
index 0000000..9847744
--- /dev/null
+++ b/src/views/equipment/mould/mould-from.vue
@@ -0,0 +1,200 @@
+<template>
+ <el-dialog
+ :title="!dataForm.id ? '鏂板' : '淇敼'"
+ :close-on-click-modal="false"
+ :visible.sync="visible"
+ >
+ <el-form
+ :model="dataForm"
+ :rules="dataRule"
+ ref="dataForm"
+ label-width="80px"
+ class="l-mes"
+ >
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="缂栧彿" prop="number">
+ <el-input v-model="dataForm.number" placeholder="缂栧彿"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍚嶇О" prop="name">
+ <el-input v-model="dataForm.name" placeholder="鍚嶇О"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="宸ュ巶" prop="factoryId">
+ <el-select
+ v-model="dataForm.factoryId"
+ filterable
+ placeholder="璇烽�夋嫨"
+ style="width:100%"
+ >
+ <el-option
+ v-for="(item, index) in this.factoryOptions"
+ :label="item.factoryName"
+ :value="item.id"
+ :key="index"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎵�灞炶溅闂�" prop="workshop">
+ <el-select
+ v-model="dataForm.workshop"
+ filterable
+ placeholder="璇烽�夋嫨"
+ style="width:100%"
+ >
+ <el-option
+ v-for="item in workshopList"
+ :key="item.id"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="浣嶇疆" prop="position">
+ <el-input v-model="dataForm.position" placeholder="浣嶇疆"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="閭" prop="email">
+ <el-input v-model="dataForm.email" placeholder="閭"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="渚涘簲鍟�" prop="supplier">
+ <el-input
+ v-model="dataForm.supplier"
+ placeholder="渚涘簲鍟�"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍒堕�犲晢" prop="manufacturer">
+ <el-input
+ v-model="dataForm.manufacturer"
+ placeholder="鍒堕�犲晢"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍨嬪彿瑙勬牸" prop="typeSpecification">
+ <el-input
+ v-model="dataForm.typeSpecification"
+ placeholder="鍨嬪彿瑙勬牸"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍒堕�犳棩鏈�" prop="manufactureDate">
+ <el-date-picker
+ style="width: 100%"
+ v-model="dataForm.manufactureDate"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="瀹夎鏃ユ湡" prop="installDate">
+ <el-date-picker
+ style="width: 100%"
+ v-model="dataForm.installDate"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐘舵��" prop="state">
+ <el-select
+ v-model="dataForm.state"
+ placeholder="鐘舵��"
+ filterable
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in equipmentState"
+ :key="item.id"
+ :label="item.label"
+ :value="item.label"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="璁惧鎻忚堪" prop="desc">
+ <el-input
+ v-model="dataForm.description"
+ placeholder="璁惧鎻忚堪"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="visible = false">鍙栨秷</el-button>
+ <el-button
+ type="primary"
+ :disabled="isSubmit"
+ v-thinclick="`dataFormSubmit`"
+ >纭畾</el-button
+ >
+ </span>
+ </el-dialog>
+ </template>
+ <script>
+ import { getObj, addObj, putObj } from '@/api/equipment/equipment'
+ import { loadFactoryList } from '@/api/basic/factory'
+ import { remote } from '../../../api/admin/dict'
+ export default {
+ data() {
+ return {
+ // options: regionData,
+ visible: false,
+ dataForm: {
+ id: 0,
+ number: '',
+ name: '',
+ factoryId: '',
+ workshop: '',
+ position: '',
+ email: '',
+ supplier: '',
+ manufacturer: '',
+ typeSpecification: '',
+ manufactureDate: '',
+ installDate: '',
+ state: '',
+ description: '',
+ value1: ''
+ },
+ dataRule: {
+ number: [{ required: true, message: '缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }],
+ name: [{ required: true, message: '鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }]
+ },
+ factoryOptions: [],
+ equipmentState: [],
+ isSubmit: false,
+ workshopList: []
+ }
+ },
+ methods: {
+ },
+
+ created() {
+ }
+ }
+ </script>
+
\ No newline at end of file
diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index 3445e0f..e5317bc 100644
--- a/src/views/quality/Packaging_ledger/index.vue
+++ b/src/views/quality/Packaging_ledger/index.vue
@@ -141,7 +141,55 @@
<div style="width:100%;height: 400px;overflow-y: auto;">
<div id="qrCard" class="dia_body">
<el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 10px;">
- <el-row>
+ <div style="padding: 5px;">
+ <table border="2px" class="x1111116">
+ <tr class="x1111113">
+ <td class="x1111114" colspan=6>
+ <div style="height: 75px;display: flex;margin-top: 2px;">
+ <div style="margin-top: 5px;">
+ <img width="150" height="48" src="../../../../public/img/image001.jpg" alt="IMG_256">
+ </div>
+ <div style="margin-left: 45px;margin-top: 15px ;">
+ <span lang="EN-US" class="x1111111">涓ぉ娴锋磱绉戞妧鏈夐檺鍏徃</span>
+ </div>
+ </div>
+ </td>
+ </tr>
+ <tr class="x1111117">
+ <td class="x1111114">
+ <span style="font-family: 瀹嬩綋;text-align: center;">搴� 鍙�:</span>
+ </td>
+ <td class="x1111114" colspan=4 >{{ i + 1 }} </td>
+ <td class="x1111114" rowspan=3 >
+ <div style="padding: 1px;">
+ <vueQr :text=str+item.packageBoxId :size="110" :margin="1"></vueQr>
+ </div>
+ </td>
+ </tr>
+ <tr class="x1111117">
+ <td class="x1111114">
+ <span style="font-family: 瀹嬩綋;text-align: center;">鍖� 瑁� 缂栧彿锛�</span>
+ </td>
+ <td class="x1111114" colspan=4>{{ item.packageNo }}</td>
+ </tr>
+ <tr class="x1111117">
+ <td class="x1111114">
+ <span style="font-family: 瀹嬩綋;text-align: center;">鍚� 鍚� 鍙凤細</span>
+ </td>
+ <td class="x1111114" colspan=4>{{ item.contractNo }}</td>
+
+ </tr>
+ <tr class="x1111113">
+ <td class="x1111114" colspan=6>
+ <div style="height: 75px;" >
+ <p><span lang="EN-US" class="x1111112">鍦板潃锛氭睙鑻忕渷鍗楅�氱粡娴庢妧鏈紑鍙戝尯甯稿叴璺�96鍙�</span></p>
+ <p><span lang="EN-US" class="x1111112">鐢佃瘽/浼犵湡锛�0513鈥�89191125</span></p>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <!-- <el-row>
<el-col :span="10" :offset="3">搴忓彿锛�</el-col>
<el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
</el-row>
@@ -155,6 +203,9 @@
<vueQr :text=str+item.packageBoxId :size="110" :margin="1"></vueQr>
</el-col>
</el-row>
+ <div style="background-color: blueviolet;height: 80px;">
+ 1111
+ </div> -->
</el-card>
</div>
</div>
@@ -481,3 +532,37 @@
},
}
</script>
+<style>
+.x1111111{
+ color: black;
+ font-size: 18pt;
+ font-family: 榛戜綋;
+ justify-content: center;
+ text-align: center;
+}
+.x1111113{
+ border: 1px solid black;
+ height: 40px;
+}
+.x1111117{
+ border: 1px solid black;
+ height: 40px;
+}
+.x1111116{
+ border: 1px solid black;
+ height: 220px;
+ width: 450px;
+}
+.x1111114{
+ border: 1px solid black;
+ width: 80px;
+}
+.x1111115{
+ border: 1px solid black;
+}
+.x1111112{
+ color: black;
+ font-size: 12pt;
+ font-family: 瀹嬩綋;
+}
+</style>
diff --git a/vue.config.js b/vue.config.js
index 2280c3d..0e57583 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,10 +4,10 @@
*/
-// const url = 'http://192.168.2.7:9999'
+const url = 'http://192.168.2.7:9999'
// const url = 'https://ztms-mes.chinaztt.cn/'
-const url = 'http://localhost:9999'
+// const url = 'http://localhost:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3