yu
/
CostumingPlatform
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
zhc4dev
lenovo 2 years ago
parent ee4e01bad7 ffc9992e63
commit 4b3ec4387f
10 changed files with 288 additions and 256 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 67
      ant-design-vue-jeecg/package.json
  2. 13
      ant-design-vue-jeecg/src/main.js
  3. 2
      ant-design-vue-jeecg/src/views/maker/modules/QRCode.vue
  4. 15
      ant-design-vue-jeecg/src/views/process/ZyClothsTypeList.vue
  5. 2
      ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue
  6. 79
      ant-design-vue-jeecg/src/views/system/Depart3List.vue
  7. 43
      ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
  8. 78
      ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue
  9. 2
      ant-design-vue-jeecg/src/views/zyworkorder/modules/QRCode.vue
  10. 7
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java

67
ant-design-vue-jeecg/package.json
Unescape View File

@ -10,63 +10,65 @@
"lint": "vue-cli-service lint" "lint": "vue-cli-service lint"
}, },
"dependencies": { "dependencies": {
"@antv/data-set": "^0.11.4",
"@jeecg/antd-online-mini": "2.4.5-RC",
"@jiaminghi/data-view": "^2.10.0",
"@tinymce/tinymce-vue": "^2.1.0",
"@toast-ui/editor": "^2.1.2",
"ant-design-vue": "^1.7.2", "ant-design-vue": "^1.7.2",
"area-data": "^5.0.6", "@antv/data-set": "^0.11.4",
"axios": "^0.27.2", "viser-vue": "^2.4.8",
"clipboard": "^2.0.10", "axios": "^0.18.0",
"codemirror": "^5.65.1",
"cron-parser": "^2.10.0",
"dayjs": "^1.8.0", "dayjs": "^1.8.0",
"dircountdown": "^1.1.0",
"dom-align": "1.12.0",
"echarts": "^5.3.0",
"element-ui": "^2.15.6",
"enquire.js": "^2.1.6", "enquire.js": "^2.1.6",
"jquery": "^3.6.0",
"js-cookie": "^2.2.0", "js-cookie": "^2.2.0",
"lodash.get": "^4.4.2", "lodash.get": "^4.4.2",
"lodash.pick": "^4.4.0", "lodash.pick": "^4.4.0",
"md5": "^2.2.1", "md5": "^2.2.1",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"qs": "^6.10.3",
"tinymce": "^5.10.3",
"viser-vue": "^2.4.8",
"vue": "^2.6.10", "vue": "^2.6.10",
"vue-area-linkage": "^5.1.0",
"vue-cropper": "^0.5.4", "vue-cropper": "^0.5.4",
"vue-i18n": "^8.27.0", "vue-i18n": "^8.7.0",
"vue-loader": "^15.7.0", "vue-loader": "^15.7.0",
"vue-ls": "^3.2.0", "vue-ls": "^3.2.0",
"vue-photo-preview": "^1.0.9",
"vue-print-nb": "^1.7.5",
"vue-print-nb-jeecg": "^1.0.9",
"vue-router": "^3.0.1", "vue-router": "^3.0.1",
"vuex": "^3.1.0",
"vue-print-nb-jeecg": "^1.0.10",
"clipboard": "^2.0.4",
"vue-photo-preview": "^1.1.3",
"vue-splitpane": "^1.0.4", "vue-splitpane": "^1.0.4",
"vuedraggable": "^2.20.0", "vuedraggable": "^2.20.0",
"vuex": "^3.1.0", "codemirror": "^5.46.0",
"@tinymce/tinymce-vue": "2.1.0",
"tinymce": "5.4.1",
"@toast-ui/editor": "^2.1.2",
"vue-area-linkage": "^5.1.0",
"china-area-data": "^5.0.1",
"dom-align": "1.12.0",
"xe-utils": "2.4.8",
"vxe-table": "2.9.13", "vxe-table": "2.9.13",
"vxe-table-plugin-antd": "1.8.10", "vxe-table-plugin-antd": "1.8.10",
"xe-utils": "2.4.8" "cron-parser": "^2.10.0",
"qiankun": "^2.5.1",
"xss": "^1.0.13",
"@jiaminghi/data-view": "^2.10.0",
"area-data": "^5.0.6",
"dircountdown": "^1.1.0",
"echarts": "^5.3.0",
"element-ui": "^2.15.6",
"jquery": "^3.6.0",
"qs": "^6.10.3"
}, },
"devDependencies": { "devDependencies": {
"@babel/polyfill": "^7.2.5", "@babel/polyfill": "^7.2.5",
"@vue/cli-plugin-babel": "^3.3.0", "@vue/cli-plugin-babel": "^3.3.0",
"@vue/cli-plugin-eslint": "^5.0.8", "@vue/cli-plugin-eslint": "^3.3.0",
"@vue/cli-service": "^5.0.8", "@vue/cli-service": "^3.3.0",
"@vue/eslint-config-standard": "^4.0.0", "@vue/eslint-config-standard": "^4.0.0",
"babel-eslint": "7.2.3", "babel-eslint": "7.2.3",
"compression-webpack-plugin": "^10.0.0",
"eslint": "^5.16.0", "eslint": "^5.16.0",
"eslint-plugin-vue": "^5.1.0", "eslint-plugin-vue": "^5.1.0",
"html-webpack-plugin": "^4.2.0",
"less": "^3.9.0", "less": "^3.9.0",
"less-loader": "^4.1.0", "less-loader": "^4.1.0",
"vue-template-compiler": "^2.6.10" "vue-template-compiler": "^2.6.10",
"html-webpack-plugin": "^4.2.0",
"compression-webpack-plugin": "^3.1.0"
}, },
"eslintConfig": { "eslintConfig": {
"root": true, "root": true,
@ -104,10 +106,7 @@
"vue/html-closing-bracket-newline": 0, "vue/html-closing-bracket-newline": 0,
"vue/no-parsing-error": 0, "vue/no-parsing-error": 0,
"no-tabs": 0, "no-tabs": 0,
"indent": [ "indent": ["off", 2],
"off",
2
],
"no-console": 0, "no-console": 0,
"space-before-function-paren": 0 "space-before-function-paren": 0
} }

