Selaa lähdekoodia

归档树保存接口参数

gangyj 2 vuotta sitten
vanhempi
commit
56efedae85

+ 93 - 4
src/views/manager/archivetree.vue

@@ -492,7 +492,7 @@
           <el-form-item
           <el-form-item
               label="储存类型"
               label="储存类型"
               prop="storageType"
               prop="storageType"
-              v-if="form.nodeType==1 || (form.nodeType==2 && form.isStorageNode==1)"
+              v-if="form.nodeType==1"
             >
             >
               <el-select
               <el-select
                 v-model="form.storageType"
                 v-model="form.storageType"
@@ -527,6 +527,23 @@
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
             <template v-if="form.isStorageNode==1">
             <template v-if="form.isStorageNode==1">
+              <el-form-item
+                label="储存类型"
+                prop="storageType"
+              >
+                <el-select
+                  v-model="form.storageType"
+                  style="width:400px;"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in storageTypeList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
               <el-form-item
               <el-form-item
                 label="是否竣工图"
                 label="是否竣工图"
                 prop="isBuiltDrawing"
                 prop="isBuiltDrawing"
@@ -627,6 +644,20 @@
                 </el-select>
                 </el-select>
               </el-form-item>
               </el-form-item>
             </template>
             </template>
+            <template v-if="form.associationType==2">
+              <el-form-item
+                label="文件类型"
+                prop="fileType"
+              >
+                <el-checkbox-group v-model="form.fileType">
+                  <el-checkbox
+                    v-for="item in fileTypeList"
+                    :key="item.value"
+                    :label="item.label"
+                  >{{item.label}}</el-checkbox>
+                </el-checkbox-group>
+              </el-form-item>
+            </template>
           </template>
           </template>
         </el-form>
         </el-form>
       </div>
       </div>
