导出word

src/dashoo.cn/backend/api/business/limsdoctemplate/limstemplateenum.go

@@ -90,9 +90,11 @@ const (
 	//电接点压力表检定
 	DAYT_ELECTRICCONTACTSPRESSUREGAUGETEST_DETAIL string = "DAYT.ElectricContactsPressureGaugeTest.Detail"
 	//钢卷尺检定
-	DAYT_STEELTAPE_DETAIL string="DAYT.SteelTape.Detail"
+	DAYT_STEELTAPE_DETAIL string = "DAYT.SteelTape.Detail"
 	//压力表检定
-	DAYT_PRESSUREGAUGETEST_DETAIL string= "DAYT.PressureGaugeTest.Detail"
+	DAYT_PRESSUREGAUGETEST_DETAIL string = "DAYT.PressureGaugeTest.Detail"
 	// 离心泵机组液体输送系统节能监测原始记录
-	DAYT_LIQUIDTRANSPORTATION_DETAIL string= "DAYT.LiquidTransportation.Detail"
+	DAYT_LIQUIDTRANSPORTATION_DETAIL string = "DAYT.LiquidTransportation.Detail"
+	// 柱塞泵机组液体输送系统
+	DAYT_REPORTPISTONPUMPUNIT_DETAIL string = "DAYT.ReportPistonPumpUnit.Detail"
 )

src/dashoo.cn/backend/api/business/limsreportpistonpumpunit/limsreportpistonpumpunit.go

@@ -19,7 +19,7 @@ type LimsReportPistonPumpUnit struct {
 	Flow1               float64   `xorm:"comment('泵流量') DECIMAL(10,2)"`
 	Lift1               float64   `xorm:"comment('泵扬程') DECIMAL(10,2)"`
 	ShaftPower1         float64   `xorm:"comment('泵轴功率') DECIMAL(10,2)"`
-	Speed1              float64   `xorm:"comment('泵转速') DECIMAL(10,2)"`
+	RushTimes           float64   `xorm:"comment('冲次') DECIMAL(10,2)"`
 	Efficiency1         float64   `xorm:"comment('泵效率') DECIMAL(10,2)"`
 	RatedNoloadPower1   string    `xorm:"comment('泵制造厂') VARCHAR(50)"`
 	Model2              string    `xorm:"comment('电动机铭牌型号') VARCHAR(255)"`

src/dashoo.cn/backend/api/business/workflow/ActivitiService.go

@@ -36,8 +36,8 @@ func GetActivitiService(xormEngine *xorm.Engine) *ActivitiService {
 	s.BaseUrl = "http://47.92.212.59:8080/acti-api/api/acti"
 	//s.BaseUrl = "http://192.168.0.171:8081/api/acti"
 	s.AposeUrl = "http://47.92.212.59:8080/acti-api/api/apose"
-	//s.OriginUrl = "http://localhost:8081/api"
-	s.OriginUrl = "http://47.92.212.59:8080/acti-api/api"
+	s.OriginUrl = "http://localhost:8081/api"
+	//s.OriginUrl = "http://47.92.212.59:8080/acti-api/api"
 	//s.AposeUrl = "http://localhost:8081/api/apose"
 	//s.AposeUrl = "http://192.168.0.171:8081/api/apose"
 	s.Username = "leader"

src/dashoo.cn/backend/api/controllers/lims/limsdataentry.go

@@ -2,6 +2,7 @@ package lims
 
 import (
 	"dashoo.cn/backend/api/business/limsreportliquidtransportation"
+	"dashoo.cn/backend/api/business/limsreportpistonpumpunit"
 	"encoding/base64"
 	"encoding/json"
 	"errors"
@@ -1308,6 +1309,7 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 		DocUrl, err = svc.DocDataToExcel(entrustlist[0], dataentrylist, this.User.AccCode+LimsReportLeakProtectName, seqStr, fileurl, this.User.Description, userlist.Description)
 
 	case limsdoctemplate.DAYT_LIQUIDTRANSPORTATION_DETAIL:
+		// 离心泵机组液体输送系统
 		//seqStr := codecSvc.GetReportLeakProtectSequence(this.User.AccCode)
 		var model limsreportliquidtransportation.LimsReportLiquidTransportation
 		svc := limsreportliquidtransportation.GetLimsReportLiquidTransportationService(utils.DBE)
@@ -1326,7 +1328,28 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 			DocUrl = ""
 			err = errors.New("")
 		}
-
+	case limsdoctemplate.DAYT_REPORTPISTONPUMPUNIT_DETAIL:
+		// 柱塞泵机组液体输送系统
+		//seqStr := codecSvc.GetReportLeakProtectSequence(this.User.AccCode)
+		var model limsreportpistonpumpunit.LimsReportPistonPumpUnit
+		svc := limsreportpistonpumpunit.GetLimsReportPistonPumpUnitService(utils.DBE)
+		where1 := "DataEntryId=" + strconv.Itoa(dataentrylist.Id)
+		has := svc.GetEntityByWhere(this.User.AccCode+LimsReportPistonPumpUnitName, where1, &model)
+		datamap := StructToMapDemo(model)
+		svcActiviti := workflow.GetActivitiService(utils.DBE)
+		var template limsdoctemplate.LimsDocTemplate
+		wheretem := "Id=" + strconv.Itoa(entrustlist[0].DocId)
+		has = svc.GetEntityByWhere(this.User.AccCode+LimsDocTemplateName, wheretem, &template)
+		if (has) {
+			urlArr := strings.Split(template.FileURL, "|")
+			templateUrl := "http://" + urlArr[0]
+			fileName := urlArr[1]
+			DocUrl = svcActiviti.FillWordTemplate(datamap, templateUrl, fileName)
+			err = nil
+		} else {
+			DocUrl = ""
+			err = errors.New("")
+		}
 	}
 	return DocUrl, err
 }

