Merge branch 'feature/master' into feature/data_clean

src/views/business/crm/order/form.vue

@@ -718,15 +718,6 @@
               </el-form-item>
             </el-col>
             <br />
-
-            <el-col :span="20">
-              <el-form-item label="更新内容" prop="updateRemark">
-                <el-input v-if="editStatus" v-model="form.updateRemark" show-word-limit maxlength="250"
-                          style="width: 100%; margin: 0; padding: 0" placeholder="请输入更新内容" type="textarea" :rows="4" />
-                <span v-else>{{ form.updateRemark }}</span>
-              </el-form-item>
-            </el-col>
-            <br />
             <el-col :span="24">
               <div class="details-head" style="font-size: 12px">
                 <div class="title">

src/views/system/dict/index.vue

@@ -265,7 +265,9 @@ const dateRange = ref([]);
 const webHost = import.meta.env.VITE_APP_BASE_API;
 
 const data = reactive({
-  form: {},
+  form: {
+    module: "system",
+  },
   queryParams: {
     pageNum: 1,
     module: "system",
@@ -309,6 +311,7 @@ function reset() {
     dictName: undefined,
     dictType: undefined,
     status: "0",
+    module: "system",
     remark: undefined,
   };
   proxy.resetForm("dictRef");