@@ -820,7 +851,9 @@ export default {
         interfaceType: '',  //选择接口类型
         interfaceType: '',  //选择接口类型
         associationType: '',  //关联类型
         associationType: '',  //关联类型
         majorDataType: [],  //内业资料类型
         majorDataType: [],  //内业资料类型
-        displayHierarchy: ''  //显示层级
+        displayHierarchy: '',  //显示层级
+
+        fileType:[],//文件类型
       },
       },
       rules: {
       rules: {
         nodeName: [{ required: true, message: '请输入节点名称', trigger: 'blur' }],
         nodeName: [{ required: true, message: '请输入节点名称', trigger: 'blur' }],
@@ -835,6 +868,7 @@ export default {
         displayHierarchy: [{ required: true, message: '请选择显示层级', trigger: 'change' }],
         displayHierarchy: [{ required: true, message: '请选择显示层级', trigger: 'change' }],
         projectType: [{ required: true, message: '请选择工程类型', trigger: 'change' }],
         projectType: [{ required: true, message: '请选择工程类型', trigger: 'change' }],
         storageType: [{ required: true, message: '请选择储存类型', trigger: 'change' }],
         storageType: [{ required: true, message: '请选择储存类型', trigger: 'change' }],
+        fileType: [{ required: true, message: '请选择文件类型', trigger: 'change' }],
       },
       },
       JobTypeList: [],//岗位类型枚举
       JobTypeList: [],//岗位类型枚举
       nodeTypeList: [
       nodeTypeList: [
@@ -933,7 +967,35 @@ export default {
       {
       {
         label: '台账资料',
         label: '台账资料',
         value: 4
         value: 4
-      }],//
+      },{
+        label: '首件资料',
+        value: 5
+      },{
+        label: '日志文件',
+        value: 6
+      },
+      ],//
+
+      fileTypeList:[
+        {
+          label: '配合比',
+          value: 1
+        },
+        {
+          label: '原材',
+          value: 2
+        },{
+          label: '汇总',
+          value: 3
+        },{
+          label: '设备',
+          value: 4
+        },{
+          label: '外委(第三方)',
+          value: 5
+        },
+      ],
+
       majorDataTypeList: [],//
       majorDataTypeList: [],//
       displayHierarchyList: [],//
       displayHierarchyList: [],//
       //#endregion
       //#endregion
@@ -1300,6 +1362,9 @@ export default {
                   isBuiltDrawing: this.form.isBuiltDrawing,  //竣工图
                   isBuiltDrawing: this.form.isBuiltDrawing,  //竣工图
                   isInterfaceNode: this.form.isInterfaceNode,  //是否接口节点
                   isInterfaceNode: this.form.isInterfaceNode,  //是否接口节点
                   interfaceType: this.form.interfaceType,  //选择接口类型
                   interfaceType: this.form.interfaceType,  //选择接口类型
+
+                  projectType:this.form.projectType, //工程类型
+                  storageType:this.form.storageType, //储存类型
                 })
                 })
               } else {
               } else {
                 this.baocun({
                 this.baocun({
@@ -1311,6 +1376,9 @@ export default {
                   isStorageNode: this.form.isStorageNode,  //是否为存储节点
                   isStorageNode: this.form.isStorageNode,  //是否为存储节点
                   isBuiltDrawing: this.form.isBuiltDrawing,  //竣工图
                   isBuiltDrawing: this.form.isBuiltDrawing,  //竣工图
                   isInterfaceNode: this.form.isInterfaceNode,  //是否接口节点
                   isInterfaceNode: this.form.isInterfaceNode,  //是否接口节点
+
+                  projectType:this.form.projectType, //工程类型
+                  storageType:this.form.storageType, //储存类型
                 })
                 })
               }
               }
             } else {
             } else {
@@ -1321,6 +1389,8 @@ export default {
                 nodeType: this.form.nodeType,  // 节点类型
                 nodeType: this.form.nodeType,  // 节点类型
                 postType: this.form.postType,  //岗位类型
                 postType: this.form.postType,  //岗位类型
                 isStorageNode: this.form.isStorageNode,  //是否为存储节点
                 isStorageNode: this.form.isStorageNode,  //是否为存储节点
+
+                projectType:this.form.projectType, //工程类型
               })
               })
             }
             }
           } else if (this.form.nodeType == 1) {
           } else if (this.form.nodeType == 1) {
@@ -1333,14 +1403,33 @@ export default {
                 associationType: this.form.associationType,  //关联类型
                 associationType: this.form.associationType,  //关联类型
                 majorDataType: this.form.majorDataType, //内业资料类型
                 majorDataType: this.form.majorDataType, //内业资料类型
                 displayHierarchy: this.form.displayHierarchy,  //显示层级
                 displayHierarchy: this.form.displayHierarchy,  //显示层级
+
+                projectType:this.form.projectType, //工程类型
+                storageType:this.form.storageType, //储存类型
               })
               })
-            } else {
+            }else if(this.form.associationType == 2){
+              //试验资料
               this.baocun({
               this.baocun({
                 id: this.form.id,
                 id: this.form.id,
                 parentId: this.form.parentId, //上级节点id
                 parentId: this.form.parentId, //上级节点id
                 nodeName: this.form.nodeName,  //节点名称
                 nodeName: this.form.nodeName,  //节点名称
                 nodeType: this.form.nodeType,  // 节点类型
                 nodeType: this.form.nodeType,  // 节点类型
                 associationType: this.form.associationType,  //关联类型
                 associationType: this.form.associationType,  //关联类型
+                
+                fileType:this.form.fileType,//文件类型
+                projectType:this.form.projectType, //工程类型
+                storageType:this.form.storageType, //储存类型
+              })
+            }else {
+              this.baocun({
+                id: this.form.id,
+                parentId: this.form.parentId, //上级节点id
+                nodeName: this.form.nodeName,  //节点名称
+                nodeType: this.form.nodeType,  // 节点类型
+                associationType: this.form.associationType,  //关联类型
+
+                projectType:this.form.projectType, //工程类型
+                storageType:this.form.storageType, //储存类型
               })
               })
             }
             }
           }
           }

