Browse Source

去掉所有标签打印的放大镜按钮

dev_web_online
安虹睿 2 years ago
parent
commit
fee31880a6
  1. 2
      fe/PC/public/config.js
  2. 2
      fe/PC/public/version.json
  3. 14
      fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue
  4. 14
      fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue
  5. 14
      fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue
  6. 8
      fe/PC/src/views/labelManage/PartiallyPreparedProducts/splitLabels.vue

2
fe/PC/public/config.js

@ -22,7 +22,7 @@ window.SITE_CONFIG['reportsUrl'] = 'http://dev.ccwin-in.com:60074/#/reports/'
window.SITE_CONFIG['versionUrl'] = 'http://dev.ccwin-in.com:60070'
window.SITE_CONFIG['companyName'] = '长春一汽富维东阳汽车塑料零部件(安徽)有限公司'
// 接口看板地址
window.SITE_CONFIG['interfaceBoardUrl'] = 'https://www.baidu.com/'
window.SITE_CONFIG['interfaceBoardUrl'] = 'http://dev.ccwin-in.com:60090/'
// mock
// window.SITE_CONFIG['apifoxToken'] = 'NXHNi5mp0dnUHGt0wkCrjvfcidsFKV33'

2
fe/PC/public/version.json

@ -1,3 +1,3 @@
{
"version": "1.0.28"
"version": "1.0.29"
}

14
fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue

@ -130,10 +130,10 @@ export default {
// {logic:"And",column:"canMake",action:"==",value:"true"},
{logic:"And",column:"type",action:"==",value:"10C04"}
])},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,[
// {logic:"And",column:"canMake",action:"==",value:"true"},
{logic:"And",column:"type",action:"==",value:"10C04"}
]) },
// searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '', this.selectData,[
// // {logic:"And",column:"canMake",action:"==",value:"true"},
// {logic:"And",column:"type",action:"==",value:"10C04"}
// ]) },
colSpan: 12,
},
{ type: "input",disabled:true,label: "物品名称", prop: "itemName", colSpan: 12 },
@ -152,9 +152,9 @@ export default {
hide:false,type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData,
this.isFilter("itemCode", this.selectData.itemCode)
) },
// searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '', this.selectData,
// this.isFilter("itemCode", this.selectData.itemCode)
// ) },
colSpan: 12,
},
{

14
fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue

@ -52,7 +52,7 @@
@handleSelectionChange="prepareFormData"
@SizeChange="searchAlterResultCount($event, searchPageListParams)"
@CurrentChange="searchAlertoldSkipCount($event, searchPageListParams)"
@tableButtonClick="searchSubmit(arguments)"
@tableButtonClick="searchSubmit"
></searchPage>
</div>
</template>
@ -129,9 +129,9 @@ export default {
focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic",
// [{logic:"And",column:"canMake",action:"!=",value:"true"}] //
)},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,
// [{logic:"And",column:"canMake",action:"!=",value:"true"}] //
)},
// searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '', this.selectData,
// // [{logic:"And",column:"canMake",action:"!=",value:"true"}] //
// )},
colSpan: 12,
},
{ type: "input",disabled:true,label: "物品名称", prop: "itemName", colSpan: 12 },
@ -150,9 +150,9 @@ export default {
hide:false,type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData,
this.isFilter("itemCode", this.selectData.itemCode)
) },
// searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '', this.selectData,
// this.isFilter("itemCode", this.selectData.itemCode)
// ) },
colSpan: 12,
},
{

14
fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue

@ -118,19 +118,19 @@ export default {
{logic:"And",column:"canMake",action:"!=",value:"true"},
{logic:"And",column:"isRecycled",action:"!=",value:"true"},
])},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,[
{logic:"And",column:"canMake",action:"!=",value:"true"},
{logic:"And",column:"isRecycled",action:"!=",value:"true"},
]) },
// searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '', this.selectData,[
// {logic:"And",column:"canMake",action:"!=",value:"true"},
// {logic:"And",column:"isRecycled",action:"!=",value:"true"},
// ]) },
colSpan: 12,
},
{ type: "input",disabled:true,label: "物品名称", prop: "itemName", colSpan: 12 },
{ type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData,
this.isFilter("itemCode", this.selectData.itemCode)
) },
// searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '', this.selectData,
// this.isFilter("itemCode", this.selectData.itemCode)
// ) },
colSpan: 12,
},
{

8
fe/PC/src/views/labelManage/PartiallyPreparedProducts/splitLabels.vue

@ -134,10 +134,10 @@ export default {
{logic:"And",column:"labelType",action:"==",value:"1"},
{logic:"And",column:"qty",action:">",value:"0"},
])},
searchButton: (val) => { this.showSerarchPage(val, 'label/inventory-label', 'labelsList', '箱标签选择', this.selectData,[
{logic:"And",column:"labelType",action:"==",value:"1"},
{logic:"And",column:"qty",action:">",value:"0"},
]) },
// searchButton: (val) => { this.showSerarchPage(val, 'label/inventory-label', 'labelsList', '', this.selectData,[
// {logic:"And",column:"labelType",action:"==",value:"1"},
// {logic:"And",column:"qty",action:">",value:"0"},
// ]) },
colSpan: 12,
},
{ type: "inputNumber", label: "拆出数量", prop: "qty",colSpan: 12 },

Loading…
Cancel
Save