lining 5 年 前
コミット
a3a13b65a7

+ 1 - 1
src/dashoo.cn/backend/api/controllers/oilsupplier/infochange.go

@@ -1072,7 +1072,7 @@ func (this *InfoChangeController) GetAddSupplierList() {
 	where := "1=1"
 	//企业用户必须加创建人条件
 	if this.User.IsCompanyUser == 1 {
-		where = where + " and a.CreateUserId = '" + this.User.Id + "'"
+		where = where + " and CreateUserId = '" + this.User.Id + "'"
 	}
 	//else {  // 二级单位可以为所有企业提交信息变更 2020-03-12
 	//	//超级管理员和有查看所有数据权限的用户不加条件

+ 7 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/auditoperation.vue

@@ -1300,7 +1300,13 @@
       fileurlcut(val, index) {
         let fileurlall = val.split('$')[index]
         let fileurl = fileurlall.split('|')
-        return fileurl[0]
+        let retUrl = fileurl[0]
+        // 内网服务器专用
+        if (process.client && retUrl.indexOf('/upfile') === 0) {
+          const myDomain = window.location.host
+          retUrl = myDomain + '/' + retUrl
+        }
+        return retUrl
       },
       getAccessCardNo() {
         api.GeAccessCardNo(this.SuppId, this.$axios)

+ 7 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -1686,7 +1686,13 @@
       fileurlcut (val, index) {
         let fileurlall = val.split('$')[index]
         let fileurl = fileurlall.split('|')
-        return fileurl[0]
+        let retUrl = fileurl[0]
+        // 内网服务器专用
+        if (process.client && retUrl.indexOf('/upfile') === 0) {
+          const myDomain = window.location.host
+          retUrl = myDomain + '/' + retUrl
+        }
+        return retUrl
       },
 
       /* getchange(key) {

+ 30 - 28
src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/index.vue

@@ -405,39 +405,41 @@
         }
       },
       addInfoChangeCom() {
-        this.$confirm("确定添加变更申请, 是否继续?", "提示", {
+        if (this.entityForm.SupplierId > 0) {
+          this.$confirm("确定添加变更申请, 是否继续?", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning"
           })
-          .then(() => {
-            api.addInfoChMain(this.entityForm, this.$axios).then(res => {
-              if (res.data.code === 0) {
-                //保存成功后,初始化数据,变成修改
-                this.entityForm.Id = res.data.item;
-                this.$router.push({
-                  path: '/oilsupplier/infochangech/' + this.entityForm.SupplierId + '/operation',
-                  query: {
-                    InfoStatus: 0,
-                    infoId: this.entityForm.Id,
-                  }
-                })
-                this.$message({
-                  type: 'success',
-                  message: res.data.message
-                });
+            .then(() => {
+              api.addInfoChMain(this.entityForm, this.$axios).then(res => {
+                if (res.data.code === 0) {
+                  //保存成功后,初始化数据,变成修改
+                  this.entityForm.Id = res.data.item;
+                  this.$router.push({
+                    path: '/oilsupplier/infochangech/' + this.entityForm.SupplierId + '/operation',
+                    query: {
+                      InfoStatus: 0,
+                      infoId: this.entityForm.Id,
+                    }
+                  })
+                  this.$message({
+                    type: 'success',
+                    message: res.data.message
+                  });
 
-              } else {
-                this.$message({
-                  type: 'warning',
-                  message: res.data.message
-                });
-              }
-            }).catch(err => {
-              console.error(err)
-            });
-          })
-          .catch(() => {});
+                } else {
+                  this.$message({
+                    type: 'warning',
+                    message: res.data.message
+                  });
+                }
+              }).catch(err => {
+                console.error(err)
+              });
+            })
+            .catch(() => {});
+        }
       },
       addInfoChange() {
         this.$refs['EntityFormref'].validate((valid) => {