+ 93 - 4
src/views/manager/projectinfo/archivetreeRule.vue

@@ -492,7 +492,7 @@
           <el-form-item
           <el-form-item
               label="储存类型"
               label="储存类型"
               prop="storageType"
               prop="storageType"
-              v-if="form.nodeType==1 || (form.nodeType==2 && form.isStorageNode==1)"
+              v-if="form.nodeType==1"
             >
             >
               <el-select
               <el-select
                 v-model="form.storageType"
                 v-model="form.storageType"
@@ -527,6 +527,23 @@
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
             <template v-if="form.isStorageNode==1">
             <template v-if="form.isStorageNode==1">
+              <el-form-item
+                label="储存类型"
+                prop="storageType"
+              >
+                <el-select
+                  v-model="form.storageType"
+                  style="width:400px;"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in storageTypeList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
               <el-form-item
               <el-form-item
                 label="是否竣工图"
                 label="是否竣工图"
                 prop="isBuiltDrawing"
                 prop="isBuiltDrawing"
@@ -627,6 +644,20 @@
                 </el-select>
                 </el-select>
               </el-form-item>
               </el-form-item>
             </template>
             </template>
+            <template v-if="form.associationType==2">
+              <el-form-item
+                label="文件类型"
+                prop="fileType"
+              >
+                <el-checkbox-group v-model="form.fileType">
+                  <el-checkbox
+                    v-for="item in fileTypeList"
+                    :key="item.value"
+                    :label="item.label"
+                  >{{item.label}}</el-checkbox>
+                </el-checkbox-group>
+              </el-form-item>
+            </template>
           </template>
           </template>
         </el-form>
         </el-form>
       </div>
       </div>
