Переглянути джерело

Merge branch 'master' into test-dev

duy 2 місяців тому
батько
коміт
a03a8dd280

+ 1 - 1
public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20250121170517"
+  "value": "20250529111005"
 }

+ 2 - 2
src/config/index.json

@@ -1,9 +1,9 @@
 {
   "target22": "http://39.108.216.210:8090",
-  "target": "http://192.168.0.109:8090",
+  "target7": "http://192.168.0.109:8090",
   "target2": "http://192.168.0.101:8090",
   "target3": "http://183.247.216.148:28090",
-  "target1": "http://192.168.0.110:8090",
+  "target": "http://192.168.0.109:8090",
   "dev": {
     "port": 1888
   }

+ 3 - 1
src/views/manager/archivetree.vue

@@ -437,7 +437,7 @@
         slot="footer"
         class="dialog-footer"
       >
-        <el-button @click="treeTap=false">取 消</el-button>
+        <el-button @click="treeClose">取 消</el-button>
         <el-button
           type="primary"
           @click="saveTree"
@@ -1333,6 +1333,8 @@ export default {
         projectType:'',//工程类型
         storageType:'',//储存类型
         expDataType:[],//文件类型
+        archiveAutoType:'',//最高1  分类2  独立3
+        storageTime:'',//储存时间
       }
       this.$refs.form.resetFields();
       this.form.id = ''

+ 23 - 19
src/views/manager/projectinfo/archivetreeRule.vue

@@ -249,22 +249,22 @@
             </el-select>
           </el-form-item>
           <el-form-item
-              label="并卷规则"
-              prop="archiveAutoType"
+            label="并卷规则"
+            prop="archiveAutoType"
+          >
+            <el-select
+              v-model="form.archiveAutoType"
+              placeholder="工程类型"
+              style="width:400px;"
             >
-              <el-select
-
-                v-model="form.archiveAutoType"
-                style="width:400px;"
-              >
-                <el-option
-                  v-for="item in ruleTypeList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
+              <el-option
+                v-for="item in ruleList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item
             label="储存类型"
             prop="storageType"
@@ -444,7 +444,7 @@
         slot="footer"
         class="dialog-footer"
       >
-        <el-button @click="treeTap=false">取 消</el-button>
+        <el-button @click="treeClose">取 消</el-button>
         <el-button
           type="primary"
           @click="saveTree"
@@ -547,7 +547,7 @@ export default {
         expDataTypes:[],//文件类型
         contractLogTypes: [],
         storageTime:'',
-        archiveAutoType:1,//并卷规则
+        archiveAutoType:'',//并卷规则
       },
       rules: {
         nodeName: [{ required: true, message: '请输入节点名称', trigger: 'blur' }],
@@ -617,7 +617,7 @@ export default {
           value: 9
         },
       ],
-      ruleTypeList: [
+      ruleList: [
       {
         label: '单独组卷',
         value: 1
@@ -1112,10 +1112,14 @@ export default {
         projectType:'',//工程类型
         storageType:'',//储存类型
         expDataTypes:[],//文件类型
-        contractLogTypes: []
+        contractLogTypes: [],
+        archiveAutoType:'',//最高1  分类2  独立3
+        storageTime:'',//储存时间
+
       }
       this.$refs.form.resetFields();
       this.form.id = ''
+    
       this.treeTap = false
     },
     async roletree () {//岗位类型枚举