zhuangyunsheng пре 1 година
родитељ
комит
08c8133558

+ 1 - 1
.env.development

@@ -9,7 +9,7 @@ VUE_APP_TITLE = 城发集团招采管理平台
 # VUE_APP_API_BASEURL = http://192.168.101.93:8810
 
 VUE_APP_API_BASEURL = http://172.16.1.150:8810
-# VUE_APP_API_BASEURL = http://172.16.1.132:8800
+# VUE_APP_API_BASEURL = http://172.16.1.132:8810
 
 # 本地端口
 VUE_APP_PORT = 7800

+ 2 - 2
src/components/scChengTou/purchase/apply.vue

@@ -61,7 +61,7 @@
 					<dict-select ref="dictSelect" v-model="form.type" dic="procurement_category" filterable placeholder="请选择采购类别" @change="typeChange"></dict-select>
 				</el-form-item>
 			</el-col>
-            <el-col v-if="isEngineering" :lg="lg" :md="12" :xs="24">
+            <el-col v-if="!isEngineering" :lg="lg" :md="12" :xs="24">
 				<el-form-item label="专项费用类型:" prop="specialFeeType">
 					<dict-select v-model="form.specialFeeType" dic="special_expenses_type" filterable placeholder="请选择专项费用类型"></dict-select>
 				</el-form-item>
@@ -258,7 +258,7 @@
             },
 
             typeChange() {
-                if (!this.isEngineering) this.form.specialFeeType = null;
+                if (this.isEngineering) this.form.specialFeeType = null;
             }
 		}
 	}

+ 1 - 1
src/components/scChengTou/treeSelect.vue

@@ -60,7 +60,7 @@
 						const res = await this.apiObj[this.apiKey]();
 						this.treeList = config.parseData(res) || [];
 						this.cacheData = this.treeList.filter(t => t[this.defaultProps.value] == this.modelValue);
-						if (this.isDept && this.isAllDept) resolve(this.treeList.filter(t => t.deptId == this.$TOOL.data.get("USER_INFO").deptId));
+						if (this.isDept && !this.isAllDept) resolve(this.treeList.filter(t => t.deptId == this.$TOOL.data.get("USER_INFO").deptId));
 						else resolve(this.treeList.filter(t => t.pid == 0));
 						this.$emit("finished");
 					} else resolve(this.treeList.filter(t => t.pid == data[this.defaultProps.value]));

+ 1 - 1
src/views/system/dict/components/approveInfo.vue

@@ -44,7 +44,7 @@
 					{ label: "表单名称", prop: "formName", width: "140", align: "center" },
 					{ label: "业务类型", prop: "busType", width: "200", align: "center" },
 					{ label: "表单id", prop: "formId", width: "350", align: "center" },
-					{ label: "表单编号", prop: "formCode", width: "300", align: "center" }
+					{ label: "表单编号", prop: "formCode", width: "320", align: "center" }
 				],
 				
 				dialog: false