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

20220905-核对

Browse Source
zhc4dev
lenovo 2 years ago
parent c57f1a612d
commit bff23ebd48
14 changed files with 1304 additions and 791 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. 34
      .idea/compiler.xml
  2. 17
      .idea/encodings.xml
  3. 30
      .idea/jarRepositories.xml
  4. 1
      .idea/modules.xml
  5. 10
      .idea/runConfigurations.xml
  6. 358
      .idea/workspace.xml
  7. 1362
      ant-design-vue-jeecg/package-lock.json
  8. 2
      ant-design-vue-jeecg/src/views/process/ZyClothActionList.vue
  9. 40
      ant-design-vue-jeecg/src/views/process/ZyProcessList.vue
  10. 6
      ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue
  11. 73
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue
  12. 89
      ant-design-vue-jeecg/yarn.lock
  13. 12
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothAction.java
  14. 61
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java

34
.idea/compiler.xml
Unescape View File

@ -2,23 +2,24 @@
<project version="4"> <project version="4">
<component name="CompilerConfiguration"> <component name="CompilerConfiguration">
<annotationProcessing> <annotationProcessing>
<profile default="true" name="Default" enabled="true" />
<profile name="Maven default annotation processors profile" enabled="true"> <profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" /> <sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" /> <outputRelativeToContentRoot value="true" />
<module name="jeecg-system-cloud-api" />
<module name="jeecg-boot-base-core" /> <module name="jeecg-boot-base-core" />
<module name="jeecg-boot-module-personnel" />
<module name="jeecg-boot-module-system" />
<module name="jeecg-system-local-api" />
<module name="jeecg-boot-module-orderbymakeclothplan" />
<module name="jeecg-boot-module-shop" />
<module name="jeecg-boot-module-erp" />
<module name="jeecg-boot-base-tools" /> <module name="jeecg-boot-base-tools" />
<module name="jeecg-boot-module-activiti" /> <module name="jeecg-boot-module-activiti" />
<module name="jeecg-boot-module-erp" />
<module name="jeecg-boot-module-gdnk" />
<module name="jeecg-boot-module-mall" /> <module name="jeecg-boot-module-mall" />
<module name="jeecg-boot-module-orderbymakeclothplan" /> <module name="jeecg-boot-module-gdnk" />
<module name="jeecg-boot-module-personnel" />
<module name="jeecg-boot-module-process" /> <module name="jeecg-boot-module-process" />
<module name="jeecg-boot-module-shop" />
<module name="jeecg-boot-module-system" />
<module name="jeecg-system-cloud-api" />
<module name="jeecg-system-local-api" />
</profile> </profile>
</annotationProcessing> </annotationProcessing>
<bytecodeTargetLevel> <bytecodeTargetLevel>
@ -40,4 +41,21 @@
<module name="jeecg-system-local-api" target="1.8" /> <module name="jeecg-system-local-api" target="1.8" />
</bytecodeTargetLevel> </bytecodeTargetLevel>
</component> </component>
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="jeecg-boot-base-core" options="-parameters" />
<module name="jeecg-boot-base-tools" options="-parameters" />
<module name="jeecg-boot-module-activiti" options="-parameters" />
<module name="jeecg-boot-module-erp" options="-parameters" />
<module name="jeecg-boot-module-gdnk" options="-parameters" />
<module name="jeecg-boot-module-mall" options="-parameters" />
<module name="jeecg-boot-module-orderbymakeclothplan" options="-parameters" />
<module name="jeecg-boot-module-personnel" options="-parameters" />
<module name="jeecg-boot-module-process" options="-parameters" />
<module name="jeecg-boot-module-shop" options="-parameters" />
<module name="jeecg-boot-module-system" options="-parameters" />
<module name="jeecg-system-cloud-api" options="-parameters" />
<module name="jeecg-system-local-api" options="-parameters" />
</option>
</component>
</project> </project>

17
.idea/encodings.xml
Unescape View File

@ -5,17 +5,34 @@
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-tools" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-tools" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-tools/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-activiti" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-activiti" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-activiti/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-activiti/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-erp" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-erp" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-erp/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-gdnk" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-gdnk" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-gdnk/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-mall" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-mall" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-mall/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-orderbymakeclothplan" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-orderbymakeclothplan" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-personnel" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-personnel" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-personnel/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-process" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-process" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-process/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-shop" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-shop" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-shop/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-system" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-system" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-system/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-system/src/main/resources" charset="UTF-8" />
</component> </component>
</project> </project>

30
.idea/jarRepositories.xml
Unescape View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="aliyun" />
<option name="name" value="aliyun Repository" />
<option name="url" value="http://maven.aliyun.com/nexus/content/groups/public" />
</remote-repository>
<remote-repository>
<option name="id" value="jeecg" />
<option name="name" value="jeecg Repository" />
<option name="url" value="http://maven.jeecg.org/nexus/content/repositories/jeecg" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
</component>
</project>

1
.idea/modules.xml
Unescape View File

@ -17,6 +17,7 @@
<module fileurl="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-process/jeecg-boot-module-process.iml" filepath="$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-process/jeecg-boot-module-process.iml" /> <module fileurl="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-process/jeecg-boot-module-process.iml" filepath="$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-process/jeecg-boot-module-process.iml" />
<module fileurl="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-shop/jeecg-boot-module-shop.iml" filepath="$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-shop/jeecg-boot-module-shop.iml" /> <module fileurl="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-shop/jeecg-boot-module-shop.iml" filepath="$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-shop/jeecg-boot-module-shop.iml" />
<module fileurl="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-system/jeecg-boot-module-system.iml" filepath="$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-system/jeecg-boot-module-system.iml" /> <module fileurl="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-system/jeecg-boot-module-system.iml" filepath="$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-system/jeecg-boot-module-system.iml" />
<module fileurl="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-parent.iml" filepath="$PROJECT_DIR$/jeecg-boot/jeecg-boot-parent.iml" />
<module fileurl="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml" filepath="$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml" /> <module fileurl="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml" filepath="$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml" />
<module fileurl="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml" filepath="$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml" /> <module fileurl="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml" filepath="$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml" />
</modules> </modules>

10
.idea/runConfigurations.xml
Unescape View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
</set>
</option>
</component>
</project>

358
.idea/workspace.xml
Unescape View File