@@ -820,7 +851,9 @@ export default {
         interfaceType: '',  //选择接口类型
         interfaceType: '',  //选择接口类型
         associationType: '',  //关联类型
         associationType: '',  //关联类型
         majorDataType: [],  //内业资料类型
         majorDataType: [],  //内业资料类型
-        displayHierarchy: ''  //显示层级
+        displayHierarchy: '',  //显示层级
+
+        fileType:[],//文件类型
       },
       },
       rules: {
       rules: {
         nodeName: [{ required: true, message: '请输入节点名称', trigger: 'blur' }],
         nodeName: [{ required: true, message: '请输入节点名称', trigger: 'blur' }],
@@ -835,6 +868,7 @@ export default {
         displayHierarchy: [{ required: true, message: '请选择显示层级', trigger: 'change' }],
         displayHierarchy: [{ required: true, message: '请选择显示层级', trigger: 'change' }],
         projectType: [{ required: true, message: '请选择工程类型', trigger: 'change' }],
         projectType: [{ required: true, message: '请选择工程类型', trigger: 'change' }],
         storageType: [{ required: true, message: '请选择储存类型', trigger: 'change' }],
         storageType: [{ required: true, message: '请选择储存类型', trigger: 'change' }],
+        fileType: [{ required: true, message: '请选择文件类型', trigger: 'change' }],
       },
       },
       JobTypeList: [],//岗位类型枚举
       JobTypeList: [],//岗位类型枚举
       nodeTypeList: [
       nodeTypeList: [
@@ -933,7 +967,35 @@ export default {
       {
       {
         label: '台账资料',
         label: '台账资料',
         value: 4
         value: 4
-      }],//
+      },{
+        label: '首件资料',
+        value: 5
+      },{
+        label: '日志文件',
+        value: 6
+      },
+      ],//
+      
+      fileTypeList:[
+        {
+          label: '配合比',
+          value: 1
+        },
+        {
+          label: '原材',
+          value: 2
+        },{
+          label: '汇总',
+          value: 3
+        },{
+          label: '设备',
+          value: 4
+        },{
+          label: '外委(第三方)',
+          value: 5
+        },
+      ],
+
       majorDataTypeList: [],//
       majorDataTypeList: [],//
       displayHierarchyList: [],//
       displayHierarchyList: [],//
       //#endregion
       //#endregion
@@ -1304,6 +1366,9 @@ export default {
                   isBuiltDrawing: this.form.isBuiltDrawing,  //竣工图
                   isBuiltDrawing: this.form.isBuiltDrawing,  //竣工图
                   isInterfaceNode: this.form.isInterfaceNode,  //是否接口节点
                   isInterfaceNode: this.form.isInterfaceNode,  //是否接口节点
                   interfaceType: this.form.interfaceType,  //选择接口类型
                   interfaceType: this.form.interfaceType,  //选择接口类型
+
+                  projectType:this.form.projectType, //工程类型
+                  storageType:this.form.storageType, //储存类型
                 })
                 })
               } else {
               } else {
                 this.baocun({
                 this.baocun({
@@ -1315,6 +1380,9 @@ export default {
                   isStorageNode: this.form.isStorageNode,  //是否为存储节点
                   isStorageNode: this.form.isStorageNode,  //是否为存储节点
                   isBuiltDrawing: this.form.isBuiltDrawing,  //竣工图
                   isBuiltDrawing: this.form.isBuiltDrawing,  //竣工图
                   isInterfaceNode: this.form.isInterfaceNode,  //是否接口节点
                   isInterfaceNode: this.form.isInterfaceNode,  //是否接口节点
+
+                  projectType:this.form.projectType, //工程类型
+                  storageType:this.form.storageType, //储存类型
                 })
                 })
               }
               }
             } else {
             } else {
@@ -1325,6 +1393,8 @@ export default {
                 nodeType: this.form.nodeType,  // 节点类型
                 nodeType: this.form.nodeType,  // 节点类型
                 postType: this.form.postType,  //岗位类型
                 postType: this.form.postType,  //岗位类型
                 isStorageNode: this.form.isStorageNode,  //是否为存储节点
                 isStorageNode: this.form.isStorageNode,  //是否为存储节点
+
+                projectType:this.form.projectType, //工程类型
               })
               })
             }
             }
           } else if (this.form.nodeType == 1) {
           } else if (this.form.nodeType == 1) {
@@ -1337,14 +1407,33 @@ export default {
                 associationType: this.form.associationType,  //关联类型
                 associationType: this.form.associationType,  //关联类型
                 majorDataType: this.form.majorDataType, //内业资料类型
                 majorDataType: this.form.majorDataType, //内业资料类型
                 displayHierarchy: this.form.displayHierarchy,  //显示层级
                 displayHierarchy: this.form.displayHierarchy,  //显示层级
+
+                projectType:this.form.projectType, //工程类型
+                storageType:this.form.storageType, //储存类型
               })
               })
-            } else {
+            } else if(this.form.associationType == 2){
+              //试验资料
+              this.baocun({
+                id: this.form.id,
+                parentId: this.form.parentId, //上级节点id
+                nodeName: this.form.nodeName,  //节点名称
+                nodeType: this.form.nodeType,  // 节点类型
+                associationType: this.form.associationType,  //关联类型
+                
+                fileType:this.form.fileType,//文件类型
+                projectType:this.form.projectType, //工程类型
+                storageType:this.form.storageType, //储存类型
+              })
+            }else {
               this.baocun({
               this.baocun({
                 id: this.form.id,
                 id: this.form.id,
                 parentId: this.form.parentId, //上级节点id
                 parentId: this.form.parentId, //上级节点id
                 nodeName: this.form.nodeName,  //节点名称
                 nodeName: this.form.nodeName,  //节点名称
                 nodeType: this.form.nodeType,  // 节点类型
                 nodeType: this.form.nodeType,  // 节点类型
                 associationType: this.form.associationType,  //关联类型
                 associationType: this.form.associationType,  //关联类型
+
+                projectType:this.form.projectType, //工程类型
+                storageType:this.form.storageType, //储存类型
               })
               })
             }
             }
           }
           }