ERP_override.git

			@@ -729,6 +729,43 @@
			})
			}

			const add = () => {
			ElMessageBox.prompt( t('components.addNewSignature')+':', {
			confirmButtonText: t('basicData.save'),
			cancelButtonText: t('basicData.cancelButtonText'),
			inputPattern:/^.{1,20}$/,
			inputErrorMessage: t('components.message'),
			inputValue:tag.value.name
			}).then(({ value }) => {
			tag.value.name = value
			let json = $ref(hiprintTemplate.value.getJson())
			const tableFlag = json.panels[0].printElements.filter(item => item.options.field==='table')

			if(tableFlag.length===1 && json.panels[0].printElements.length===1){
			let funct = "function(value,row,index,options){return `"
			json.panels[0].printElements[0].options.columns[0].forEach(item => {
			if(item.field){
			funct += item.title+':${row.'+item.field+' \|\| "" } <br>'
			}
			})
			funct+='`}'
			json.panels[0].printElements[0].options.columns[0][0].renderFormatter = funct
			}else if(json.panels[0].printElements.length>1 && tableFlag.length>0){
			ElMessage.warning('保存失败,请检查是否只有一个表格')
			return
			}


			tag.value.value = JSON.stringify(json)
			request.post('tagStyle/addTag',tag.value).then(res => {
			if(res.code === '200' && res.data===true){
			ElMessage.success(t('basicData.msg.saveSuccess'))
			getTags()
			}
			})
			})
			}

			const getTags = () => {
			request.get('tagStyle/getTagList').then(res => {
			tags.value = res.data
			@@ -892,6 +929,7 @@
			</el-col>
			<el-col :span="6">
			<el-button type="primary" @click="save">保存</el-button>
			<el-button type="primary" @click="add">复制</el-button>
			<el-button type="warning" @click="clear">清空</el-button>
			<el-button :disabled="!tag.id" type="danger" @click="deleteTag">删除</el-button>
			<el-button type="primary" @click="htmlPrint">预览</el-button>

			@@ -722,6 +722,10 @@
			height="100%"
			v-bind="gridOptions"
			v-on="gridEvents"
			:column-config="{resizable: true}"
			:row-config="{isCurrent: true, isHover: true}"
			:data="tableData"
			:checkbox-config="{labelField: 'name', highlight: true, range: true}">


			>

			@@ -41,4 +41,8 @@
			}


			@PostMapping("addTag")
			public Result addTag(@RequestBody TagStyle tagStyle){
			return Result.seccess(tagStyleService.addTag(tagStyle));
			}
			}

			@@ -41,4 +41,10 @@
			public TagStyle getTagById(Integer id) {
			return tagStyleMapper.selectById(id);
			}

			public Boolean addTag(TagStyle tagStyle) {

			tagStyle.setId(null);
			return tagStyleMapper.insert(tagStyle)>0;
			}
			}

	north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue	38 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/TagStyleController.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/TagStyleService.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史