Browse Source

Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

Lexie 1 year ago
parent
commit
71dbd4d302

+ 4 - 0
src/view/performance/12-orderAccounting/componets/gdcjstj.vue

@@ -1,6 +1,8 @@
 <template>
   <div style="width: 30vw; height: 50vh">
     <el-input v-model="input" />
+    <br>
+    <br>
     <el-button
       @click="handlePrint1"
     >按工序打印
@@ -66,6 +68,7 @@ const handlePrint1 = async() => {
       return
     }
     const tableData = {
+      "minong": "/src/assets/logotx.png",
       'gdbh': data['Gd_gdbh'],
       'cpdh': data['成品代号'],
       'cpmc': data['成品名称'],
@@ -133,6 +136,7 @@ const handlePrint2 = async() => {
       return
     }
     const tableData = {
+      "minong": "/src/assets/logotx.png",
       'gdbh': data['Gd_gdbh'],
       'cpmc': data['成品名称'],
       'sjtl': parseFloat(data['实际投料']).toFixed(2) + '万张',

File diff suppressed because it is too large
+ 0 - 4
src/view/performance/12-orderAccounting/componets/template-bz.json


File diff suppressed because it is too large
+ 1 - 4
src/view/performance/12-orderAccounting/componets/template-gx.json


File diff suppressed because it is too large
+ 1977 - 2
src/view/yunyin/shengchanguanli/components/print.vue


Some files were not shown because too many files changed in this diff