13
ant-design-vue-jeecg/src/main.js
Unescape View File

@ -14,9 +14,12 @@ import 'element-ui/lib/theme-chalk/index.css';
// YU-优化 // YU-优化
require('@jeecg/antd-online-mini') require('@jeecg/antd-online-mini')
require('@jeecg/antd-online-mini/dist/OnlineForm.css') require('@jeecg/antd-online-mini/dist/OnlineForm.css')
// 引入 按需组件的统一引入文件
//import './components/use'
import Antd, { version } from 'ant-design-vue' import Antd, { version } from 'ant-design-vue'
console.log('ant-design-vue version:', version) // 按需引入所需组件，统一引入文件---优化
//import './components/lazy_antd'
//console.log('ant-design-vue version:', version)
import Viser from 'viser-vue' import Viser from 'viser-vue'
import 'ant-design-vue/dist/antd.less'; // or 'ant-design-vue/dist/antd.less' import 'ant-design-vue/dist/antd.less'; // or 'ant-design-vue/dist/antd.less'
@ -24,7 +27,7 @@ import 'ant-design-vue/dist/antd.less'; // or 'ant-design-vue/dist/antd.less'
import '@/permission' // permission control import '@/permission' // permission control
import '@/utils/filter' // base filter import '@/utils/filter' // base filter
// YU-优化 // YU-优化
//import Print from 'vue-print-nb-jeecg' import Print from 'vue-print-nb-jeecg'
import preview from 'vue-photo-preview' import preview from 'vue-photo-preview'
import 'vue-photo-preview/dist/skin.css' import 'vue-photo-preview/dist/skin.css'
import SSO from '@/cas/sso.js' import SSO from '@/cas/sso.js'
@ -68,13 +71,15 @@ Vue.prototype.$axios=axios;
Vue.prototype.rules = rules Vue.prototype.rules = rules
Vue.config.productionTip = false Vue.config.productionTip = false
Vue.use(Storage, config.storageOptions) Vue.use(Storage, config.storageOptions)
// 按需引入所需组件，统一引入文件---优化
Vue.use(Antd) Vue.use(Antd)
Vue.use(ElementUI); Vue.use(ElementUI);
Vue.use(VueAxios, router) Vue.use(VueAxios, router)
Vue.use(Viser) Vue.use(Viser)
Vue.use(hasPermission) Vue.use(hasPermission)
Vue.use(JDictSelectTag) Vue.use(JDictSelectTag)
//Vue.use(Print) Vue.use(Print)
Vue.use(preview) Vue.use(preview)
Vue.use(vueBus); Vue.use(vueBus);
Vue.use(JeecgComponents); Vue.use(JeecgComponents);