@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="a51497f7-c8b1-47cd-9a84-b0cf240ee107" name="Default" comment="" /> <list default="true" id="a51497f7-c8b1-47cd-9a84-b0cf240ee107" name="Default" comment="20220803-qian">
<ignored path="$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-tools/target/" /> <change afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
<ignored path="$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/" /> <change afterPath="$PROJECT_DIR$/.idea/runConfigurations.xml" afterDir="false" />
<ignored path="$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-gdnk/target/" /> <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<ignored path="$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-shop/target/" /> <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
<ignored path="$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-orderbymakeclothplan/target/" /> <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
<ignored path="$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-mall/target/" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<ignored path="$PROJECT_DIR$/jeecg-boot/target/" /> <change beforePath="$PROJECT_DIR$/ant-design-vue-jeecg/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/ant-design-vue-jeecg/package-lock.json" afterDir="false" />
<ignored path="$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-erp/target/" /> <change beforePath="$PROJECT_DIR$/ant-design-vue-jeecg/src/views/process/ZyClothActionList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ant-design-vue-jeecg/src/views/process/ZyClothActionList.vue" afterDir="false" />
<ignored path="$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/target/" /> <change beforePath="$PROJECT_DIR$/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue" afterDir="false" />
<ignored path="$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-system/target/" /> <change beforePath="$PROJECT_DIR$/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue" afterDir="false" />
<ignored path="$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/" /> <change beforePath="$PROJECT_DIR$/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue" afterDir="false" />
<ignored path="$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-activiti/target/" /> <change beforePath="$PROJECT_DIR$/ant-design-vue-jeecg/yarn.lock" beforeDir="false" afterPath="$PROJECT_DIR$/ant-design-vue-jeecg/yarn.lock" afterDir="false" />
<ignored path="$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-process/target/" /> <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothAction.java" afterDir="false" />
<ignored path="$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/target/" /> <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java" afterDir="false" />
<ignored path="$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-personnel/target/" /> </list>
<ignored path="$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -28,114 +28,6 @@
<component name="CompilerWorkspaceConfiguration"> <component name="CompilerWorkspaceConfiguration">
<option name="MAKE_PROJECT_ON_SAVE" value="true" /> <option name="MAKE_PROJECT_ON_SAVE" value="true" />
</component> </component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="package.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/ant-design-vue-jeecg/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="486">
<caret line="18" column="26" lean-forward="true" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="LoginController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="523">
<caret line="223" column="48" lean-forward="false" selection-start-line="223" selection-start-column="48" selection-end-line="223" selection-end-column="48" />
<folding>
<element signature="method#login#0;class#LoginController#0" expanded="false" />
<element signature="method#facelogin#0;class#LoginController#0" expanded="false" />
<element signature="method#userInfo#0;class#LoginController#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="CacheConstant.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/constant/CacheConstant.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="576">
<caret line="92" column="72" lean-forward="false" selection-start-line="92" selection-start-column="70" selection-end-line="92" selection-end-column="72" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="application-dev.yml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3186">
<caret line="5" column="8" lean-forward="false" selection-start-line="5" selection-start-column="8" selection-end-line="5" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".env.production" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/ant-design-vue-jeecg/.env.production">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="27">
<caret line="1" column="48" lean-forward="false" selection-start-line="1" selection-start-column="43" selection-end-line="1" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".env.development" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/ant-design-vue-jeecg/.env.development">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54">
<caret line="2" column="49" lean-forward="false" selection-start-line="2" selection-start-column="49" selection-end-line="2" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="application-prod.yml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1890">
<caret line="136" column="24" lean-forward="false" selection-start-line="136" selection-start-column="24" selection-end-line="136" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="CommonConstant.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="70" column="22" lean-forward="false" selection-start-line="70" selection-start-column="22" selection-end-line="70" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/ant-design-vue-jeecg/src/router/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="vue.config.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/ant-design-vue-jeecg/vue.config.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="37" column="39" lean-forward="false" selection-start-line="37" selection-start-column="39" selection-end-line="37" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>专业认证达成度分析</find> <find>专业认证达成度分析</find>
@ -158,6 +50,14 @@
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="GitSEFilterConfiguration">
<file-type-list>
<filtered-out-file-type name="LOCAL_BRANCH" />
<filtered-out-file-type name="REMOTE_BRANCH" />
<filtered-out-file-type name="TAG" />
<filtered-out-file-type name="COMMIT_BY_MESSAGE" />
</file-type-list>
</component>
<component name="GradleLocalSettings"> <component name="GradleLocalSettings">
<option name="externalProjectsViewState"> <option name="externalProjectsViewState">
<projects_view /> <projects_view />
@ -196,15 +96,6 @@
<detection-done>true</detection-done> <detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting> <sorting>DEFINITION_ORDER</sorting>
</component> </component>
<component name="MavenImportPreferences">
<option name="generalSettings">
<MavenGeneralSettings>
<option name="localRepository" value="E:\Program Files\Maven-dependcies" />
<option name="mavenHome" value="E:/Program Files/Maven" />
<option name="userSettingsFile" value="E:\Program Files\Maven\conf\settings.xml" />
</MavenGeneralSettings>
</option>
</component>
<component name="MavenProjectNavigator"> <component name="MavenProjectNavigator">
<treeState> <treeState>
<expand /> <expand />
@ -218,6 +109,7 @@
<option name="width" value="976" /> <option name="width" value="976" />
<option name="height" value="1056" /> <option name="height" value="1056" />
</component> </component>
<component name="ProjectId" id="2Djr49HErl9f3f7PcX5KlUHSyAm" />
<component name="ProjectView"> <component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1"> <navigator currentView="ProjectPane" proportions="" version="1">
<flattenPackages /> <flattenPackages />
@ -254,36 +146,44 @@
<pane id="PackagesPane" /> <pane id="PackagesPane" />
</panes> </panes>
</component> </component>
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="settings.editor.selected.configurable" value="MavenSettings" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="android.sdk.path" value="E:/AndroidSDK/SDK" />
<property name="dynamic.classpath" value="true" />
<property name="RequestMappingsPanelWidth0" value="75" />
<property name="RequestMappingsPanelOrder0" value="0" /> <property name="RequestMappingsPanelOrder0" value="0" />
<property name="RequestMappingsPanelWidth1" value="75" />
<property name="RequestMappingsPanelOrder1" value="1" /> <property name="RequestMappingsPanelOrder1" value="1" />
<property name="RequestMappingsPanelWidth2" value="75" />
<property name="RequestMappingsPanelOrder2" value="2" /> <property name="RequestMappingsPanelOrder2" value="2" />
<property name="RequestMappingsPanelWidth0" value="75" />
<property name="RequestMappingsPanelWidth1" value="75" />
<property name="RequestMappingsPanelWidth2" value="75" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="android.sdk.path" value="E:/AndroidSDK/SDK" />
<property name="dynamic.classpath" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_package_manager_path" value="yarn" />
<property name="project.structure.last.edited" value="项目" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="settings.editor.selected.configurable" value="MavenSettings" />
<property name="vue.rearranger.settings.migration" value="true" />
</component> </component>
<component name="RebelAgentSelection"> <component name="RebelAgentSelection">
<selection>jr</selection> <selection>jr</selection>
</component> </component>
<component name="RunDashboard"> <component name="RecentsManager">
<option name="ruleStates"> <key name="CopyFile.RECENT_KEYS">
<list> <recent name="D:\QD\CostumingPlatform2\jeecg-boot\jeecg-boot-module-system\src\main\java\org\jeecg\modules" />
<RuleState> <recent name="D:\QD\CostumingPlatform2\ant-design-vue-jeecg\src\views" />
<option name="name" value="ConfigurationTypeDashboardGroupingRule" /> <recent name="D:\QD\CostumingPlatform2\jeecg-boot\jeecg-boot-module-process\src\main\java\org\jeecg\modules\demo" />
</RuleState> <recent name="D:\QD\CostumingPlatform2\ant-design-vue-jeecg\src\views\process\modules" />
<RuleState> <recent name="D:\QD\CostumingPlatform2\ant-design-vue-jeecg\src\views\process" />
<option name="name" value="StatusDashboardGroupingRule" /> </key>
</RuleState> <key name="CopyClassDialog.RECENTS_KEY">
</list> <recent name="org.jeecg.modules.operationtool.controller" />
</option> </key>
</component> </component>
<component name="RunManager" selected="Spring Boot.JeecgSystemApplication"> <component name="RunManager" selected="Spring Boot.JeecgSystemApplication">
<configuration default="true" type="Applet" factoryName="Applet"> <configuration default="true" type="Applet" factoryName="Applet">
@ -293,62 +193,44 @@
<module /> <module />
</configuration> </configuration>
<configuration default="true" type="Application" factoryName="Application"> <configuration default="true" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <method v="2">
<option name="ALTERNATIVE_JRE_PATH" /> <option name="Make" enabled="true" />
<option name="ENABLE_SWING_INSPECTOR" value="false" /> </method>
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="" />
<envs />
</configuration> </configuration>
<configuration default="true" type="JUnit" factoryName="JUnit"> <configuration default="true" type="JUnit" factoryName="JUnit">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" /> <option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" /> <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="ENV_VARIABLES" /> <method v="2">
<option name="PASS_PARENT_ENVS" value="true" /> <option name="Make" enabled="true" />
<option name="TEST_SEARCH_SCOPE"> </method>
<value defaultName="singleModule" />
</option>
<envs />
<patterns />
</configuration>
<configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" value="javadebug" />
<option name="HOST" value="localhost" />
<option name="PORT" value="5005" />
</configuration> </configuration>
<configuration name="JeecgSystemApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> <configuration name="JeecgSystemApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<option name="SPRING_BOOT_MAIN_CLASS" value="org.jeecg.JeecgSystemApplication" />
<module name="jeecg-boot-module-system" /> <module name="jeecg-boot-module-system" />
<envs /> <option name="SPRING_BOOT_MAIN_CLASS" value="org.jeecg.JeecgSystemApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="TestNG">
<option name="TEST_OBJECT" value="CLASS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<properties />
<listeners />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration> </configuration>
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin"> <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType">
<module name="" /> <module name="" />
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" /> <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
<option name="PROGRAM_PARAMETERS" /> <option name="PROGRAM_PARAMETERS" />
<predefined_log_file id="idea.log" enabled="true" /> <predefined_log_file enabled="true" id="idea.log" />
</configuration> <method v="2">
<configuration name="&lt;template&gt;" type="TestNG" default="true" selected="false"> <option name="Make" enabled="true" />
<option name="MAIN_CLASS_NAME" /> </method>
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
</configuration> </configuration>
<configuration name="build" type="js.build_tools.npm" factoryName="npm" temporary="true" nameIsGenerated="true"> <configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/ant-design-vue-jeecg/package.json" /> <package-json value="$PROJECT_DIR$/ant-design-vue-jeecg/package.json" />
<command value="run" /> <command value="run" />
<scripts> <scripts>
@ -356,34 +238,64 @@
</scripts> </scripts>
<node-interpreter value="project" /> <node-interpreter value="project" />
<envs /> <envs />
<method v="2" />
</configuration> </configuration>
<configuration name="serve" type="js.build_tools.npm" factoryName="npm" temporary="true" nameIsGenerated="true"> <configuration name="serve" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/ant-design-vue-jeecg/package.json" /> <package-json value="$PROJECT_DIR$/ant-design-vue-jeecg/package.json" />
<command value="run" /> <command value="run" />
<scripts> <scripts>
<script value="serve" /> <script value="serve" />
</scripts> </scripts>
<node-interpreter value="project" /> <node-interpreter value="project" />
<package-manager value="npm" />
<envs /> <envs />
<method v="2" />
</configuration> </configuration>
<list size="3"> <list>
<item index="0" class="java.lang.String" itemvalue="Spring Boot.JeecgSystemApplication" /> <item itemvalue="npm.serve" />
<item index="1" class="java.lang.String" itemvalue="npm.serve" /> <item itemvalue="npm.build" />
<item index="2" class="java.lang.String" itemvalue="npm.build" /> <item itemvalue="Spring Boot.JeecgSystemApplication" />
</list> </list>
<recent_temporary> <recent_temporary>
<list size="2"> <list>
<item index="0" class="java.lang.String" itemvalue="npm.build" /> <item itemvalue="npm.serve" />
<item index="1" class="java.lang.String" itemvalue="npm.serve" /> <item itemvalue="npm.build" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
<component name="ShelveChangesManager" show_recycled="false"> <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
<option name="remove_strategy" value="false" />
</component>
<component name="SvnConfiguration"> <component name="SvnConfiguration">
<configuration useDefault="false">E:\Program Files\SVN\Subversion</configuration> <configuration useDefault="false">E:\Program Files\SVN\Subversion</configuration>
</component> </component>
<component name="TaskManager">
<task active="true" id="Default" summary="默认任务">
<created>1661223142666</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1661223142666</updated>
<workItem from="1661223144383" duration="4691000" />
<workItem from="1661228808814" duration="242000" />
<workItem from="1662174364751" duration="1497000" />
<workItem from="1662204899818" duration="47000" />
<workItem from="1662362398256" duration="4510000" />
</task>
<task id="LOCAL-00001" summary="20220803">
<created>1661224921154</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1661224921154</updated>
</task>
<task id="LOCAL-00002" summary="20220803-qian">
<created>1661228839121</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1661228839121</updated>
</task>
<option name="localTasksCounter" value="3" />
<servers />
</component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" /> <editor active="true" />
@ -421,19 +333,25 @@
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" /> <option name="version" value="3" />
</component> </component>
<component name="VcsContentAnnotationSettings"> <component name="Vcs.Log.Tabs.Properties">
<option name="myLimit" value="2678400000" /> <option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State />
</value>
</entry>
</map>
</option>
<option name="oldMeFiltersMigrated" value="true" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="20220719" /> <MESSAGE value="20220719" />
<MESSAGE value="20220803" /> <MESSAGE value="20220803" />
<option name="LAST_COMMIT_MESSAGE" value="20220803" /> <MESSAGE value="20220803-qian" />
</component> <option name="LAST_COMMIT_MESSAGE" value="20220803-qian" />
<component name="XDebuggerManager">
<breakpoint-manager />
<watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java"> <entry file="file://$PROJECT_DIR$/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java">

