供应商

src/utils/request.js

@@ -46,32 +46,15 @@ axios.interceptors.response.use(
 					message: error.response.data.message || "Status:500，服务器发生错误！"
 				});
 			} else if (error.response.status == 400) {
-				ElNotification.error({
-					title: "请求错误",
-					message: error.response.data || "Code:400，未知错误！"
-				});
-			} else if (error.response.status == 401) {
-				if (!MessageBox_401_show) {
-					MessageBox_401_show = true
-					ElMessageBox.confirm("当前用户已被登出或无权限访问当前资源，请尝试重新登录后再操作。", "无权限访问", {
-						type: "error",
-						showClose: false,
-						closeOnPressEscape: false,
-						closeOnClickModal: false,
-						center: true,
-						confirmButtonText: "重新登录",
-						showCancelButton: false,
-						beforeClose: (action, instance, done) => {
-							MessageBox_401_show = false
-							done()
-						}
-					}).then(() => {
-						tool.cookie.remove("TOKEN");
-						tool.data.remove("USER_INFO");
-						router.replace({ path: "/login" })
-					}).catch(() => { })
+				if (error.response.data == "找不到当前登录的信息") messageBox_401();
+				else {
+					ElNotification.error({
+						title: "请求错误",
+						message: error.response.data || "Code:400，未知错误！"
+					});
 				}
-			} else {
+			} else if (error.response.status == 401) messageBox_401();
+			else {
 				ElNotification.error({
 					title: "请求错误",
 					message: error.response.data.message || `Status:${error.response.status}，未知错误！`
@@ -127,28 +110,8 @@ var http = {
 				...config,
 				params: params
 			}).then((response) => {
-				if (response.data.code && response.data.code == 30112) {
-					if (!MessageBox_401_show) {
-						MessageBox_401_show = true
-						ElMessageBox.confirm("当前用户已被登出或无权限访问当前资源，请尝试重新登录后再操作。", "无权限访问", {
-							type: "error",
-							showClose: false,
-							closeOnPressEscape: false,
-							closeOnClickModal: false,
-							center: true,
-							confirmButtonText: "重新登录",
-							showCancelButton: false,
-							beforeClose: (action, instance, done) => {
-								MessageBox_401_show = false
-								done()
-							}
-						}).then(() => {
-							tool.cookie.remove("TOKEN");
-							tool.data.remove("USER_INFO");
-							router.replace({ path: "/login" })
-						}).catch(() => { })
-					}
-				} else resolve(response.data)
+				if (response.data.code && response.data.code == 30112) messageBox_401();
+				else resolve(response.data);
 			}).catch((error) => {
 				reject(error);
 			})
@@ -240,4 +203,27 @@ var http = {
 	}
 }
 
+function messageBox_401() {
+	if (!MessageBox_401_show) {
+		MessageBox_401_show = true
+		ElMessageBox.confirm("当前用户已被登出或无权限访问当前资源，请尝试重新登录后再操作。", "无权限访问", {
+			type: "error",
+			showClose: false,
+			closeOnPressEscape: false,
+			closeOnClickModal: false,
+			center: true,
+			confirmButtonText: "重新登录",
+			showCancelButton: false,
+			beforeClose: (action, instance, done) => {
+				MessageBox_401_show = false;
+				done();
+			}
+		}).then(() => {
+			tool.cookie.remove("TOKEN");
+			tool.data.remove("USER_INFO");
+			router.replace({ path: "/login" });
+		}).catch(() => { });
+	}
+}
+
 export default http;

src/views/procurement/process/index.vue

@@ -69,7 +69,7 @@
                     <el-table-column label="是否开启" fixed="right" align="center" width="100">
                         <template #default="scope">
                             <template v-if="scope.row.bidNotice.processState == 'ENDED'">
-                                <el-switch v-model="scope.row.oaStatus" :loading="loading" :active-value="0" :inactive-value="1" @change="openChange(scope.row)"></el-switch>
+                                <el-switch :model-value="scope.row.oaStatus" :loading="loading" :active-value="0" :inactive-value="1" @change="val => openChange(val, scope.row)"></el-switch>
                             </template>
                         </template>
                     </el-table-column>
@@ -290,15 +290,15 @@ export default {
         },
 
         // oa 情况通知-是否开启
-        openChange({ id, oaStatus }) {
+        openChange(status, { id, oaStatus }) {
+            if (status === 1 && oaStatus === undefined) return;
+
             this.loading = true;
-            this.$API.auth.oa.updateStatus({ id, status: oaStatus }).then(() => {
+            this.$API.auth.oa.updateStatus({ id, status }).then(() => {
                 this.loading = false;
                 this.$message.success("操作成功");
-            }).catch(() => {
-                this.loading = false;
                 this.reloadTable("update");
-            });
+            }).catch(() => this.loading = false);
         }
     }
 }

src/views/supplier/signed/save.vue

@@ -13,7 +13,7 @@
 					<scTitle>基本信息</scTitle>
 					<el-row :gutter="15">
 						<el-col :lg="8" :md="12" :xs="24">
-							<el-form-item label="企业编码:">
+							<el-form-item label="企业编码:" prop="supplierNo">
 								<el-input v-model="form.supplierNo" placeholder="请输入企业编码"></el-input>
 							</el-form-item>
 						</el-col>
@@ -105,6 +105,19 @@
 								<el-input v-model="form.telephone" clearable placeholder="请输入公司电话"></el-input>
 							</el-form-item>
 						</el-col>
+						<el-col :lg="8" :md="12" :xs="24">
+							<el-form-item label="单位性质:" prop="nature">
+								<dict-select v-model="form.nature" dic="unit_nature" filterable placeholder="请选择单位性质"></dict-select>
+							</el-form-item>
+						</el-col>
+						<el-col :lg="8" :md="12" :xs="24">
+							<el-form-item label="是否客户:" required>
+								<el-radio-group v-model="form.isCustomer">
+									<el-radio label="是" :value="true"></el-radio>
+									<el-radio label="否" :value="false"></el-radio>
+								</el-radio-group>
+							</el-form-item>
+						</el-col>
 						<el-col :xs="24">
 							<el-form-item label="经营范围:">
 								<el-input v-model="form.businessScope" clearable placeholder="请输入经营范围"></el-input>
@@ -212,6 +225,8 @@
 					regionCode: null,
 					postcode: null,
 					telephone: null,
+					nature: null,
+					isCustomer: false,
 					businessScope: null,
 					address: null,
 					remark: null,
@@ -224,6 +239,7 @@
 				},
 
 				rules: {
+					supplierNo: [{ required: true, message: "请输入企业编码" }],
 					supplierName: [{ required: true, message: "请输入供应商名称" }],
 					creditCode: [{ required: true, message: "请输入统一社会信用代码" },
 						{ validator: (rule, value, callback) => {
@@ -238,6 +254,7 @@
 					province: [{ required: true, message: "请选择省市区" }],
 					city: [{ required: true, message: "请选择地级市" }],
 					region: [{ required: true, message: "请选择区/县" }],
+					nature: [{ required: true, message: "请选择单位性质" }],
 					bankList: [{ required: true, message: "请选择银行账户" },
 						{ validator: (rule, value, callback) => {
 							if (value.findIndex(v => !v.accountName || !v.accountCode) != -1) return callback(new Error("请完善银行账户信息"));