2
ant-design-vue-jeecg/src/views/maker/modules/QRCode.vue
Unescape View File

@ -29,7 +29,7 @@
import { httpAction } from '@/api/manage' import { httpAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util' import { validateDuplicateValue } from '@/utils/util'
import { Print } from 'vue-print-nb' import { Print } from 'vue-print-nb-jeecg'
export default { export default {
name: "MakerQRCode", name: "MakerQRCode",
components: { components: {

15
ant-design-vue-jeecg/src/views/process/ZyClothsTypeList.vue
Unescape View File

@ -11,8 +11,15 @@
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="类型名称" > <a-form-item label="类型名称" >
<a-input placeholder="请输入类型名称" v-model="queryParam.typeName" ></a-input> <j-tree-select v-model="queryParam.id"
dict="zy_cloths_type,type_name,id"
pidField="type_id"
placeholder="请选择类型名称" >
</j-tree-select>
</a-form-item> </a-form-item>
<!-- <a-form-item label="类型名称">-->
<!-- <a-input placeholder="请输入类型名称" v-model="queryParam.typeName" ></a-input>-->
<!-- </a-form-item>-->
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="企业名称"> <a-form-item label="企业名称">
@ -111,6 +118,8 @@
import { mixinDevice } from '@/utils/mixin' import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyClothsTypeModal from './modules/ZyClothsTypeModal' import ZyClothsTypeModal from './modules/ZyClothsTypeModal'
import {filterObj} from "@/utils/util";
import {getAction} from "@api/manage";
export default { export default {
name: 'ZyClothsTypeList', name: 'ZyClothsTypeList',
@ -147,7 +156,7 @@
title:'类型名称', title:'类型名称',
align:"center", align:"center",
dataIndex: 'typeName', dataIndex: 'typeName',
sorter:true sorter:true,
}, },
{ {
title:'企业', title:'企业',
@ -174,7 +183,6 @@
deleteBatch: "/base/zyClothsType/deleteBatch", deleteBatch: "/base/zyClothsType/deleteBatch",
exportXlsUrl: "/base/zyClothsType/exportXls", exportXlsUrl: "/base/zyClothsType/exportXls",
importExcelUrl: "base/zyClothsType/importExcel", importExcelUrl: "base/zyClothsType/importExcel",
}, },
dictOptions:{}, dictOptions:{},
superFieldList:[], superFieldList:[],
@ -182,6 +190,7 @@
}, },
created() { created() {
this.getSuperFieldList(); this.getSuperFieldList();
// this.loadParameter();
}, },
computed: { computed: {
importExcelUrl: function(){ importExcelUrl: function(){

2
ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue
Unescape View File

@ -81,7 +81,7 @@
// ], // ],
typeName: [ typeName: [
{ required: true, message: '请输入类型名称!'}, { required: true, message: '请输入类型名称!'},
{ pattern: /^[0-9A-Za-z\u4e00-\u9fa5.,;，。；、!?]{0,5}$/, message: '文本长度过长'}, { pattern: /^[0-9A-Za-z\u4e00-\u9fa5.,;，。；、!?]{0,50}$/, message: '文本长度过长'},
], ],
enterpriseId: [ enterpriseId: [
{ required: true, message: '请输入企业!'}, { required: true, message: '请输入企业!'},

79
ant-design-vue-jeecg/src/views/system/Depart3List.vue
Unescape View File

@ -7,11 +7,11 @@
<a-row style="margin-left: 14px"> <a-row style="margin-left: 14px">
<a-button @click="handleAdd(1)" type="primary">添加部门</a-button> <a-button @click="handleAdd(1)" type="primary">添加部门</a-button>
<a-button @click="handleAdd(2)" type="primary">添加下级</a-button> <a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button> <!--<a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>-->
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <!--<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
<a-button type="primary" icon="import">导入</a-button> <!--<a-button type="primary" icon="import">导入</a-button>-->
</a-upload> <!--</a-upload>-->
<a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button> <!--<a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>-->
<!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>--> <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
</a-row> </a-row>
<div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px"> <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
@ -28,7 +28,7 @@
<a-dropdown :trigger="[this.dropTrigger]" @visibleChange="dropStatus"> <a-dropdown :trigger="[this.dropTrigger]" @visibleChange="dropStatus">
<span style="user-select: none"> <span style="user-select: none">
<a-tree <a-tree
checkable
multiple multiple
@select="onSelect" @select="onSelect"
@check="onCheck" @check="onCheck"
@ -78,9 +78,10 @@
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="机构名称"> label="部门名称">
<a-input placeholder="请输入机构/部门名称" v-decorator="['departName', validatorRules.departName ]"/> <a-input placeholder="请输入机构/部门名称" v-decorator="['departName', validatorRules.departName ]"/>
</a-form-item> </a-form-item>
<template v-if="!orgCategoryDisabled">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级部门"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级部门">
<a-tree-select <a-tree-select
style="width:100%" style="width:100%"
@ -91,45 +92,43 @@
placeholder="无"> placeholder="无">
</a-tree-select> </a-tree-select>
</a-form-item> </a-form-item>
</template>
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="机构编码"> label="部门编码">
<a-input disabled placeholder="请输入机构编码" v-decorator="['orgCode', validatorRules.orgCode ]"/> <a-input disabled placeholder="请输入部门编码" v-decorator="['orgCode', validatorRules.orgCode ]"/>
</a-form-item> </a-form-item>
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="机构类型"> label="部门类型">
<template v-if="orgCategoryDisabled"> <template v-if="orgCategoryDisabled">
<a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型"> <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择部门类型">
<a-radio value="1"> <a-radio value="1">
行政 管理机构
</a-radio> </a-radio>
<a-radio value="2"> <a-radio value="2">
教学 生产企业
</a-radio>
<a-radio value="4">
网店
</a-radio> </a-radio>
<a-radio value="5"> <a-radio value="5">
公司 门店
</a-radio>
<a-radio value="6">
供应商
</a-radio>
<a-radio value="7">
物流公司
</a-radio> </a-radio>
</a-radio-group> </a-radio-group>
</template> </template>
<template v-else> <template v-else>
<a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型"> <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择部门类型">
<a-radio value="1">
行政
</a-radio>
<a-radio value="2">
教学
</a-radio>
<a-radio value="3"> <a-radio value="3">
班级 子部门
</a-radio>
<a-radio value="4">
分组
</a-radio>
<a-radio value="5">
公司
</a-radio> </a-radio>
</a-radio-group> </a-radio-group>
</template> </template>
@ -170,9 +169,9 @@
</a-empty> </a-empty>
</a-card> </a-card>
</a-tab-pane> </a-tab-pane>
<a-tab-pane tab="部门权限" key="2" forceRender> <!--<a-tab-pane tab="部门权限" key="2" forceRender>-->
<depart-auth-modal ref="departAuth"/> <!--<depart-auth-modal ref="departAuth"/>-->
</a-tab-pane> <!--</a-tab-pane>-->
</a-tabs> </a-tabs>
</a-col> </a-col>
@ -189,16 +188,16 @@
// 表头 // 表头
const columns = [ const columns = [
{ {
title: '机构名称', title: '部门名称',
dataIndex: 'departName' dataIndex: 'departName'
}, },
{ {
title: '机构类型', title: '部门类型',
align: 'center', align: 'center',
dataIndex: 'orgType' dataIndex: 'orgType'
}, },
{ {
title: '机构编码', title: '部门编码',
dataIndex: 'orgCode', dataIndex: 'orgCode',
}, },
{ {
@ -273,9 +272,9 @@
edges: [] edges: []
}, },
validatorRules: { validatorRules: {
departName: {rules: [{required: true, message: '请输入机构/部门名称!'}]}, departName: {rules: [{required: true, message: '请输入部门/部门名称!'}]},
orgCode: {rules: [{required: true, message: '请输入机构编码!'}]}, orgCode: {rules: [{required: true, message: '请输入部门编码!'}]},
orgCategory: {rules: [{required: true, message: '请输入机构类型!'}]}, orgCategory: {rules: [{required: true, message: '请输入部门类型!'}]},
mobile: {rules: [{validator: this.validateMobile}]} mobile: {rules: [{validator: this.validateMobile}]}
}, },
url: { url: {
@ -447,10 +446,10 @@
}, },
// 触发onSelect事件时,为部门树右侧的form表单赋值 // 触发onSelect事件时,为部门树右侧的form表单赋值
setValuesToForm(record) { setValuesToForm(record) {
if(record.orgCategory == '1'){ if(record.orgCategory == '3'){
this.orgCategoryDisabled = true;
}else{
this.orgCategoryDisabled =false ; this.orgCategoryDisabled =false ;
}else{
this.orgCategoryDisabled =true;
} }
this.$nextTick(() => { this.$nextTick(() => {
this.form.getFieldDecorator('fax', {initialValue: ''}) this.form.getFieldDecorator('fax', {initialValue: ''})

43
ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
Unescape View File

@ -15,10 +15,10 @@
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="机构名称" label="部门名称"
:hidden="false" :hidden="false"
hasFeedback> hasFeedback>
<a-input id="departName" placeholder="请输入机构/部门名称" v-decorator="['departName', validatorRules.departName ]"/> <a-input id="departName" placeholder="请输入部门/部门名称" v-decorator="['departName', validatorRules.departName ]"/>
</a-form-item> </a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :hidden="seen" label="上级部门" hasFeedback> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :hidden="seen" label="上级部门" hasFeedback>
<a-tree-select <a-tree-select
@ -33,36 +33,33 @@
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="机构类型"> label="部门类型">
<template v-if="seen"> <template v-if="seen">
<a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型"> <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择部门类型">
<a-radio value="1"> <a-radio value="1">
行政 管理机构
</a-radio> </a-radio>
<a-radio value="2"> <a-radio value="2">
教学 生产企业
</a-radio>
<a-radio value="4">
网店
</a-radio> </a-radio>
<a-radio value="5"> <a-radio value="5">
公司 门店
</a-radio>
<a-radio value="6">
供应商
</a-radio>
<a-radio value="7">
物流公司
</a-radio> </a-radio>
</a-radio-group> </a-radio-group>
</template> </template>
<template v-else> <template v-else>
<a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型"> <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择部门类型">
<a-radio value="1">
行政
</a-radio>
<a-radio value="2">
教学
</a-radio>
<a-radio value="3"> <a-radio value="3">
班级 子部门
</a-radio>
<a-radio value="4">
分组
</a-radio>
<a-radio value="5">
公司
</a-radio> </a-radio>
</a-radio-group> </a-radio-group>
</template> </template>
@ -138,8 +135,8 @@
confirmLoading: false, confirmLoading: false,
form: this.$form.createForm(this), form: this.$form.createForm(this),
validatorRules: { validatorRules: {
departName: {rules: [{required: true, message: '请输入机构/部门名称!'}]}, departName: {rules: [{required: true, message: '请输入部门/部门名称!'}]},
orgCode: {rules: [{required: true, message: '请输入机构编码!'}]}, orgCode: {rules: [{required: true, message: '请输入部门编码!'}]},
mobile: {rules: [{validator: this.validateMobile}]} mobile: {rules: [{validator: this.validateMobile}]}
}, },
url: { url: {

78
ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue
Unescape View File

@ -1,7 +1,8 @@
<template> <template>
<a-spin :spinning="confirmLoading"> <a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled"> <j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail" :layout="horizontal"> <!-- <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail" :layout="horizontal">-->
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="企业" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="enterpriseId"> <a-form-model-item label="企业" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="enterpriseId">
@ -13,8 +14,8 @@
<j-popup <j-popup
v-model="model.typeName" v-model="model.typeName"
field="type_name" field="type_name"
org-fields="type_name,id" org-fields="type_name,nums"
dest-fields="typeName,typeId" dest-fields="typeName,styleId"
code="cloths_type" code="cloths_type"
:multi="false" :multi="false"
@input="popupCallback" @input="popupCallback"
@ -26,14 +27,11 @@
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="形式" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="shape"> <a-form-model-item label="形式" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="shape">
<j-dict-select-tag type="radio" v-model="model.shape" dictCode="style_shape" placeholder="请输入形式" ></j-dict-select-tag> <j-dict-select-tag type="radio" v-model="model.shape" dictCode="style_shape"
placeholder="请输入形式"></j-dict-select-tag>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">-->
<!-- <a-input v-model="model.nums" placeholder="请输入编号" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="款式名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleNames"> <a-form-model-item label="款式名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleNames">
<a-input v-model="model.styleNames" placeholder="请输入款式名称"></a-input> <a-input v-model="model.styleNames" placeholder="请输入款式名称"></a-input>
@ -43,20 +41,22 @@
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="规格" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="specification"> <a-form-model-item label="编号" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="nums">
<a-input v-model="model.specification" placeholder="请输入规格" ></a-input> <a-input v-model="model.nums" placeholder="请输入编号" disabled=""></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="定额用料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="quotaMaterials"> <a-form-model-item label="定额用料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="quotaMaterials">
<a-input v-model="model.quotaMaterials" placeholder="请输入定额用料"></a-input> <a-input v-model="model.quotaMaterials" placeholder="请输入定额用料"></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="风格" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="characteristic"> <a-form-model-item label="规格" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="specification">
<a-input v-model="model.characteristic" placeholder="请输入风格" ></a-input> <a-input v-model="model.specification" placeholder="请输入规格"></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
@ -67,8 +67,8 @@
</a-row> </a-row>
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="结构" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="structure"> <a-form-model-item label="风格" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="characteristic">
<a-input v-model="model.structure" placeholder="请输入结构" ></a-input> <a-input v-model="model.characteristic" placeholder="请输入风格"></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
@ -76,12 +76,21 @@
<j-dict-select-tag v-model="model.sewingForm" placeholder="请选择缝纫形式" dict-code="sewingForm"/> <j-dict-select-tag v-model="model.sewingForm" placeholder="请选择缝纫形式" dict-code="sewingForm"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row>
<a-row>
<a-col :span="12">
<a-form-model-item label="结构" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="structure">
<a-input v-model="model.structure" placeholder="请输入结构"></a-input>
</a-form-model-item>
</a-col>
</a-row> </a-row>
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="折叠搭配及包装" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="foldingPackaging"> <a-form-model-item label="折叠搭配及包装" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="foldingPackaging">
<j-dict-select-tag v-model="model.foldingPackaging" placeholder="请选择折叠搭配及包装" dict-code="foldingPackaging" /> <j-dict-select-tag v-model="model.foldingPackaging" placeholder="请选择折叠搭配及包装"
dict-code="foldingPackaging"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
@ -94,7 +103,10 @@
</a-row> </a-row>
<a-row> <a-row>
<a-col> <a-col>
<a-form-model-item label="销售地区" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="salesTerritory" :labelAlign="left"> <!-- <a-form-model-item label="销售地区" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="salesTerritory" :labelAlign="left">-->
<!-- <a-textarea v-model="model.salesTerritory" placeholder="请输入销售地区" />-->
<!-- </a-form-model-item>-->
<a-form-model-item label="销售地区" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="salesTerritory">
<a-textarea v-model="model.salesTerritory" placeholder="请输入销售地区"/> <a-textarea v-model="model.salesTerritory" placeholder="请输入销售地区"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
@ -234,17 +246,6 @@
<!-- </a-col>--> <!-- </a-col>-->
</a-row> </a-row>
<!-- <a-row>--> <!-- <a-row>-->
<!-- <a-col :span="24">--> <!-- <a-col :span="24">-->
<!-- <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">--> <!-- <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">-->
@ -357,11 +358,11 @@
import {httpAction, getAction} from '@/api/manage' import {httpAction, getAction} from '@/api/manage'
import {validateDuplicateValue} from '@/utils/util' import {validateDuplicateValue} from '@/utils/util'
import store from '@/store'
export default { export default {
name: 'ZyClothsStyleForm', name: 'ZyClothsStyleForm',
components: { components: {},
},
props: { props: {
//表单禁用 //表单禁用
disabled: { disabled: {
@ -375,6 +376,7 @@
typeId: "", typeId: "",
typeName: "", typeName: "",
model: { model: {
nums: '',
shape: 1 shape: 1
}, },
labelCol: { labelCol: {
@ -411,7 +413,9 @@
url: { url: {
add: "/zyclothsstyle/zyClothsStyle/add", add: "/zyclothsstyle/zyClothsStyle/add",
edit: "/zyclothsstyle/zyClothsStyle/edit", edit: "/zyclothsstyle/zyClothsStyle/edit",
queryById: "/zyclothsstyle/zyClothsStyle/queryById" queryById: "/zyclothsstyle/zyClothsStyle/queryById",
//getAction的url
sort:"/base/zyProcess/sort"
} }
} }
}, },
@ -462,7 +466,19 @@
}) })
}, },
popupCallback(value, row) { popupCallback(value, row) {
console.log("1222346584" + "++++++")
var n = 8;
this.model = Object.assign(this.model, row); this.model = Object.assign(this.model, row);
getAction(this.url.sort, {id: this.model.styleId}).then((res) => {
console.log("aaaaaa"+res.result);
var num = parseInt(res.result, 10) + 1
num = num.toString()
while (num.length < n) {
num = "0" + num
}
this.model.nums = this.model.styleId + num;
// console.log(this.model.processCode)
})
}, },
} }
} }

2
ant-design-vue-jeecg/src/views/zyworkorder/modules/QRCode.vue
Unescape View File

@ -30,7 +30,7 @@
import { httpAction } from '@/api/manage' import { httpAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util' import { validateDuplicateValue } from '@/utils/util'
import { Print } from 'vue-print-nb' import { Print } from 'vue-print-nb-jeecg'
export default { export default {
name: "QRCode", name: "QRCode",
components: { components: {

7
jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java
Unescape View File

@ -60,6 +60,13 @@ public class ZyClothsTypeController extends JeecgController<ZyClothsType, IZyClo
QueryWrapper<ZyClothsType> queryWrapper = QueryGenerator.initQueryWrapper(zyClothsType, req.getParameterMap()); QueryWrapper<ZyClothsType> queryWrapper = QueryGenerator.initQueryWrapper(zyClothsType, req.getParameterMap());
Page<ZyClothsType> page = new Page<ZyClothsType>(pageNo, pageSize); Page<ZyClothsType> page = new Page<ZyClothsType>(pageNo, pageSize);
IPage<ZyClothsType> pageList = zyClothsTypeService.page(page, queryWrapper); IPage<ZyClothsType> pageList = zyClothsTypeService.page(page, queryWrapper);
List<ZyClothsType> records = pageList.getRecords();
for (ZyClothsType zy : records) {
String typeId = zy.getTypeId();
if (StringUtils.isEmpty(typeId)){
zy.setTypeId("1455487094925819901");
}
}
return Result.OK(pageList); return Result.OK(pageList);
} }

Write Preview
Loading…
Cancel
Save