From 869f6c069e86c2ff90393c1441854a6f05989481 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 15 七月 2022 10:42:46 +0800
Subject: [PATCH] 1.连接自动打印,2.修改bug
---
src/views/zzmx/chda.vue | 2
src/views/scgl/scdd.vue | 2
src/views/jcsz/wldw.vue | 2
src/views/scgl/gd.vue | 6
src/views/zzmx/gylx.vue | 2
src/views/sbgl/sbqd.vue | 2
src/views/scgl/sckbg.vue | 22 ++--
src/api/Excel.js | 18 +++
src/views/template.vue | 2
src/views/scgl/gdpg.vue | 102 ++++++++++----------
src/views/jcsz/yhqd.vue | 42 +++++--
src/api/ErpSyncMes.js | 30 ++++++
src/views/jcsz/jsqd.vue | 6
src/views/wlgl/ckdy.vue | 2
src/layout/components/Sidebar/index.vue | 19 ++-
src/views/zzmx/gxdy.vue | 2
src/views/wlgl/kwdy.vue | 2
src/views/zzmx/wllx.vue | 2
18 files changed, 168 insertions(+), 97 deletions(-)
diff --git a/src/api/ErpSyncMes.js b/src/api/ErpSyncMes.js
new file mode 100644
index 0000000..07565a7
--- /dev/null
+++ b/src/api/ErpSyncMes.js
@@ -0,0 +1,30 @@
+import request from '@/utils/request'
+
+// 鍒堕�犳ā鍨嬶細瀛樿揣鍒嗙被鍚屾
+export function SeaveSearchInventoryClass() {
+ return request({
+ url: 'ErpSyncMes/SeaveSearchInventoryClass',
+ method: 'post'
+ })
+}
+// 鍒堕�犳ā鍨嬶細瀛樿揣妗ｆ鍚屾
+export function SeaveSearchInventory() {
+ return request({
+ url: 'ErpSyncMes/SeaveSearchInventory',
+ method: 'post'
+ })
+}
+// 鐗╂枡绠＄悊锛氫粨搴撳簱浣嶅悓姝�
+export function SeaveSearchWhareHouseLocation() {
+ return request({
+ url: 'ErpSyncMes/SeaveSearchWhareHouseLocation',
+ method: 'post'
+ })
+}
+//
+export function SeaveSearchPartner() {
+ return request({
+ url: 'ErpSyncMes/SeaveSearchPartner',
+ method: 'post'
+ })
+}
diff --git a/src/api/Excel.js b/src/api/Excel.js
new file mode 100644
index 0000000..bacdaf2
--- /dev/null
+++ b/src/api/Excel.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// Excel瀵煎叆妯℃澘涓嬭浇
+export function DownLoadExcel(data) {
+ return request({
+ url: 'ImportExcel/DownLoadExcel',
+ method: 'get',
+ params: data
+ })
+}
+// Excel瀵煎叆鏂囦欢涓婁紶銆佹ā鏉块獙璇併�佹暟鎹噺銆侀獙璇�
+export function ExcelModelCheck(data) {
+ return request({
+ url: 'ImportExcel/ExcelModelCheck',
+ method: 'get',
+ params: data
+ })
+}
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index f7f507e..1f1202a 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,7 +1,7 @@
<template>
<div :class="{'has-logo':showLogo}">
- <logo v-if="showLogo" :collapse="isCollapse" />
+ <logo v-if="showLogo" :collapse="isCollapse"/>
<el-scrollbar wrap-class="scrollbar-wrapper" style="margin-top:56px;height: 85%">
<el-menu
:default-active="activeMenu"
@@ -20,13 +20,14 @@
<!-- :item="route"-->
<!-- :base-path="route.path"-->
<!-- />-->
- <sidebar-item v-for="route in permission_routes" :key="route.path" :item="route" :base-path="route.path" />
+ <sidebar-item v-for="route in permission_routes" :key="route.path" :item="route" :base-path="route.path"/>
</el-menu>
</el-scrollbar>
<div style="position: absolute;bottom: 20px;left: 30px;">
<div>
<el-button type="text">鏂板嚡杩埗閫燰1.0.01</el-button>
+<!-- <el-button type="text"><a href="http://www.ykxkd.com/" target="_blank">鏂板嚡杩埗閫燰1.0.01</a></el-button>-->
</div>
</div>
@@ -34,15 +35,15 @@
</template>
<script>
-import { mapGetters } from 'vuex'
+import {mapGetters} from 'vuex'
import Logo from './Logo'
import SidebarItem from './SidebarItem'
import variables from '@/styles/variables.scss'
-import { LoginMenu } from '@/api/user'
-import { removeCookie, setCookie } from '@/utils/auth'
+import {LoginMenu} from '@/api/user'
+import {removeCookie, setCookie} from '@/utils/auth'
export default {
- components: { SidebarItem, Logo },
+ components: {SidebarItem, Logo},
data() {
return {
routers: []
@@ -58,7 +59,7 @@
},
activeMenu() {
const route = this.$route
- const { meta, path } = route
+ const {meta, path} = route
// if set path, the sidebar will highlight the path you set
removeCookie('ruleCode')
setCookie('ruleCode', meta.code)// 灏嗙紪鐮佽鍒檆ode瀛樺埌cookie閲岄潰
@@ -85,9 +86,11 @@
color: white;
font-size: 18px;
}
-.el-button--text:focus{
+
+.el-button--text:focus {
color: white;
}
+
#app .sidebar-container .el-submenu .el-menu-item {
background-color: transparent !important;
}
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 0202f7d..8071e93 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -47,7 +47,7 @@
<div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<el-button type="primary" icon="el-icon-setting" @click="settingButton">璁剧疆</el-button>
- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+ <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
@@ -509,6 +509,7 @@
} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import $ from 'jquery'
+import clearAllChildren from '@/utils/global'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -669,7 +670,7 @@
// 鑾峰彇鎵�灞炵粍缁�
async getUserOrganization() {
const { data: res } = await UserOrganization()
- this.StuOrgArr = res
+ this.StuOrgArr = clearAllChildren(res)
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
@@ -954,6 +955,7 @@
this.dialogFormUser.orgcode = ''
this.dialogFormUser.isrole = ''
this.$refs.dialogCascaderUser.checkedValue = ''
+ this.getRoleAssociationUser()
},
/* 瑙掕壊鍏宠仈鏉冮檺瀵硅瘽妗嗛儴鍒�*/
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index a0fb450..11e1a2b 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -39,7 +39,7 @@
<el-divider />
<div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <el-button type="primary" icon="el-icon-upload2">瀵煎叆</el-button>
+ <!-- <el-button type="primary" icon="el-icon-upload2">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 5427e4b..915bd58 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -29,7 +29,13 @@
</el-form-item>
<el-form-item label="宸ヨ祫绫诲瀷" style=" display: flex;">
- <el-select v-model="form.wagetype" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="form.wagetype"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in wagetypeArr"
:key="item.value"
@@ -39,7 +45,13 @@
</el-select>
</el-form-item>
<el-form-item label="鍦ㄨ亴鐘舵��" style=" display: flex;">
- <el-select v-model="form.Enable" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="form.Enable"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in EnableArr"
:key="item.value"
@@ -59,7 +71,7 @@
<div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<el-button type="primary" icon="el-icon-menu" @click="workingTramClick">鐢熶骇鐝粍</el-button>
- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+ <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
@@ -646,7 +658,7 @@
this.StuOrgArr = clearAllChildren(res)
},
// 鑾峰彇鎵�灞炵粍缁囧璇濇
- async getUserOrganization2() {
+ async getUserOrganization2() {
const { data: res } = await UserOrganization()
this.StuOrgArr2 = clearAllChildren(res)
},
@@ -689,7 +701,7 @@
this.dialogForm.StuOrg = val[val.length - 1]
},
// 鑾峰彇涓嬫媺鐢熶骇鐝粍
- async getMesOrderStepReportSelectUserGroup() {
+ async getMesOrderStepReportSelectUserGroup() {
const { data: res } = await MesOrderStepReportSelectUserGroup()
this.usergroupArr = res
},
@@ -927,7 +939,8 @@
if (i.Code === checkedFatherCode) {
this.dialogFormRoles.roleTreeSelectedArr[ind].Data.forEach((i1, ind2) => {
if (i1 === a[0]) {
- this.dialogFormRoles.roleTreeSelectedArr[ind].Data.splice(ind2, 1)// 褰撳瓙code涓庣幇鍦ㄧ殑code鐩稿悓鏃舵墽琛�
+ // this.dialogFormRoles.roleTreeSelectedArr[ind].Data.splice(ind2, 1)// 褰撳瓙code涓庣幇鍦ㄧ殑code鐩稿悓鏃舵墽琛�
+ this.dialogFormRoles.roleTreeSelectedArr[ind].Data = this.dialogFormRoles.roleTreeSelectedArr[ind].Data.filter(i2 => i2 !== a[0])
} else {
this.dialogFormRoles.roleTreeSelectedArr[ind].Data.push(a[0])// //褰撳瓙code涓庣幇鍦ㄧ殑code涓嶇浉鍚屾椂鎵ц
}
@@ -1114,7 +1127,7 @@
this.getUserGroupSearch()
},
// 鑾峰彇鐢熶骇鐝粍鍒楄〃
- async getUserGroupSearch() {
+ async getUserGroupSearch() {
const res = await UserGroupSearch(this.formWorking)
this.workingTableData = res.data
this.workingTableDataLength = res.count
@@ -1147,7 +1160,7 @@
})
},
// 淇濆瓨
- async saveWorking(row) {
+ async saveWorking(row) {
if (row.group_code.trim().length < 1) {
return this.$message.info('鐝粍缂栫爜涓嶈兘涓虹┖锛�')
}
@@ -1195,6 +1208,7 @@
border: none;
padding: 0 20px;
}
+
::v-deep .el-button--primary:hover {
border: none;
}
@@ -1237,7 +1251,7 @@
padding: 20px 100px !important;
}
-.workingDialogVisible ::v-deep .el-dialog__body{
+.workingDialogVisible ::v-deep .el-dialog__body {
padding: 20px 20px !important;
}
@@ -1386,15 +1400,15 @@
border-color: $main_color;
}
-::v-deep .el-select .el-input__inner:focus{
+::v-deep .el-select .el-input__inner:focus {
border-color: $main_color;
}
-::v-deep .el-select-dropdown__item.selected{
+::v-deep .el-select-dropdown__item.selected {
color: $main_color;
}
-::v-deep .el-input__inner:focus {
+::v-deep .el-input__inner:focus {
border-color: #42b983 !important;
}
@@ -1415,10 +1429,12 @@
background-color: #42b983;
border-color: #42b983;
}
+
.el-radio__input.is-checked .el-radio__inner:hover {
border-color: #42b983;
}
- .el-input__inner{
+
+ .el-input__inner {
border-color: #42b983 !important;
}
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 52a6f3e..819994c 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -97,7 +97,7 @@
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<el-button type="primary" icon="el-icon-c-scale-to-original" @click="deviceTypeButton">璁惧绫诲瀷</el-button>
<el-button type="primary" icon="el-icon-document-copy" @click="deviceGroupButton">璁惧缁�</el-button>
- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+ <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index f1325f4..4296c2c 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -567,7 +567,7 @@
import { handleDatetime } from '@/utils/global'
import { getCookie } from '@/utils/auth'
import { MesOrderPrintSearch1 } from '@/api/utils'
-import { urlAddRandomNo, webapp_ws_ajax_run } from '@/utils/grwebapp'
+import { urlAddRandomNo, webapp_urlprotocol_startup, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -705,6 +705,8 @@
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
+ // webapp_urlprotocol_startup()
+ webapp_ws_autoupdate(true)
},
methods: {
async getMesOrderSearch() {
@@ -964,7 +966,7 @@
AddUpdateMesOrder(data).then(res => {
if (res.code === '200') {
if (this.operation !== 'add') {
- // this.sendPrint()
+ this.sendPrint()
}
this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '娲惧彂鎴愬姛锛�')
this.dialogVisible = false
diff --git a/src/views/scgl/gdpg.vue b/src/views/scgl/gdpg.vue
index 1b99633..698df8a 100644
--- a/src/views/scgl/gdpg.vue
+++ b/src/views/scgl/gdpg.vue
@@ -1,55 +1,55 @@
-<template>
- <div v-if="false">
- <h3>鎶ヨ〃鐩存帴鎵撳嵃锛岄�氳繃AJAX鏂瑰紡鑾峰彇鎶ヨ〃妯℃澘涓庢姤琛ㄦ暟鎹�</h3>
- <p><a href="javascript:void" @click.prevent="printClick">鐩存帴鎵撳嵃</a></p>
- </div>
-</template>
+<!--<template>-->
+<!-- <div v-if="false">-->
+<!-- <h3>鎶ヨ〃鐩存帴鎵撳嵃锛岄�氳繃AJAX鏂瑰紡鑾峰彇鎶ヨ〃妯℃澘涓庢姤琛ㄦ暟鎹�</h3>-->
+<!-- <p><a href="javascript:void" @click.prevent="printClick">鐩存帴鎵撳嵃</a></p>-->
+<!-- </div>-->
+<!--</template>-->
-<script>
-import { webapp_ws_ajax_run, webapp_urlprotocol_startup, urlAddRandomNo } from '@/utils/grwebapp'
-import { MesOrderPrintSearch, MesOrderPrintSearch1 } from '@/api/utils'
-import { getCookie } from '@/utils/auth'
-// import a from 'public/static/grf/simple.grf'
-export default {
- data() {
- return {
- OBJ: {},
- TEXT: ''
- }
- },
- mounted() {
- webapp_urlprotocol_startup()
- // const a = require('public/static/grf/simple.grf')
- // console.log(a, 1)
- },
- methods: {
- async printClick() {
- const data = {
- username: getCookie('admin'),
- mesordercode: 'PO202206280001_4'
- }
- const res = await MesOrderPrintSearch1(data)
- console.log(this.OBJ = res.data, 8989)
- if (res.code === '200') {
- this.ws_ajax_print()
- }
- // console.log(JSON.stringify(this.OBJ), 1)
- },
- ws_ajax_print() {
- // 鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗ｄ腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
- var args = {
- type: 'preview', // preview print
- showOptionDlg: false, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
- report: urlAddRandomNo('./static/grf/浜у搧娴佷紶鍗旳4.grf'),
- data: this.OBJ
- }
+<!--<script>-->
+<!--import { webapp_ws_ajax_run, webapp_urlprotocol_startup, urlAddRandomNo } from '@/utils/grwebapp'-->
+<!--import { MesOrderPrintSearch, MesOrderPrintSearch1 } from '@/api/utils'-->
+<!--import { getCookie } from '@/utils/auth'-->
+<!--// import a from 'public/static/grf/simple.grf'-->
+<!--export default {-->
+<!-- data() {-->
+<!-- return {-->
+<!-- OBJ: {},-->
+<!-- TEXT: ''-->
+<!-- }-->
+<!-- },-->
+<!-- mounted() {-->
+<!-- webapp_urlprotocol_startup()-->
+<!-- // const a = require('public/static/grf/simple.grf')-->
+<!-- // console.log(a, 1)-->
+<!-- },-->
+<!-- methods: {-->
+<!-- async printClick() {-->
+<!-- const data = {-->
+<!-- username: getCookie('admin'),-->
+<!-- mesordercode: 'PO202206280001_4'-->
+<!-- }-->
+<!-- const res = await MesOrderPrintSearch1(data)-->
+<!-- console.log(this.OBJ = res.data, 8989)-->
+<!-- if (res.code === '200') {-->
+<!-- this.ws_ajax_print()-->
+<!-- }-->
+<!-- // console.log(JSON.stringify(this.OBJ), 1)-->
+<!-- },-->
+<!-- ws_ajax_print() {-->
+<!-- // 鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗ｄ腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�-->
+<!-- var args = {-->
+<!-- type: 'preview', // preview print-->
+<!-- showOptionDlg: false, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�-->
+<!-- report: urlAddRandomNo('./static/grf/浜у搧娴佷紶鍗旳4.grf'),-->
+<!-- data: this.OBJ-->
+<!-- }-->
- webapp_ws_ajax_run(args)
- }
+<!-- webapp_ws_ajax_run(args)-->
+<!-- }-->
- }
-}
-</script>
+<!-- }-->
+<!--}-->
+<!--</script>-->
-<style>
-</style>
+<!--<style>-->
+<!--</style>-->
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 9f936fa..30151be 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -130,8 +130,6 @@
@click="orderClose"
>鍏抽棴璁㈠崟
</el-button>
- <!-- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
- <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 77bc27d..8831aa6 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -667,7 +667,7 @@
SavaMesOrderStepStart,
SavaMesOrderStepReport
} from '@/api/scgl'
-import { urlAddRandomNo, webapp_ws_ajax_run } from '@/utils/grwebapp'
+import { urlAddRandomNo, webapp_urlprotocol_startup, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
import { MesOrderPrintSearch1 } from '@/api/utils'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
@@ -714,7 +714,7 @@
WXform: { // 澶栧崗琛ㄥ崟
// PO202206280001_4;Step01
orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
- prop: 'wo_code', // 鎺掑簭瀛楁
+ prop: 'wo_code', // 鎺掑簭瀛楁z
order: 'asc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
@@ -821,6 +821,8 @@
this.$nextTick(() => {
$("input[name='produceCode']")[0].focus()
})
+ // webapp_urlprotocol_startup()
+ webapp_ws_autoupdate(true)
},
methods: {
async getMesOrderStepSearch() {
@@ -897,12 +899,12 @@
// 鏀舵枡锛歝ode="200" count=3
// 璧板垪琛ㄥ舰寮� code="200" count=4
if (belong === 'produceCode') {
+ const orderstepqrcode = this.form.orderstepqrcode
const data = {
OperType: 'ZZ',
- orderstepqrcode: this.form.orderstepqrcode,
+ orderstepqrcode: orderstepqrcode,
SelectType: ''
}
- console.log(this.form.orderstepqrcode, 21)
const res = await MesOrderStepStart(data)
if (res.code === '200' && res.count === 0) {
await this.ZZstart(res.data)
@@ -912,9 +914,10 @@
}
}
if (belong === 'WXproduceCode') {
+ const orderstepqrcode = this.WXform.orderstepqrcode
const data = {
OperType: 'WX',
- orderstepqrcode: this.WXform.orderstepqrcode,
+ orderstepqrcode: orderstepqrcode,
SelectType: this.WXSelected// OUT銆両N
}
const res = await MesOrderStepStart(data)
@@ -1245,12 +1248,12 @@
inuser: this.dialogForm.inuser, // 鍙戞枡浜哄憳
taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
sqty: this.dialogForm.sqty, // 鏀舵枡鏁伴噺
- ngqty: this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
+ ngqty: this.dialogForm.noputqty === '' ? 0 : this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
}
SavaMesOrderStepIn(data).then(res => {
if (res.code === '200') {
- // this.WXprint()
+ this.WXprint()
this.$message.success('鏀舵枡鎴愬姛锛�')
this.dialogVisible = false
this.tabClick()
@@ -1272,7 +1275,6 @@
}
SavaMesOrderStepStart(data).then(res => {
if (res.code === '200') {
- // this.WXprint()
this.$message.success('寮�宸ユ垚鍔燂紒')
this.dialogVisible = false
this.tabClick()
@@ -1310,12 +1312,12 @@
startqty: this.dialogForm.reportqty, // 寮�宸ユ暟閲�
// reportqty: this.dialogForm.reportqty, // 鎶ュ伐鏁伴噺
reportqty: this.dialogForm.startqty, // 鎶ュ伐鏁伴噺
- ngqty: this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
+ ngqty: this.dialogForm.noputqty === '' ? 0 : this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
}
SavaMesOrderStepReport(data).then(res => {
if (res.code === '200') {
- // this.ZZprint()
+ this.ZZprint()
this.$message.success('鎶ュ伐鎴愬姛锛�')
this.dialogVisible = false
this.tabClick()
diff --git a/src/views/template.vue b/src/views/template.vue
index bf3846a..d59922e 100644
--- a/src/views/template.vue
+++ b/src/views/template.vue
@@ -129,7 +129,7 @@
<el-dialog
:title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="60%"
+ width="800"
top="15vh"
@closed="handleClose"
@close="handleClose"
diff --git a/src/views/wlgl/ckdy.vue b/src/views/wlgl/ckdy.vue
index e845c03..c07ea62 100644
--- a/src/views/wlgl/ckdy.vue
+++ b/src/views/wlgl/ckdy.vue
@@ -32,7 +32,7 @@
<el-divider />
<div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+ <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
diff --git a/src/views/wlgl/kwdy.vue b/src/views/wlgl/kwdy.vue
index 49ed450..5611c7b 100644
--- a/src/views/wlgl/kwdy.vue
+++ b/src/views/wlgl/kwdy.vue
@@ -48,7 +48,7 @@
<el-divider />
<div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+ <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index 570859e..8cfed2f 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -81,7 +81,7 @@
<div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<el-button type="primary" icon="el-icon-office-building" @click="office">鍗曚綅</el-button>
- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+ <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index 1b82c81..2b86451 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -55,7 +55,7 @@
<el-divider />
<div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+ <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
diff --git a/src/views/zzmx/gylx.vue b/src/views/zzmx/gylx.vue
index 0b72a13..aa4eff6 100644
--- a/src/views/zzmx/gylx.vue
+++ b/src/views/zzmx/gylx.vue
@@ -32,7 +32,7 @@
<el-divider />
<div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+ <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
diff --git a/src/views/zzmx/wllx.vue b/src/views/zzmx/wllx.vue
index 2d2f014..894681d 100644
--- a/src/views/zzmx/wllx.vue
+++ b/src/views/zzmx/wllx.vue
@@ -36,7 +36,7 @@
<el-divider />
<div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+ <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
--
Gitblit v1.9.3