1362
ant-design-vue-jeecg/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

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

@ -169,7 +169,7 @@
{ {
title:'创建人', title:'创建人',
align:"center", align:"center",
dataIndex: 'addPeople' dataIndex: 'createBy'
}, },
{ {
title:'创建时间', title:'创建时间',

40
ant-design-vue-jeecg/src/views/process/ZyProcessList.vue
Unescape View File

@ -189,26 +189,26 @@
align:"center", align:"center",
dataIndex: 'grade' dataIndex: 'grade'
}, },
{ // {
title:'面料代码', // title:'面料代码',
align:"center", // align:"center",
dataIndex: 'fabricNum' // dataIndex: 'fabricNum'
}, // },
{ // {
title:'设备名', // title:'设备名',
align:"center", // align:"center",
dataIndex: 'machineId_dictText' // dataIndex: 'machineId_dictText'
}, // },
// { // {
// title:'部件', // title:'部件',
// align:"center", // align:"center",
// dataIndex: 'componentId_dictText' // dataIndex: 'componentId_dictText'
// }, // },
{ // {
title:'工具名称', // title:'工具名称',
align:"center", // align:"center",
dataIndex: 'toolId_dictText' // dataIndex: 'toolId_dictText'
}, // },
{ {
title:'款式名称', title:'款式名称',
align:"center", align:"center",
@ -219,11 +219,11 @@
align:"center", align:"center",
dataIndex: 'worksectionCode' dataIndex: 'worksectionCode'
}, },
{ // {
title:'合同号', // title:'合同号',
align:"center", // align:"center",
dataIndex: 'contractNum' // dataIndex: 'contractNum'
}, // },
{ {
title:'合计（手工TMU）', title:'合计（手工TMU）',
align:"center", align:"center",

6
ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue
Unescape View File

@ -95,8 +95,8 @@
}, },
edit (record) { edit (record) {
this.model = Object.assign({}, record); this.model = Object.assign({}, record);
let usercode = store.getters.userInfo.realname // let usercode = store.getters.userInfo.realname
this.model.addPeople=usercode // this.model.addPeople=usercode
this.visible = true; this.visible = true;
}, },
submitForm () { submitForm () {
@ -108,9 +108,11 @@
let httpurl = ''; let httpurl = '';
let method = ''; let method = '';
if(!this.model.id){ if(!this.model.id){
this.model.createBy=store.getters.userInfo.realname
httpurl+=this.url.add; httpurl+=this.url.add;
method = 'post'; method = 'post';
}else{ }else{
this.model.updateBy=store.getters.userInfo.realname
httpurl+=this.url.edit; httpurl+=this.url.edit;
method = 'put'; method = 'put';
} }

73
ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue
Unescape View File

@ -43,26 +43,26 @@
<a-input v-model="model.grade" placeholder="请输入工序等级" ></a-input> <a-input v-model="model.grade" placeholder="请输入工序等级" ></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <!-- <a-col :span="24">-->
<a-form-model-item label="面料代码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fabricNum"> <!-- <a-form-model-item label="面料代码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fabricNum">-->
<a-input v-model="model.fabricNum" placeholder="请输入面料代码" ></a-input> <!-- <a-input v-model="model.fabricNum" placeholder="请输入面料代码" ></a-input>-->
</a-form-model-item> <!-- </a-form-model-item>-->
</a-col> <!-- </a-col>-->
<a-col :span="24"> <!-- <a-col :span="24">-->
<a-form-model-item label="面料等级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fabricGrade"> <!-- <a-form-model-item label="面料等级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fabricGrade">-->
<a-input v-model="model.fabricGrade" placeholder="请输入面料等级" ></a-input> <!-- <a-input v-model="model.fabricGrade" placeholder="请输入面料等级" ></a-input>-->
</a-form-model-item> <!-- </a-form-model-item>-->
</a-col> <!-- </a-col>-->
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="针距（针/厘米）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="needlePitch"> <a-form-model-item label="针距（针/厘米）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="needlePitch">
<a-input-number v-model="model.needlePitch" placeholder="请输入针距（针/厘米）" style="width: 100%" /> <a-input-number v-model="model.needlePitch" placeholder="请输入针距（针/厘米）" style="width: 100%" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <!-- <a-col :span="24">-->
<a-form-model-item label="机器名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="machineId"> <!-- <a-form-model-item label="机器名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="machineId">-->
<j-dict-select-tag type="list" v-model="model.machineId" dictCode="zy_devicetype,name,id" placeholder="请选择机器名" /> <!-- <j-dict-select-tag type="list" v-model="model.machineId" dictCode="zy_devicetype,name,id" placeholder="请选择机器名" />-->
</a-form-model-item> <!-- </a-form-model-item>-->
</a-col> <!-- </a-col>-->
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="手工宽放" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="manualWide"> <a-form-model-item label="手工宽放" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="manualWide">
<a-input v-model="model.manualWide" placeholder="请输入手工宽放" ></a-input> <a-input v-model="model.manualWide" placeholder="请输入手工宽放" ></a-input>
@ -103,26 +103,26 @@
<a-input v-model="model.bundleTime" placeholder="请输入绑包时间" ></a-input> <a-input v-model="model.bundleTime" placeholder="请输入绑包时间" ></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <!-- <a-col :span="24">-->
<a-form-model-item label="部件" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="componentId"> <!-- <a-form-model-item label="部件" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="componentId">-->
<j-dict-select-tag type="list" v-model="model.componentId" dictCode="zy_cloths_component,parts_name,id" placeholder="请选择部件表" /> <!-- <j-dict-select-tag type="list" v-model="model.componentId" dictCode="zy_cloths_component,parts_name,id" placeholder="请选择部件表" />-->
</a-form-model-item> <!-- </a-form-model-item>-->
</a-col> <!-- </a-col>-->
<a-col :span="24"> <!-- <a-col :span="24">-->
<a-form-model-item label="是否为瓶颈工序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isBottleneck"> <!-- <a-form-model-item label="是否为瓶颈工序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isBottleneck">-->
<a-input-number v-model="model.isBottleneck" placeholder="请输入是否为瓶颈工序" style="width: 100%" /> <!-- <a-input-number v-model="model.isBottleneck" placeholder="请输入是否为瓶颈工序" style="width: 100%" />-->
</a-form-model-item> <!-- </a-form-model-item>-->
</a-col> <!-- </a-col>-->
<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">
<a-input v-model="model.enterpriseId" placeholder="请输入企业名称" ></a-input> <a-input v-model="model.enterpriseId" placeholder="请输入企业名称" ></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <!-- <a-col :span="24">-->
<a-form-model-item label="工具名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolId"> <!-- <a-form-model-item label="工具名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolId">-->
<j-dict-select-tag type="list" v-model="model.toolId" dictCode="zy_tool,name,id" placeholder="请选择工具名称" /> <!-- <j-dict-select-tag type="list" v-model="model.toolId" dictCode="zy_tool,name,id" placeholder="请选择工具名称" />-->
</a-form-model-item> <!-- </a-form-model-item>-->
</a-col> <!-- </a-col>-->
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="款式名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleId"> <a-form-model-item label="款式名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleId">
<a-input v-model="model.styleId" placeholder="请输入款式名称" ></a-input> <a-input v-model="model.styleId" placeholder="请输入款式名称" ></a-input>
@ -134,10 +134,15 @@
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="合同号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="contractNum"> <a-form-model-item label="工序类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processType">
<a-input v-model="model.contractNum" placeholder="请输入合同号" ></a-input> <j-dict-select-tag type="radio" v-model="model.processType" dictCode="processType" placeholder="" />
</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="contractNum">-->
<!-- <a-input v-model="model.contractNum" placeholder="请输入合同号" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="合计（手工TMU）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="totalManualTmu"> <a-form-model-item label="合计（手工TMU）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="totalManualTmu">
<a-input-number v-model="model.totalManualTmu" placeholder="请输入合计（手工TMU）" style="width: 100%" /> <a-input-number v-model="model.totalManualTmu" placeholder="请输入合计（手工TMU）" style="width: 100%" />
@ -178,6 +183,7 @@
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: 'ZyProcessForm', name: 'ZyProcessForm',
@ -194,6 +200,7 @@
data () { data () {
return { return {
model:{ model:{
processType:0,
}, },
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
@ -243,9 +250,11 @@
let httpurl = ''; let httpurl = '';
let method = ''; let method = '';
if(!this.model.id){ if(!this.model.id){
this.model.createBy=store.getters.userInfo.realname
httpurl+=this.url.add; httpurl+=this.url.add;
method = 'post'; method = 'post';
}else{ }else{
this.model.updateBy=store.getters.userInfo.realname
httpurl+=this.url.edit; httpurl+=this.url.edit;
method = 'put'; method = 'put';
} }

89
ant-design-vue-jeecg/yarn.lock
Unescape View File

@ -34,7 +34,7 @@
"@ant-design/colors" "^3.1.0" "@ant-design/colors" "^3.1.0"
"babel-runtime" "^6.26.0" "babel-runtime" "^6.26.0"
"@ant-design/icons@^2.0.0", "@ant-design/icons@^2.1.1": "@ant-design/icons@^2.1.1":
"integrity" "sha512-jCH+k2Vjlno4YWl6g535nHR09PwCEmTBKAG6VqF+rhkrSPRLfgpU2maagwbZPLjaHuU5Jd1DFQ2KJpQuI6uG8w==" "integrity" "sha512-jCH+k2Vjlno4YWl6g535nHR09PwCEmTBKAG6VqF+rhkrSPRLfgpU2maagwbZPLjaHuU5Jd1DFQ2KJpQuI6uG8w=="
"resolved" "https://registry.npmmirror.com/@ant-design/icons/-/icons-2.1.1.tgz" "resolved" "https://registry.npmmirror.com/@ant-design/icons/-/icons-2.1.1.tgz"
"version" "2.1.1" "version" "2.1.1"
@ -126,7 +126,7 @@
"resolved" "https://registry.npmmirror.com/@antv/g2-plugin-slider/-/g2-plugin-slider-2.1.1.tgz" "resolved" "https://registry.npmmirror.com/@antv/g2-plugin-slider/-/g2-plugin-slider-2.1.1.tgz"
"version" "2.1.1" "version" "2.1.1"
"@antv/g2@>=3.2.8", "@antv/g2@~3.5.3": "@antv/g2@~3.5.3":
"integrity" "sha512-OWWDJof1ghfsxDYO20TxVF9TUhDsyOE/yzbSdSu+N9Ft1zQxKJQlgG43/FO+rOsdC/k1dXoYOBRPQ7kk5EBaJA==" "integrity" "sha512-OWWDJof1ghfsxDYO20TxVF9TUhDsyOE/yzbSdSu+N9Ft1zQxKJQlgG43/FO+rOsdC/k1dXoYOBRPQ7kk5EBaJA=="
"resolved" "https://registry.npmmirror.com/@antv/g2/-/g2-3.5.19.tgz" "resolved" "https://registry.npmmirror.com/@antv/g2/-/g2-3.5.19.tgz"
"version" "3.5.19" "version" "3.5.19"
@ -189,7 +189,7 @@
"resolved" "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.18.5.tgz" "resolved" "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.18.5.tgz"
"version" "7.18.5" "version" "7.18.5"
"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.4.0-0": "@babel/core@^7.0.0":
"integrity" "sha512-MGY8vg3DxMnctw0LdvSEojOsumc70g0t18gNyUdAZqB1Rpd1Bqo/svHGvt+UJ6JcGX+DIekGFDxxIWofBxLCnQ==" "integrity" "sha512-MGY8vg3DxMnctw0LdvSEojOsumc70g0t18gNyUdAZqB1Rpd1Bqo/svHGvt+UJ6JcGX+DIekGFDxxIWofBxLCnQ=="
"resolved" "https://registry.npmmirror.com/@babel/core/-/core-7.18.5.tgz" "resolved" "https://registry.npmmirror.com/@babel/core/-/core-7.18.5.tgz"
"version" "7.18.5" "version" "7.18.5"
@ -1497,7 +1497,7 @@
"resolved" "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-5.0.8.tgz" "resolved" "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-5.0.8.tgz"
"version" "5.0.8" "version" "5.0.8"
"@vue/cli-service@^3.0.0 || ^4.0.0 || ^5.0.0-0", "@vue/cli-service@^5.0.8": "@vue/cli-service@^5.0.8":
"integrity" "sha512-nV7tYQLe7YsTtzFrfOMIHc5N2hp5lHG2rpYr0aNja9rNljdgcPZLyQRb2YRivTHqTv7lI962UXFURcpStHgyFw==" "integrity" "sha512-nV7tYQLe7YsTtzFrfOMIHc5N2hp5lHG2rpYr0aNja9rNljdgcPZLyQRb2YRivTHqTv7lI962UXFURcpStHgyFw=="
"resolved" "https://registry.npmjs.org/@vue/cli-service/-/cli-service-5.0.8.tgz" "resolved" "https://registry.npmjs.org/@vue/cli-service/-/cli-service-5.0.8.tgz"
"version" "5.0.8" "version" "5.0.8"
@ -1941,7 +1941,7 @@
"resolved" "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz" "resolved" "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz"
"version" "8.2.0" "version" "8.2.0"
"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", "acorn@^6.0.2", "acorn@^6.0.7", "acorn@^6.4.1": "acorn@^6.0.2", "acorn@^6.0.7", "acorn@^6.4.1":
"integrity" "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==" "integrity" "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="
"resolved" "https://registry.npmmirror.com/acorn/-/acorn-6.4.2.tgz" "resolved" "https://registry.npmmirror.com/acorn/-/acorn-6.4.2.tgz"
"version" "6.4.2" "version" "6.4.2"
@ -1951,7 +1951,7 @@
"resolved" "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz" "resolved" "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz"
"version" "8.8.0" "version" "8.8.0"
"acorn@^8", "acorn@^8.0.5", "acorn@^8.5.0", "acorn@^8.7.1": "acorn@^8.0.5", "acorn@^8.5.0", "acorn@^8.7.1":
"integrity" "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==" "integrity" "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="
"resolved" "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz" "resolved" "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz"
"version" "8.8.0" "version" "8.8.0"
@ -2002,7 +2002,7 @@
"fast-json-stable-stringify" "^2.0.0" "fast-json-stable-stringify" "^2.0.0"
"json-schema-traverse" "^0.3.0" "json-schema-traverse" "^0.3.0"
"ajv@^6.1.0", "ajv@^6.10.2", "ajv@^6.12.3", "ajv@^6.12.4", "ajv@^6.12.5", "ajv@^6.9.1", "ajv@>=5.0.0": "ajv@^6.1.0", "ajv@^6.10.2", "ajv@^6.12.3", "ajv@^6.12.4", "ajv@^6.12.5", "ajv@^6.9.1":
"integrity" "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==" "integrity" "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="
"resolved" "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz" "resolved" "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
"version" "6.12.6" "version" "6.12.6"
@ -2022,7 +2022,7 @@
"require-from-string" "^2.0.2" "require-from-string" "^2.0.2"
"uri-js" "^4.2.2" "uri-js" "^4.2.2"
"ajv@^8.8.0", "ajv@^8.8.2": "ajv@^8.8.0":
"integrity" "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==" "integrity" "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="
"resolved" "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz" "resolved" "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz"
"version" "8.11.0" "version" "8.11.0"
@ -2107,7 +2107,7 @@
dependencies: dependencies:
"color-convert" "^2.0.1" "color-convert" "^2.0.1"
"ant-design-vue@^1.7.2", "ant-design-vue@>=1.0.0": "ant-design-vue@^1.7.2":
"integrity" "sha512-F1hmiS9vwbyfuFvlamdW5l9bHKqRlj9wHaGDIE41NZMWXyWy8qL0UFa/+I0Wl8gQWZCqODW5pN6Yfoyn85At3A==" "integrity" "sha512-F1hmiS9vwbyfuFvlamdW5l9bHKqRlj9wHaGDIE41NZMWXyWy8qL0UFa/+I0Wl8gQWZCqODW5pN6Yfoyn85At3A=="
"resolved" "https://registry.npmmirror.com/ant-design-vue/-/ant-design-vue-1.7.8.tgz" "resolved" "https://registry.npmmirror.com/ant-design-vue/-/ant-design-vue-1.7.8.tgz"
"version" "1.7.8" "version" "1.7.8"
@ -2174,7 +2174,7 @@
"resolved" "https://registry.npmmirror.com/arch/-/arch-2.2.0.tgz" "resolved" "https://registry.npmmirror.com/arch/-/arch-2.2.0.tgz"
"version" "2.2.0" "version" "2.2.0"
"area-data@^5.0.6", "area-data@>=5.0.6": "area-data@^5.0.6":
"integrity" "sha512-QxLoA+823xXKyhw5S3750I9TToki0OS42HU9ol3rCOsCXfkjtl8RtQ/eoj0cK0Levn4//oEM05FmMumfw/HIlg==" "integrity" "sha512-QxLoA+823xXKyhw5S3750I9TToki0OS42HU9ol3rCOsCXfkjtl8RtQ/eoj0cK0Levn4//oEM05FmMumfw/HIlg=="
"resolved" "https://registry.npmmirror.com/area-data/-/area-data-5.0.6.tgz" "resolved" "https://registry.npmmirror.com/area-data/-/area-data-5.0.6.tgz"
"version" "5.0.6" "version" "5.0.6"
@ -2749,7 +2749,7 @@
"caniuse-db" "^1.0.30000639" "caniuse-db" "^1.0.30000639"
"electron-to-chromium" "^1.2.7" "electron-to-chromium" "^1.2.7"
"browserslist@^4.0.0", "browserslist@^4.14.5", "browserslist@^4.16.3", "browserslist@^4.16.6", "browserslist@^4.20.2", "browserslist@^4.20.3", "browserslist@^4.20.4", "browserslist@^4.21.3", "browserslist@^4.3.4", "browserslist@>= 4.21.0": "browserslist@^4.0.0", "browserslist@^4.14.5", "browserslist@^4.16.3", "browserslist@^4.16.6", "browserslist@^4.20.2", "browserslist@^4.20.3", "browserslist@^4.20.4", "browserslist@^4.21.3", "browserslist@^4.3.4":
"integrity" "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==" "integrity" "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ=="
"resolved" "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz" "resolved" "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz"
"version" "4.21.3" "version" "4.21.3"
@ -3582,24 +3582,6 @@
"resolved" "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.0.tgz" "resolved" "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.0.tgz"
"version" "6.3.0" "version" "6.3.0"
"css-loader@*":
"integrity" "sha512-+ZHAZm/yqvJ2kDtPne3uX0C+Vr3Zn5jFn2N4HywtS5ujwvsVkyg0VArEXpl3BgczDA8anieki1FIzhchX4yrDw=="
"resolved" "https://registry.npmmirror.com/css-loader/-/css-loader-1.0.1.tgz"
"version" "1.0.1"
dependencies:
"babel-code-frame" "^6.26.0"
"css-selector-tokenizer" "^0.7.0"
"icss-utils" "^2.1.0"
"loader-utils" "^1.0.2"
"lodash" "^4.17.11"
"postcss" "^6.0.23"
"postcss-modules-extract-imports" "^1.2.0"
"postcss-modules-local-by-default" "^1.2.0"
"postcss-modules-scope" "^1.1.0"
"postcss-modules-values" "^1.3.0"
"postcss-value-parser" "^3.3.0"
"source-list-map" "^2.0.0"
"css-loader@^0.28.7": "css-loader@^0.28.7":
"integrity" "sha512-wovHgjAx8ZIMGSL8pTys7edA1ClmzxHeY6n/d97gg5odgsxEgKjULPR0viqyC+FWMCL9sfqoC/QCUBo62tLvPg==" "integrity" "sha512-wovHgjAx8ZIMGSL8pTys7edA1ClmzxHeY6n/d97gg5odgsxEgKjULPR0viqyC+FWMCL9sfqoC/QCUBo62tLvPg=="
"resolved" "https://registry.npmjs.org/css-loader/-/css-loader-0.28.11.tgz" "resolved" "https://registry.npmjs.org/css-loader/-/css-loader-0.28.11.tgz"
@ -4537,7 +4519,7 @@
"eslint-utils" "^1.4.2" "eslint-utils" "^1.4.2"
"regexpp" "^2.0.1" "regexpp" "^2.0.1"
"eslint-plugin-import@^2.14.0", "eslint-plugin-import@>=2.13.0": "eslint-plugin-import@^2.14.0":
"integrity" "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==" "integrity" "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA=="
"resolved" "https://registry.npmmirror.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz" "resolved" "https://registry.npmmirror.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz"
"version" "2.26.0" "version" "2.26.0"
@ -4556,7 +4538,7 @@
"resolve" "^1.22.0" "resolve" "^1.22.0"
"tsconfig-paths" "^3.14.1" "tsconfig-paths" "^3.14.1"
"eslint-plugin-node@^8.0.0", "eslint-plugin-node@>=7.0.0": "eslint-plugin-node@^8.0.0":
"integrity" "sha512-ZjOjbjEi6jd82rIpFSgagv4CHWzG9xsQAVp1ZPlhRnnYxcTgENUVBvhYmkQ7GvT1QFijUSo69RaiOJKhMu6i8w==" "integrity" "sha512-ZjOjbjEi6jd82rIpFSgagv4CHWzG9xsQAVp1ZPlhRnnYxcTgENUVBvhYmkQ7GvT1QFijUSo69RaiOJKhMu6i8w=="
"resolved" "https://registry.npmmirror.com/eslint-plugin-node/-/eslint-plugin-node-8.0.1.tgz" "resolved" "https://registry.npmmirror.com/eslint-plugin-node/-/eslint-plugin-node-8.0.1.tgz"
"version" "8.0.1" "version" "8.0.1"
@ -4568,12 +4550,12 @@
"resolve" "^1.8.1" "resolve" "^1.8.1"
"semver" "^5.5.0" "semver" "^5.5.0"
"eslint-plugin-promise@^4.0.1", "eslint-plugin-promise@>=4.0.0": "eslint-plugin-promise@^4.0.1":
"integrity" "sha512-bY2sGqyptzFBDLh/GMbAxfdJC+b0f23ME63FOE4+Jao0oZ3E1LEwFtWJX/1pGMJLiTtrSSern2CRM/g+dfc0eQ==" "integrity" "sha512-bY2sGqyptzFBDLh/GMbAxfdJC+b0f23ME63FOE4+Jao0oZ3E1LEwFtWJX/1pGMJLiTtrSSern2CRM/g+dfc0eQ=="
"resolved" "https://registry.npmmirror.com/eslint-plugin-promise/-/eslint-plugin-promise-4.3.1.tgz" "resolved" "https://registry.npmmirror.com/eslint-plugin-promise/-/eslint-plugin-promise-4.3.1.tgz"
"version" "4.3.1" "version" "4.3.1"
"eslint-plugin-standard@^4.0.0", "eslint-plugin-standard@>=4.0.0": "eslint-plugin-standard@^4.0.0":
"integrity" "sha512-ZL7+QRixjTR6/528YNGyDotyffm5OQst/sGxKDwGb9Uqs4In5Egi4+jbobhqJoyoCM6/7v/1A5fhQ7ScMtDjaQ==" "integrity" "sha512-ZL7+QRixjTR6/528YNGyDotyffm5OQst/sGxKDwGb9Uqs4In5Egi4+jbobhqJoyoCM6/7v/1A5fhQ7ScMtDjaQ=="
"resolved" "https://registry.npmmirror.com/eslint-plugin-standard/-/eslint-plugin-standard-4.1.0.tgz" "resolved" "https://registry.npmmirror.com/eslint-plugin-standard/-/eslint-plugin-standard-4.1.0.tgz"
"version" "4.1.0" "version" "4.1.0"
@ -4624,7 +4606,7 @@
"normalize-path" "^3.0.0" "normalize-path" "^3.0.0"
"schema-utils" "^4.0.0" "schema-utils" "^4.0.0"
"eslint@^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8", "eslint@^5.0.0", "eslint@^5.16.0", "eslint@^7.0.0 || ^8.0.0", "eslint@>=4.19.1", "eslint@>=5.0.0", "eslint@>=7.5.0": "eslint@^5.16.0":
"integrity" "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==" "integrity" "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg=="
"resolved" "https://registry.npmmirror.com/eslint/-/eslint-5.16.0.tgz" "resolved" "https://registry.npmmirror.com/eslint/-/eslint-5.16.0.tgz"
"version" "5.16.0" "version" "5.16.0"
@ -6473,7 +6455,7 @@
"loader-utils" "^1.1.0" "loader-utils" "^1.1.0"
"pify" "^3.0.0" "pify" "^3.0.0"
"less@^2.3.1 || ^3.0.0", "less@^3.9.0": "less@^3.9.0":
"integrity" "sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==" "integrity" "sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw=="
"resolved" "https://registry.npmmirror.com/less/-/less-3.13.1.tgz" "resolved" "https://registry.npmmirror.com/less/-/less-3.13.1.tgz"
"version" "3.13.1" "version" "3.13.1"
@ -8439,16 +8421,15 @@
"source-map" "^0.6.1" "source-map" "^0.6.1"
"supports-color" "^5.4.0" "supports-color" "^5.4.0"
"postcss@^6.0.23": "postcss@^7.0.36":
"integrity" "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==" "integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
"resolved" "https://registry.npmmirror.com/postcss/-/postcss-6.0.23.tgz" "resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
"version" "6.0.23" "version" "7.0.39"
dependencies: dependencies:
"chalk" "^2.4.1" "picocolors" "^0.2.1"
"source-map" "^0.6.1" "source-map" "^0.6.1"
"supports-color" "^5.4.0"
"postcss@^7.0.0 || ^8.0.1", "postcss@^8.0.9", "postcss@^8.1.0", "postcss@^8.2.15", "postcss@^8.2.2", "postcss@^8.2.6", "postcss@^8.3.5", "postcss@^8.4.7": "postcss@^8.2.6", "postcss@^8.3.5", "postcss@^8.4.7":
"integrity" "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==" "integrity" "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ=="
"resolved" "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz" "resolved" "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz"
"version" "8.4.16" "version" "8.4.16"
@ -8457,14 +8438,6 @@
"picocolors" "^1.0.0" "picocolors" "^1.0.0"
"source-map-js" "^1.0.2" "source-map-js" "^1.0.2"
"postcss@^7.0.36":
"integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
"resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
"version" "7.0.39"
dependencies:
"picocolors" "^0.2.1"
"source-map" "^0.6.1"
"prelude-ls@~1.1.2": "prelude-ls@~1.1.2":
"integrity" "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==" "integrity" "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="
"resolved" "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.1.2.tgz" "resolved" "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.1.2.tgz"
@ -8913,7 +8886,7 @@
"stealthy-require" "^1.1.1" "stealthy-require" "^1.1.1"
"tough-cookie" "^2.3.3" "tough-cookie" "^2.3.3"
"request@^2.34", "request@^2.87.0": "request@^2.87.0":
"integrity" "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==" "integrity" "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="
"resolved" "https://registry.npmmirror.com/request/-/request-2.88.2.tgz" "resolved" "https://registry.npmmirror.com/request/-/request-2.88.2.tgz"
"version" "2.88.2" "version" "2.88.2"
@ -10610,7 +10583,7 @@
"hash-sum" "^1.0.2" "hash-sum" "^1.0.2"
"loader-utils" "^1.0.2" "loader-utils" "^1.0.2"
"vue-template-compiler@^2.0.0", "vue-template-compiler@^2.6.0", "vue-template-compiler@^2.6.10", "vue-template-compiler@>=2.5.0": "vue-template-compiler@^2.6.10":
"integrity" "sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g==" "integrity" "sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g=="
"resolved" "https://registry.npmmirror.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz" "resolved" "https://registry.npmmirror.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz"
"version" "2.6.14" "version" "2.6.14"
@ -10623,7 +10596,7 @@
"resolved" "https://registry.npmmirror.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz" "resolved" "https://registry.npmmirror.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz"
"version" "1.9.1" "version" "1.9.1"
"vue@^2.0.0", "vue@^2.4.4", "vue@^2.5.11", "vue@^2.5.17", "vue@^2.5.3", "vue@^2.6.0", "vue@^2.6.10", "vue@^2.6.11", "vue@>= 2.6.0 < 3", "vue@>=2.2.0", "vue@>=2.5.0": "vue@^2.4.4", "vue@^2.5.11", "vue@^2.5.17", "vue@^2.5.3", "vue@^2.6.10", "vue@^2.6.11":
"integrity" "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==" "integrity" "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="
"resolved" "https://registry.npmmirror.com/vue/-/vue-2.6.14.tgz" "resolved" "https://registry.npmmirror.com/vue/-/vue-2.6.14.tgz"
"version" "2.6.14" "version" "2.6.14"
@ -10645,7 +10618,7 @@
"resolved" "https://registry.npmmirror.com/vxe-table-plugin-antd/-/vxe-table-plugin-antd-1.8.10.tgz" "resolved" "https://registry.npmmirror.com/vxe-table-plugin-antd/-/vxe-table-plugin-antd-1.8.10.tgz"
"version" "1.8.10" "version" "1.8.10"
"vxe-table@>=1.15.27", "vxe-table@2.9.13": "vxe-table@2.9.13":
"integrity" "sha512-MOaJLLJtdgVbiZX8netLqG8+daB7IbjBM9+5Ppt+seyjBrNV2C4dd8JkGpGX5zPThSzkYPGz66vo404Yu5Q/EA==" "integrity" "sha512-MOaJLLJtdgVbiZX8netLqG8+daB7IbjBM9+5Ppt+seyjBrNV2C4dd8JkGpGX5zPThSzkYPGz66vo404Yu5Q/EA=="
"resolved" "https://registry.npmmirror.com/vxe-table/-/vxe-table-2.9.13.tgz" "resolved" "https://registry.npmmirror.com/vxe-table/-/vxe-table-2.9.13.tgz"
"version" "2.9.13" "version" "2.9.13"
@ -10779,7 +10752,7 @@
"clone-deep" "^4.0.1" "clone-deep" "^4.0.1"
"wildcard" "^2.0.0" "wildcard" "^2.0.0"
"webpack-sources@*", "webpack-sources@^1.4.0", "webpack-sources@^1.4.1": "webpack-sources@^1.4.0", "webpack-sources@^1.4.1":
"integrity" "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==" "integrity" "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="
"resolved" "https://registry.npmmirror.com/webpack-sources/-/webpack-sources-1.4.3.tgz" "resolved" "https://registry.npmmirror.com/webpack-sources/-/webpack-sources-1.4.3.tgz"
"version" "1.4.3" "version" "1.4.3"
@ -10797,7 +10770,7 @@
"resolved" "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.4.4.tgz" "resolved" "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.4.4.tgz"
"version" "0.4.4" "version" "0.4.4"
"webpack@^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0", "webpack@^3.0.0 || ^4.1.0 || ^5.0.0-0", "webpack@^4.0.0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.27.0 || ^5.0.0", "webpack@^4.37.0 || ^5.0.0", "webpack@^5.1.0", "webpack@>=2": "webpack@^4.0.0":
"integrity" "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==" "integrity" "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q=="
"resolved" "https://registry.npmmirror.com/webpack/-/webpack-4.46.0.tgz" "resolved" "https://registry.npmmirror.com/webpack/-/webpack-4.46.0.tgz"
"version" "4.46.0" "version" "4.46.0"
@ -10826,7 +10799,7 @@
"watchpack" "^1.7.4" "watchpack" "^1.7.4"
"webpack-sources" "^1.4.1" "webpack-sources" "^1.4.1"
"webpack@^4.1.0 || ^5.0.0-0", "webpack@^5.0.0", "webpack@^5.20.0", "webpack@^5.54.0": "webpack@^5.54.0":
"integrity" "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==" "integrity" "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA=="
"resolved" "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz" "resolved" "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz"
"version" "5.74.0" "version" "5.74.0"
@ -10989,7 +10962,7 @@
"resolved" "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz" "resolved" "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz"
"version" "8.8.1" "version" "8.8.1"
"xe-utils@>= 2.4.0 < 3", "xe-utils@2.4.8": "xe-utils@2.4.8":
"integrity" "sha512-/95ZaQK9GJE/EYrpMv9lgKdkEMQwWv4a4TF4dddi4gSzZ33vp/rZvzJNNV9XknaOkMizK9IBSX8CB/nL+SAk0Q==" "integrity" "sha512-/95ZaQK9GJE/EYrpMv9lgKdkEMQwWv4a4TF4dddi4gSzZ33vp/rZvzJNNV9XknaOkMizK9IBSX8CB/nL+SAk0Q=="
"resolved" "https://registry.npmmirror.com/xe-utils/-/xe-utils-2.4.8.tgz" "resolved" "https://registry.npmmirror.com/xe-utils/-/xe-utils-2.4.8.tgz"
"version" "2.4.8" "version" "2.4.8"

12
jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothAction.java
Unescape View File

@ -36,9 +36,9 @@ public class ZyClothAction implements Serializable {
@ApiModelProperty(value = "动作表") @ApiModelProperty(value = "动作表")
private java.lang.String id; private java.lang.String id;
/**添加人*/ /**添加人*/
@Excel(name = "添加人", width = 15) // @Excel(name = "添加人", width = 15)
@ApiModelProperty(value = "添加人") // @ApiModelProperty(value = "添加人")
private java.lang.String addPeople; // private java.lang.String addPeople;
/**添加时间*/ /**添加时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd")
@ -69,4 +69,10 @@ public class ZyClothAction implements Serializable {
@Excel(name = "编号", width = 15) @Excel(name = "编号", width = 15)
@ApiModelProperty(value = "编号") @ApiModelProperty(value = "编号")
private java.lang.String nums; private java.lang.String nums;
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
} }

61
jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java
Unescape View File

@ -71,23 +71,23 @@ public class ZyProcess implements Serializable {
@Excel(name = "工序等级", width = 15) @Excel(name = "工序等级", width = 15)
@ApiModelProperty(value = "工序等级") @ApiModelProperty(value = "工序等级")
private java.lang.String grade; private java.lang.String grade;
/**面料代码*/ // /**面料代码*/
@Excel(name = "面料代码", width = 15) // @Excel(name = "面料代码", width = 15)
@ApiModelProperty(value = "面料代码") // @ApiModelProperty(value = "面料代码")
private java.lang.String fabricNum; // private java.lang.String fabricNum;
/**面料等级*/ // /**面料等级*/
@Excel(name = "面料等级", width = 15) // @Excel(name = "面料等级", width = 15)
@ApiModelProperty(value = "面料等级") // @ApiModelProperty(value = "面料等级")
private java.lang.String fabricGrade; // private java.lang.String fabricGrade;
/**针距（针/厘米）*/ /**针距（针/厘米）*/
@Excel(name = "针距（针/厘米）", width = 15) @Excel(name = "针距（针/厘米）", width = 15)
@ApiModelProperty(value = "针距（针/厘米）") @ApiModelProperty(value = "针距（针/厘米）")
private java.lang.Integer needlePitch; private java.lang.Integer needlePitch;
/**机器名*/ // /**机器名*/
@Excel(name = "机器名", width = 15, dictTable = "zy_devicetype", dicText = "name", dicCode = "id") // @Excel(name = "机器名", width = 15, dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
@Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id") // @Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "机器名") // @ApiModelProperty(value = "机器名")
private java.lang.String machineId; // private java.lang.String machineId;
/**手工宽放*/ /**手工宽放*/
@Excel(name = "手工宽放", width = 15) @Excel(name = "手工宽放", width = 15)
@ApiModelProperty(value = "手工宽放") @ApiModelProperty(value = "手工宽放")
@ -120,24 +120,24 @@ public class ZyProcess implements Serializable {
@Excel(name = "绑包时间", width = 15) @Excel(name = "绑包时间", width = 15)
@ApiModelProperty(value = "绑包时间") @ApiModelProperty(value = "绑包时间")
private java.lang.String bundleTime; private java.lang.String bundleTime;
/**部件表*/ // /**部件表*/
@Excel(name = "部件表", width = 15, dictTable = "zy_cloths_component", dicText = "parts_name", dicCode = "id") // @Excel(name = "部件表", width = 15, dictTable = "zy_cloths_component", dicText = "parts_name", dicCode = "id")
@Dict(dictTable = "zy_cloths_component", dicText = "parts_name", dicCode = "id") // @Dict(dictTable = "zy_cloths_component", dicText = "parts_name", dicCode = "id")
@ApiModelProperty(value = "部件表") // @ApiModelProperty(value = "部件表")
private java.lang.String componentId; // private java.lang.String componentId;
/**是否为瓶颈工序*/ // /**是否为瓶颈工序*/
@Excel(name = "是否为瓶颈工序", width = 15) // @Excel(name = "是否为瓶颈工序", width = 15)
@ApiModelProperty(value = "是否为瓶颈工序") // @ApiModelProperty(value = "是否为瓶颈工序")
private java.lang.Integer isBottleneck; // private java.lang.Integer isBottleneck;
/**企业名称*/ /**企业名称*/
@Excel(name = "企业名称", width = 15) @Excel(name = "企业名称", width = 15)
@ApiModelProperty(value = "企业名称") @ApiModelProperty(value = "企业名称")
private java.lang.String enterpriseId; private java.lang.String enterpriseId;
/**工具名称*/ /**工具名称*/
@Excel(name = "工具名称", width = 15, dictTable = "zy_tool", dicText = "name", dicCode = "id") // @Excel(name = "工具名称", width = 15, dictTable = "zy_tool", dicText = "name", dicCode = "id")
@Dict(dictTable = "zy_tool", dicText = "name", dicCode = "id") // @Dict(dictTable = "zy_tool", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "工具名称") // @ApiModelProperty(value = "工具名称")
private java.lang.String toolId; // private java.lang.String toolId;
/**款式名称*/ /**款式名称*/
@Excel(name = "款式名称", width = 15) @Excel(name = "款式名称", width = 15)
@ApiModelProperty(value = "款式名称") @ApiModelProperty(value = "款式名称")
@ -147,9 +147,9 @@ public class ZyProcess implements Serializable {
@ApiModelProperty(value = "工段代码") @ApiModelProperty(value = "工段代码")
private java.lang.String worksectionCode; private java.lang.String worksectionCode;
/**合同号*/ /**合同号*/
@Excel(name = "合同号", width = 15) // @Excel(name = "合同号", width = 15)
@ApiModelProperty(value = "合同号") // @ApiModelProperty(value = "合同号")
private java.lang.String contractNum; // private java.lang.String contractNum;
/**合计（手工TMU）*/ /**合计（手工TMU）*/
@Excel(name = "合计（手工TMU）", width = 15) @Excel(name = "合计（手工TMU）", width = 15)
@ApiModelProperty(value = "合计（手工TMU）") @ApiModelProperty(value = "合计（手工TMU）")
@ -193,4 +193,7 @@ public class ZyProcess implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期") @ApiModelProperty(value = "更新日期")
private java.util.Date updateTime; private java.util.Date updateTime;
@Excel(name = "工序类型", width = 15)
@ApiModelProperty(value = "工序类型")
private int processType;
} }

Write Preview
Loading…
Cancel
Save