Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

changelog.md

@@ -1,3 +1,10 @@
+## 3.1.2026072314
+
+- fix: 问题修复
+  - 弹框表单残留上次内容问题一批:route_form open时主动resetForm不再依赖父级v-if销毁(关闭动画期间重开复用实例致残留);riskpoint新增未重置saveForm且RiskForm常驻挂载补destroy-on-close;algo页弹框v-model改v-if与algo2对齐;mroom/plat_record新增未重置表单 [caoqianming]
+  - 工作流配置四页(字段/工作流/流转/状态)新增弹框未重置表单,先编辑再新增会残留上一条内容;默认值提为defaultForm常量供data与新增共用 [caoqianming]
+  - 禅道458 [shijing]
+  - 陶瓷日志中设备为可选 [shijing]
 ## 3.1.2026072309
 
 - feat: 新增功能

src/config/index.js

@@ -6,7 +6,7 @@ const DEFAULT_CONFIG = {
 	DASHBOARD_URL: "/dashboard",
 
 	//版本号
-	APP_VER: "3.1.2026072309",
+	APP_VER: "3.1.2026072314",
 
 	//内核版本号
 	CORE_VER: "1.6.9",

src/views/dpm/riskpoint.vue

@@ -356,7 +356,7 @@
 		<el-dialog v-model="choseMyScheduleDialog" title="选择策略">
 			<MySchedule @scheduleChose="scheduleChose"></MySchedule>
 		</el-dialog>
-		<el-dialog v-model="riskDialog" title="新增/编辑" width="90%">
+		<el-dialog v-model="riskDialog" title="新增/编辑" width="90%" destroy-on-close>
 			<RiskForm ref="riskForm" :riskpoint="rowData.id" @riskConfirm="riskConfirm"></RiskForm>
 		</el-dialog>
 	</el-container>
@@ -444,6 +444,7 @@ export default {
 			this.$refs.table.queryData(this.query);
 		},
 		table_add() {
+			this.saveForm = Object.assign({}, defaultForm);
 			this.saveDialog = true;
 		},
 		table_edit(row) {

src/views/ecm/algo.vue

@@ -128,13 +128,13 @@
     </el-container>
   </el-container>
   <save-dialog
-    v-model="dialog.save"
+    v-if="dialog.save"
     ref="saveDialog"
     @success="handleSaveSuccessss"
     @closed="dialog.save = false"
   ></save-dialog>
   <algo-dialog
-    v-model="dialog.algos"
+    v-if="dialog.algos"
     ref="algoDialog"
     @success="handleSaveSuccessss"
     @closed="dialog.algos = false"

src/views/mtm/route_form.vue

@@ -467,15 +467,43 @@ export default {
 			that.paramsJsonFileurl = list1;
 			that.params_json.fileurl = JSON.stringify(that.paramsJsonFileurl);
 		},
+		//重置表单状态：open时主动清空，不依赖父级v-if销毁组件（关闭动画期间重开会复用实例导致残留上次内容）
+		resetForm() {
+			this.form = Object.assign({}, defaultForm);
+			this.form.routepack = this.routepack;
+			if (this.project_code == "bxerp" || this.project_code == "tcerp") {
+				this.form.material_out_tracking = 20;
+			}
+			this.params_json = {
+				duibian1: 0,
+				duibian2: 0,
+				changdu1: 0,
+				changdu2: 0,
+				pbnum: 0,
+				pbsigao: 0,
+				pbbb: "是",
+			};
+			this.params_json2 = { dscd: 0, sijing: 0 };
+			this.fileIds = [];
+			this.fileurl = [];
+			this.fileurl_form = [];
+			this.paramsJsonFileurl = [];
+			this.routemats = [];
+			this.routeId = "";
+			this.processName = "";
+			this.divDisable = false;
+		},
 		//显示
 		open(mode = "add") {
 			let that = this;
 			that.mode = mode;
+			that.resetForm();
 			that.visible = true;
 			that.$nextTick(() => {
 			    if(that.count){
 					that.form.sort = that.count+1;
 				}
+				that.$refs.dialogForm && that.$refs.dialogForm.clearValidate();
 			})
 			return this;
 		},

src/views/ofm/mroom.vue

@@ -99,6 +99,11 @@
 </template>
 
 <script>
+const defaultForm = {
+  name: "",
+  location: "",
+  capacity: "",
+};
 export default {
   name: "mroom",
   data() {
@@ -114,11 +119,7 @@ export default {
         edit: "编辑",
         show: "查看",
       },
-      addForm: {
+      addForm: Object.assign({}, defaultForm),
-        name: "",
-        location: "",
-        capacity: "",
-      },
        rules: {
         name: [{ required: true, message: "请输入会议室名称", trigger: "blur" }],
         location: [{ required: true, message: "请输入地点", trigger: "blur" }],
@@ -127,9 +128,10 @@ export default {
     };
   },
   methods: {
-    //添加工作流
+    //添加会议室
     handleAdd() {
       this.type = "add";
+      this.addForm = Object.assign({}, defaultForm);
       this.limitedVisible = true;
     },
     handleCancel() {

src/views/srm/plat_record.vue

@@ -245,6 +245,7 @@ export default {
   methods: {
     handleAdd() {
       this.type = "add";
+      this.addForm = {};
       this.limitedVisible = true;
     },
     handleCancel() {

src/views/wf/field.vue

@@ -117,6 +117,18 @@
 </template>
 
 <script>
+	const defaultForm = {
+		field_key: '',
+		field_name: '',
+		placeholder: '',
+		field_type: '',
+		sort: '',
+		label: 'name',
+		default_value: '',
+		field_template: '',
+		field_choice: [],
+		is_hidden: false,
+	};
 	export default {
 		name: "field",
 		data() {
@@ -130,18 +142,7 @@
 					show: '查看'
 				},
 				//表单数据
-				addForm: {
+				addForm: Object.assign({}, defaultForm, {field_choice: []}),
-					field_key: '',
-					field_name: '',
-					placeholder: '',
-					field_type: '',
-					sort: '',
-					label: 'name',
-					default_value: '',
-					field_template: '',
-					field_choice: [],
-					is_hidden: false,
-				},
 				//验证规则
 				rules: {
 					name: [
@@ -205,6 +206,8 @@
 			},
 			handleAdd() {
 				this.type = 'add';
+				this.addForm = Object.assign({}, defaultForm, {field_choice: []});
+				this.choiceOption = [{id: null, name: ""}];
 				this.dialogVisible = true;
 			},
 			submitHandle() {

src/views/wf/state.vue

@@ -391,6 +391,15 @@
 </template>
 
 <script>
+const defaultForm = {
+  name: "",
+  is_hidden: false,
+  sort: "",
+  type: "",
+  enable_retreat: false,
+  participant_type: 0,
+  distribute_type: 2, //分发类型
+};
 export default {
   name: "state",
   data() {
@@ -412,17 +421,10 @@ export default {
       stateChange: [],
       fieldList: [],
       //表单数据
-      addForm: {
+      addForm: Object.assign({}, defaultForm, {
-        name: "",
-        is_hidden: false,
-        sort: "",
-        type: "",
         participant_cc: [],
-        enable_retreat: false,
-        participant_type: 0,
-        distribute_type: 2, //分发类型
         state_fields: {}, //字段状态是否可写
-      },
+      }),
       //验证规则
       rules: {
         name: [{ required: true, message: "请输入工作流名称" }],
@@ -568,6 +570,11 @@ export default {
     handleAdd() {
       this.getField();
       this.type = "add";
+      this.addForm = Object.assign({}, defaultForm, {
+        participant_cc: [],
+        state_fields: {},
+      });
+      this.stateChange = [];
       this.dialogVisible = true;
       // if(this.dialogInitNum === 0){
       //   this.getUsers();

src/views/wf/transform.vue

@@ -142,6 +142,13 @@
 <script>
 	// import vueJsonEditor from 'vue-json-editor'
 	import JsonEditorVue from 'json-editor-vue3'
+	const defaultForm = {
+		name: '',
+		timer: 0,
+		source_state: '',
+		destination_state: '',
+		field_require_check: false,
+	};
 	export default {
 		name: "transform",
 		components: { JsonEditorVue },
@@ -165,14 +172,7 @@
 					value: 3,
 					label: '其他'
 				}],
-				addForm: {
+				addForm: Object.assign({}, defaultForm, {condition_expression: {}}),
-					name: '',
-					timer: 0,
-					source_state: '',
-					destination_state: '',
-					condition_expression: {},
-					field_require_check: false,
-				},
 				stateList: [],
 				dialogVisible: false,
 			}
@@ -200,6 +200,7 @@
 			handleAdd() {
 				this.getStateList();
 				this.type = 'add';
+				this.addForm = Object.assign({}, defaultForm, {condition_expression: {}});
 				this.dialogVisible = true;
 			},
 			handleEdit(row) {

src/views/wf/workflow.vue

@@ -207,6 +207,15 @@
 
 <script>
 import degraDialog from "./degraD3_2.vue";
+const defaultForm = {
+  name: "",
+  sn_prefix: "",
+  description: "",
+  view_permission_check: true,
+  display_form_str: [],
+  title_template: "",
+  content_template: "",
+};
 export default {
   name: "index",
   components: {
@@ -233,15 +242,7 @@ export default {
       },
       wfCateOptions: [],
       //表单数据
-      addForm: {
+      addForm: Object.assign({}, defaultForm, { display_form_str: [] }),
-        name: "",
-        sn_prefix: "",
-        description: "",
-        view_permission_check: true,
-        display_form_str: [],
-        title_template: "",
-        content_template: "",
-      },
       //验证规则
       rules: {
         name: [{ required: true, message: "请输入工作流名称" }],
@@ -264,6 +265,7 @@ export default {
     //添加工作流
     handleAdd() {
       this.type = "add";
+      this.addForm = Object.assign({}, defaultForm, { display_form_str: [] });
       this.limitedVisible = true;
     },