src/dashoo.cn/backend/api/controllers/lims/limsreportpistonpumpunit.go

@@ -42,7 +42,7 @@ func (this *LimsReportPistonPumpUnitController) GetEntityList() {
 	Flow1 := this.GetString("Flow1")
 	Lift1 := this.GetString("Lift1")
 	ShaftPower1 := this.GetString("ShaftPower1")
-	Speed1 := this.GetString("Speed1")
+	RushTimes := this.GetString("RushTimes")
 	Efficiency1 := this.GetString("Efficiency1")
 	RatedNoloadPower1 := this.GetString("RatedNoloadPower1")
 	Model2 := this.GetString("Model2")
@@ -145,8 +145,8 @@ func (this *LimsReportPistonPumpUnitController) GetEntityList() {
 	}
 
 
-	if Speed1 != "" {
-		where = where + " and Speed1 like '%" + Speed1 + "%'"
+	if RushTimes != "" {
+		where = where + " and RushTimes like '%" + RushTimes + "%'"
 	}
 
 
@@ -635,7 +635,7 @@ func (this *LimsReportPistonPumpUnitController) UpdateEntity() {
 		"Flow1",
 		"Lift1",
 		"ShaftPower1",
-		"Speed1",
+		"RushTimes",
 		"Efficiency1",
 		"RatedNoloadPower1",
 		"Model2",

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/alltask.vue

@@ -712,7 +712,6 @@
             break;
             //无游梁式抽油机
           case "DAYT.NoBeamPumpingUnits.Detail":
-              debugger
             this.$router.push({
               path: '/lims/reportnobeampumpingUnits/subdata/dataopera',
               query: queryParams,
@@ -722,9 +721,16 @@
           case  "DAYT.LiquidTransportation.Detail":
             this.$router.push({
               path: '/lims/reportliquidtransportation/operation',
-              query: queryParams,
-            });
-            break;
+              query: queryParams
+            })
+            break
+          // 柱塞泵机组液体输送系统
+          case 'DAYT.ReportPistonPumpUnit.Detail':
+            this.$router.push({
+              path: '/lims/reportpistonpumpunit/operation',
+              query: queryParams
+            })
+            break
 
           default:
             this.$message.warning('无模板类型相匹配，请重试');

src/dashoo.cn/frontend_web/src/pages/lims/reportpistonpumpunit/_opera/operation.vue

@@ -83,9 +83,9 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="转速"
-                                  prop="Speed1">
-                      <el-input type="number" step="0.01" v-model.number="formData.Speed1" placeholder="请输入" style="width: 100%">
+                    <el-form-item label="冲次"
+                                  prop="RushTimes">
+                      <el-input type="number" step="0.01" v-model.number="formData.RushTimes" placeholder="请输入" style="width: 100%">
                         <template slot="append">r/min</template>
                       </el-input>
                     </el-form-item>
@@ -470,7 +470,7 @@
           Flow1: '',
           Lift1: '',
           ShaftPower1: '',
-          Speed1: '',
+          RushTimes: '',
           Efficiency1: '',
           RatedNoloadPower1: '',
           Model2: '',
@@ -548,9 +548,9 @@
       }
     },
     created () {
-      // this.EId = this.$route.query.eid
-      // this.TaskBalanceId = this.$route.query.tbid
-      this.DataEntryId = 15// this.$route.query.deid
+      this.EId = this.$route.query.eid
+      this.TaskBalanceId = this.$route.query.tbid
+      this.DataEntryId = this.$route.query.deid
       this.initData()
     },
     methods: {

src/dashoo.cn/frontend_web/src/pages/lims/tasksentrust/_opera/operation.vue

@@ -24,7 +24,7 @@
           <!-- <el-button size="mini" type="primary" class="el-button--small" style="margin-left: 8px" v-if="ServiceId > '0' && ServiceId!='addentrust' && !tjz"
             :disabled="mainForm.EntrustStatus != 0" @click="auditorShow=true">审核</el-button> -->
           <el-button size="mini" type="primary" class="el-button--small" style="margin-left: 8px" v-if="ServiceId > '0' && ServiceId!='addentrust' && mainForm.ISdeliver == 2"
-            :disabled="mainForm.EntrustStatus != 0 || !permissions[permissionscode.balance]" @click="balanceaction">分配</el-button>
+             @click="balanceaction">分配</el-button>
           <el-button size="mini" type="primary" class="el-button--small" style="margin-left: 8px" v-if="mainForm.EntrustStatus == 0"
             @click="trueEntrustNo">保存</el-button>
           <router-link :to="'/lims/tasksentrust'">