增项

src/dashoo.cn/backend/api/controllers/oilsupplier/supplierdataentry.go

@@ -298,8 +298,8 @@ func (this *SupplierDataEntryController) DocExport() {
 	//	ColsNum: 4,
 	//}
 	//datamap["TableComment"] = []string{"MajorEquipments", "ThreeYears", "Patent", "Winning"}
-	retDocUrl := svcActiviti.FillWordTemplate(datamap, Url, fileName)
-	//retDocUrl := svcActiviti.FillWordWatermarkTemplate(datamap, Url, fileName, model1.SupplierName)
+	//retDocUrl := svcActiviti.FillWordTemplate(datamap, Url, fileName)
+	retDocUrl := svcActiviti.FillWordWatermarkTemplate(datamap, Url, fileName, model1.SupplierName)
 	var datainfo ErrorDataInfo
 	datainfo.Code = 0
 	datainfo.Item = retDocUrl

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -709,6 +709,37 @@ import fileapi from '@/api/oilsupplier/supplierfile'
         })
       },
 
+      SubpEntity () {
+        if (this.auditer === '') {
+          this.$message({
+            type: 'warning',
+            message: '请选择分办人！'
+          })
+          return
+        }
+        this.applyLoading = true
+        this.auditform.FirstAuditName = this.auditer
+        this.auditform.CertId = this.formData.Id
+        api2.auditEntity(this.formData.Id, this.auditform, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            // 保存成功后，初始化数据，变成修改
+            this.getEntityById()
+            this.ComAuditdialogShow = false
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+          this.applyLoading = false
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       // 获取推荐单位列表
       getOrgTreeList () {
         let _this = this
@@ -827,19 +858,20 @@ import fileapi from '@/api/oilsupplier/supplierfile'
         }
       },
       commitfenban () {
-        if (this.subfileList && this.subfileList.length > 0) {
-          for (var i = 0; i < this.subfileList.length; i++) {
-            if (this.subfileList[i].FileType === 1 && this.subfileList[i].FileUrl === '') {
-              this.$message({
-                type: 'warning',
-                message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
-              })
-              return
-            }
-          }
-        } else {
-          this.ComAuditdialogShow = true
-        }
+        this.ComAuditdialogShow = true
+        // if (this.subfileList && this.subfileList.length > 0) {
+        //   for (var i = 0; i < this.subfileList.length; i++) {
+        //     if (this.subfileList[i].FileType === 1 && this.subfileList[i].FileUrl === '') {
+        //       this.$message({
+        //         type: 'warning',
+        //         message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
+        //       })
+        //       return
+        //     }
+        //   }
+        // } else {
+        //   this.ComAuditdialogShow = true
+        // }
       },
       openDialog (val) {
         this.SubfileForm.Id = val.Id
@@ -1362,7 +1394,7 @@ import fileapi from '@/api/oilsupplier/supplierfile'
         })
       },
 
-      SubpEntity () {
+      SubpEntitySubpEntity () {
         if (this.auditer === '') {
           this.$message({
             type: 'warning',