抽油机-数据录入

src/dashoo.cn/backend/api/business/limsbalance/limsbalanceService.go

@@ -9,9 +9,9 @@ import (
 	"dashoo.cn/backend/api/business/limsdoctemplate"
 	"dashoo.cn/backend/api/business/limsentrustequipment"
 	"dashoo.cn/backend/api/business/limsreportbeampumpingunits"
-	"dashoo.cn/backend/api/business/limsreporthuxf"
 	"dashoo.cn/backend/api/business/limsreportelecground"
 	"dashoo.cn/backend/api/business/limsreportequipotent"
+	"dashoo.cn/backend/api/business/limsreporthuxf"
 	"dashoo.cn/backend/api/business/limsreportkqpm"
 	"dashoo.cn/backend/api/business/limsreportldbh"
 	"dashoo.cn/backend/api/business/limsreportlp"
@@ -113,6 +113,7 @@ func (this *LimsBalanceService) CreateDataentry(AccCode string, UserNames string
 	where2 := " b.Id= " + utils.ToStr(balancedata.DataDocId)
 	templatedata = svc.GetPagingTemplateSerch(AccCode+LimsDocTemplateName, AccCode+LimsDocTemplateDetailName, orderby, where2)
 	templatecode := templatedata[0].TemplateCode
+	var entrustEquipment []limsentrustequipment.LimsEntrustEquipment
 	//获取报告编码
 	var seqStr string
 	codecSvc := codecsequence.GetCodecSequenceService(utils.DBE)
@@ -141,12 +142,16 @@ func (this *LimsBalanceService) CreateDataentry(AccCode string, UserNames string
 	case limsdoctemplate.DAYT_BEAMPUMPINGUNIT_DETAIL:
 		//游梁式抽油机
 		seqStr = codecSvc.GetDetailBeamPumpingUnitsSequence(AccCode)
+		where := "EntrustMainId = " + Eid
+		svc.GetEntitysByWhere(AccCode + "LimsEntrustEquipment", where, &entrustEquipment)
 	case limsdoctemplate.DAYT_ZUHQ_DETAIL:
 		//阻火器
 		seqStr = codecSvc.GetDetailZuhqSequence(AccCode)
 	case limsdoctemplate.DAYT_NOBEAMPUMPINGUNIT_DETAIL:
 		//无游梁式抽油机
 		seqStr = codecSvc.GetDetailNoBeamPumpingUnitsSequence(AccCode)
+		where := "EntrustMainId = " + Eid
+		svc.GetEntitysByWhere(AccCode + "LimsEntrustEquipment", where, &entrustEquipment)
 	case limsdoctemplate.DAYT_ULTRASONICCALIBRATION_DETAIL:
 		//超声校准记录
 		seqStr = codecSvc.GetDetailUltrasonicCalibrationSequence(AccCode)
@@ -265,37 +270,84 @@ func (this *LimsBalanceService) CreateDataentry(AccCode string, UserNames string
 	//根据分配人员创建多条数据录入记录
 	ConUserIdList := strings.Split(balancedata.ConUserId, ",")
 	ConUserList := strings.Split(balancedata.ConUserBy, ",")
-	for i := 0; i < len(ConUserIdList); i++ {
-		var dataentryentity limsdataentry.LimsDateEntry
-		fileurl := strings.Split(templatedata[0].FileURL, "|")
-		dataentryentity.DataEntryCode = seqStr
-		dataentryentity.TaskId = balancedata.Id
-		dataentryentity.DocId = balancedata.DataDocId
-		dataentryentity.DocType = balancedata.DataDoc
-		dataentryentity.DocAddress = fileurl[0]
-		dataentryentity.EId = entrustmaindata.Id
-		dataentryentity.CustomerId = entrustmaindata.CustomerId
-		dataentryentity.CustomerName = entrustmaindata.CustomerName
-		dataentryentity.PositionCheck = entrustmaindata.AddressName
-		dataentryentity.PositionCheckId = entrustmaindata.AddressId
-		dataentryentity.DocName = fileurl[1]
-		dataentryentity.DocVersion = "v1"
-		dataentryentity.CheckStatus = 0
-		dataentryentity.CreateBy = ConUserList[i]
-		dataentryentity.CreateUserId, _ = utils.StrTo(ConUserIdList[i]).Int()
-		_, err = svc.InsertEntityBytbl(AccCode+LimsDateEntryName, &dataentryentity)
-		//err = this.adddataentrydetail(entrustmaindata.Id, dataentryentity.Id, balancedata.Id, templatecode, AccCode) ====20190828ln
-		//启动数据录入工作流
-		svcActiviti := workflow.GetActivitiService(utils.DBE)
-		var processInstanceId string
-		var RoleSet auditsetting.Base_OilAuditSetting
-		rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-		rsvc.GetAuditStepRoleEntity("Base_OilAuditSetting", DeptID, workflow.DATAAUDIT, &RoleSet)
-		processInstanceId = svcActiviti.StartProcess(RoleSet.WorkFlowCord, strconv.Itoa(dataentryentity.Id), ConUserIdList[i])
 
-		dataentryentity.DocKey = processInstanceId
-		err = this.UpdateEntityBytbl(AccCode+LimsDateEntryName, dataentryentity.Id, &dataentryentity, []string{"DocKey"})
+	if entrustEquipment != nil {
+		for _,item := range entrustEquipment {
+			for i := 0; i < len(ConUserIdList); i++ {
+				var dataentryentity limsdataentry.LimsDateEntry
+				fileurl := strings.Split(templatedata[0].FileURL, "|")
+				dataentryentity.DataEntryCode = seqStr
+				dataentryentity.TaskId = balancedata.Id
+				dataentryentity.DocId = balancedata.DataDocId
+				dataentryentity.DocType = balancedata.DataDoc
+				dataentryentity.DocAddress = fileurl[0]
+				dataentryentity.EId = entrustmaindata.Id
+				dataentryentity.CustomerId = entrustmaindata.CustomerId
+				dataentryentity.CustomerName = entrustmaindata.CustomerName
+				dataentryentity.PositionCheck = entrustmaindata.AddressName
+				dataentryentity.PositionCheckId = entrustmaindata.AddressId
+				dataentryentity.DocName = fileurl[1]
+				dataentryentity.DocVersion = "v1"
+				dataentryentity.CheckStatus = 0
+				dataentryentity.CreateBy = ConUserList[i]
+				dataentryentity.CreateUserId, _ = utils.StrTo(ConUserIdList[i]).Int()
+				_, err = svc.InsertEntityBytbl(AccCode+LimsDateEntryName, &dataentryentity)
+				err = this.addDataEntryDetailOil(entrustmaindata.Id, dataentryentity.Id, balancedata.Id, templatecode, AccCode, item)
+				//启动数据录入工作流
+				svcActiviti := workflow.GetActivitiService(utils.DBE)
+				var processInstanceId string
+				var RoleSet auditsetting.Base_OilAuditSetting
+				rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
+				rsvc.GetAuditStepRoleEntity("Base_OilAuditSetting", DeptID, workflow.DATAAUDIT, &RoleSet)
+				processInstanceId = svcActiviti.StartProcess(RoleSet.WorkFlowCord, strconv.Itoa(dataentryentity.Id), ConUserIdList[i])
+
+				dataentryentity.DocKey = processInstanceId
+				err = this.UpdateEntityBytbl(AccCode+LimsDateEntryName, dataentryentity.Id, &dataentryentity, []string{"DocKey"})
+			}
+			switch templatecode {
+			case limsdoctemplate.DAYT_NOBEAMPUMPINGUNIT_DETAIL:
+				//无游梁式抽油机
+				seqStr = codecSvc.GetDetailNoBeamPumpingUnitsSequence(AccCode)
+			case limsdoctemplate.DAYT_BEAMPUMPINGUNIT_DETAIL:
+				//游梁式抽油机
+				seqStr = codecSvc.GetDetailBeamPumpingUnitsSequence(AccCode)
+			}
+		}
+
+	}  else {
+		for i := 0; i < len(ConUserIdList); i++ {
+			var dataentryentity limsdataentry.LimsDateEntry
+			fileurl := strings.Split(templatedata[0].FileURL, "|")
+			dataentryentity.DataEntryCode = seqStr
+			dataentryentity.TaskId = balancedata.Id
+			dataentryentity.DocId = balancedata.DataDocId
+			dataentryentity.DocType = balancedata.DataDoc
+			dataentryentity.DocAddress = fileurl[0]
+			dataentryentity.EId = entrustmaindata.Id
+			dataentryentity.CustomerId = entrustmaindata.CustomerId
+			dataentryentity.CustomerName = entrustmaindata.CustomerName
+			dataentryentity.PositionCheck = entrustmaindata.AddressName
+			dataentryentity.PositionCheckId = entrustmaindata.AddressId
+			dataentryentity.DocName = fileurl[1]
+			dataentryentity.DocVersion = "v1"
+			dataentryentity.CheckStatus = 0
+			dataentryentity.CreateBy = ConUserList[i]
+			dataentryentity.CreateUserId, _ = utils.StrTo(ConUserIdList[i]).Int()
+			_, err = svc.InsertEntityBytbl(AccCode+LimsDateEntryName, &dataentryentity)
+			//err = this.adddataentrydetail(entrustmaindata.Id, dataentryentity.Id, balancedata.Id, templatecode, AccCode) ====20190828ln
+			//启动数据录入工作流
+			svcActiviti := workflow.GetActivitiService(utils.DBE)
+			var processInstanceId string
+			var RoleSet auditsetting.Base_OilAuditSetting
+			rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
+			rsvc.GetAuditStepRoleEntity("Base_OilAuditSetting", DeptID, workflow.DATAAUDIT, &RoleSet)
+			processInstanceId = svcActiviti.StartProcess(RoleSet.WorkFlowCord, strconv.Itoa(dataentryentity.Id), ConUserIdList[i])
+
+			dataentryentity.DocKey = processInstanceId
+			err = this.UpdateEntityBytbl(AccCode+LimsDateEntryName, dataentryentity.Id, &dataentryentity, []string{"DocKey"})
+		}
 	}
+
 	return err
 }
 func (this *LimsBalanceService) Adddataentrydetail(entrustmainId, dataentryid, balanceid int, templatecode, AccCode string) error {
@@ -620,3 +672,80 @@ func (this *LimsBalanceService) Adddataentrydetail(entrustmainId, dataentryid, b
 	}
 	return err
 }
+
+func (this *LimsBalanceService) addDataEntryDetailOil(entrustmainId, dataentryid, balanceid int, templatecode, AccCode string, item limsentrustequipment.LimsEntrustEquipment) error {
+	var err error
+	svc := limsdataentry.GetLimsDataEntryService(utils.DBE)
+	switch templatecode {
+
+	case limsdoctemplate.DAYT_BEAMPUMPINGUNIT_DETAIL:
+		//游梁式抽油机
+		var yl limsreportbeampumpingunits.LimsReportBeamPumpingUnits
+		yl.EId = entrustmainId
+		yl.TaskBalanceId = balanceid
+		yl.DataEntryId = dataentryid
+		yl.CustNo = item.CustNo
+		yl.Spec = item.Spec
+		yl.DeviceName = item.DeviceName
+		yl.DeviceId = item.DeviceId
+		yl.Position = item.Position
+		yl.PositionId = item.PositionID
+		yl.PositionCheckId = item.PositionCheckId
+		yl.PositionCheck = item.PositionCheck
+		yl.Manufacturer = item.Manufacturer
+		yl.CheckDate = time.Now()
+		yl.CreateOn = time.Now()
+		yl.Temperature = "0"
+		yl.RetarderTemp = "0"
+		yl.MachineNoise1 = "0"
+		yl.MachineNoise2 = "0"
+		yl.MachineNoise3 = "0"
+		yl.DownX = "0"
+		yl.MidDownX = "0"
+		yl.MiddleX = "0"
+		yl.MidUpX = "0"
+		yl.UpX = "0"
+		yl.DownY = "0"
+		yl.MidDownY = "0"
+		yl.MiddleY = "0"
+		yl.MidUpY = "0"
+		yl.UpY = "0"
+		svc.InsertEntityBytbl(AccCode+"LimsReportBeamPumpingUnits", &yl)
+	case limsdoctemplate.DAYT_NOBEAMPUMPINGUNIT_DETAIL:
+		//无游梁式抽油机
+		var wyl limsreportnobeampumpingunits.LimsReportNoBeamPumpingUnit
+		wyl.EId = entrustmainId
+		wyl.TaskBalanceId = balanceid
+		wyl.DataEntryId = dataentryid
+		wyl.OrderNo = strconv.Itoa(item.OrderNo)
+		wyl.CustNo = item.CustNo
+		wyl.Spec = item.Spec
+		wyl.DeviceName = item.DeviceName
+		wyl.DeviceId = item.DeviceId
+		wyl.Position = item.Position
+		wyl.PositionId = item.PositionID
+		wyl.PositionCheckId = item.PositionCheckId
+		wyl.PositionCheck = item.PositionCheck
+		wyl.Manufacturer = item.Manufacturer
+		wyl.CheckDate = time.Now()
+		wyl.CreateOn = time.Now()
+		wyl.Temperature = "0"
+		wyl.RetarderTemp = "0"
+		wyl.MachineNoise1 = "0"
+		wyl.MachineNoise2 = "0"
+		wyl.MachineNoise3 = "0"
+		wyl.DownX = "0"
+		wyl.MidDownX = "0"
+		wyl.MiddleX = "0"
+		wyl.MidUpX = "0"
+		wyl.UpX = "0"
+		wyl.DownY = "0"
+		wyl.MidDownY = "0"
+		wyl.MiddleY = "0"
+		wyl.MidUpY = "0"
+		wyl.UpY = "0"
+		svc.InsertEntityBytbl(AccCode+"LimsReportNoBeamPumpingUnit", &wyl)
+
+	}
+	return err
+}

src/dashoo.cn/backend/api/controllers/casbin/organize.go

@@ -43,9 +43,10 @@ func (this *OrganizesController) List() {
 
 	svcPerm := permission.GetPermissionService(utils.DBE)
 	isauth := svcPerm.IsAuthorized(this.User.Id, "Administrator")
+	IsInnerOrganize := this.GetString("IsInnerOrganize")
 	topid := ""
 	where := " 1=1 "
-	if !isauth && !svcPerm.IsAdmin(this.User.Id) {
+	if !isauth && !svcPerm.IsAdmin(this.User.Id) && IsInnerOrganize != "0" {
 		topid = svc.GetMyUnitDepartmentId(this.User.DepartmentId)
 		depids := svc.GetAllChildById(topid)
 		where = "( Createuserid=" + this.User.Id + " or id in (" + depids + "))"
@@ -56,8 +57,7 @@ func (this *OrganizesController) List() {
 
 	keyword := this.GetString("keyword")
 	parentid := this.GetString("parentid")
-	IsInnerOrganize := this.GetString("IsInnerOrganize")
-	where = where + " and ( IsInnerOrganize= " + IsInnerOrganize + " or ParentId=0 ) "
+	where = where + " and ( IsInnerOrganize= " + IsInnerOrganize + "  ) "
 	if keyword != "" {
 		where = where + " and Fullname like '%" + keyword + "%'"
 	}
@@ -121,11 +121,15 @@ func (this *OrganizesController) Listbandparentname() {
 		topid = svc.GetMyUnitDepartmentId(this.User.DepartmentId)
 	}
 
+	IsInnerOrganize := this.GetString("IsInnerOrganize")
 	depids := svc.GetAllChildById(topid)
-	where := "( a.Createuserid=" + this.User.Id + " or a.id in (" + depids + "))"
+	where := "1=1 "
+	if IsInnerOrganize == "1" {
+		where = " and ( a.Createuserid=" + this.User.Id + " or a.id in (" + depids + "))"
+	}
 	keyword := this.GetString("keyword")
 	parentid := this.GetString("parentid")
-	IsInnerOrganize := this.GetString("IsInnerOrganize")
+
 	where = where + " and ( a.IsInnerOrganize= " + IsInnerOrganize + " or a.ParentId=0 ) "
 	if keyword != "" {
 		where = where + " and a.Fullname like '%" + keyword + "%'"

src/dashoo.cn/frontend_web/src/components/Headbar1.vue

@@ -64,7 +64,6 @@
       getdepartment(){
         this.$axios.get('/limsentrust/getshow')
           .then(res => {
-            console.log(res.data.items, '=========')
             if (res.data.items === 'yx') {
               this.department = '宇信公司'
             } else if  (res.data.items === 'tjz') {

src/dashoo.cn/frontend_web/src/components/lims/attachlist.vue

@@ -175,7 +175,6 @@
         this.searchform.FileType = 1
         this.searchform.DataEntryId = this.DataEntryId
         Object.assign(params, this.searchform)
-        console.log("----333--",params)
         this.$axios.get('/limsdataentry/myfilelist/'+this.DataEntryId, {
             params
           })
@@ -199,7 +198,6 @@
         this.searchform.DataEntryId = this.DataEntryId
         this.searchform
         Object.assign(params, this.searchform)
-        console.log("----333--",params)
         this.$axios.get('/limsdataentry/myfilelist/'+this.DataEntryId, {
             params
           })

src/dashoo.cn/frontend_web/src/components/samples/cellscollectiondialog.vue

@@ -8,7 +8,7 @@
         <el-form-item label="附件说明">
           <el-input type="textarea" v-model="uploadform.UploadDesc" placeholder="附件说明"></el-input>
         </el-form-item>
-        <el-form-item label="附件上传" required> 
+        <el-form-item label="附件上传" required>
           <el-upload style="margin-top: 10px;" multiple="true" action="" ref="refuploadattach" :http-request="uploadrequest" class="attach-uploader"
             :show-file-list="true" :before-upload="beforeAvatarUpload">
             <i class="el-icon-plus attach-uploader-icon"></i>
@@ -111,7 +111,7 @@
       },
       savedata() {
         let _this = this
-        
+
         // 是否有上传附件判断
         if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
           // 上传附件是否完成判断
@@ -231,11 +231,10 @@
       },
 
       getDonorsInfoId() {
-        let _this = this 
+        let _this = this
         _this.$axios.get('donors/getIdCardlistId/' + _this.attrinfo.IdCard, {})
           .then(res => {
             _this.uploadform.Id = res.data.items.Id
-            console.log(".........",res.data.items.Id)
             _this.savedata()
           }).catch(err => {
             // handle error
@@ -243,7 +242,7 @@
           })
 
       },
-      
+
 
 
 

src/dashoo.cn/frontend_web/src/components/samples/choosesource0.vue

@@ -88,7 +88,6 @@
         _this.$axios.get('donors/getlistajax', { params })
           .then(res => {
             _this.sampsourcelist = res.data
-            console.log('---------------------ssssaa:', res.data)
           })
           .catch(err => {
             // handle error

src/dashoo.cn/frontend_web/src/components/table.vue

@@ -38,7 +38,6 @@
         this.multipleSelection = value
       },
       handleFilterChange (value) {
-        console.log(value)
       }
     }
   }

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

@@ -482,7 +482,6 @@
           params
         }).then(res => {
           this.stepcode = res.data
-          console.log(this.stepcode)
         })
           .catch(err => {
             console.error(err)
@@ -663,7 +662,6 @@
           docname: row.DocName,
           checkstaus: row.CheckStatus
         }
-        console.log(queryParams, 'queryParamsqueryParams')
         _this.$router.push({
           path: '/lims/dataentry/onlyofficesframe',
           query: queryParams

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

@@ -294,7 +294,6 @@
       },
       getDictOptions() {
         api.getDictList(this.$axios).then(res => {
-          console.log(res.data)
           this.wellList = res.data.items['WellNo']
           this.organnameList = res.data.items['OrganName']
           this.builderList = res.data.items['Builder']

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

@@ -701,7 +701,6 @@
       initDatas() {
         if (this.formData.DataEntryId) {
           api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
-            console.log("------resco------", res.data)
             this.formData = res.data.mainitem;
             this.formData.DetectBasis = 'JJG 635-2011《一氧化碳/二氧化碳红外气体分析器》检定规程'
             this.formData.StandardDesc = '一氧化碳/二氧化碳红外气体分析器检定装置'
@@ -783,9 +782,7 @@
         let _this = this
         _this.$axios.get('/instrument/initlistdata', {})
           .then(function (response) {
-            console.log("jkkfddf", response.data.items)
             _this.DeviceList = response.data.items
-            console.log("-_this._this.DeviceList------", _this.DeviceList)
             if (!_this.DeviceList) {
               return false
             }
@@ -838,7 +835,6 @@
           return item.id === value;
         });
         this.formData.StanDevice = obj.name
-        console.log(obj.name);
         let _this = this
         _this.InstrumentNo = value
         //访问接口
@@ -895,7 +891,7 @@
         var sum = 0
         if (row.Value1 !== '' &&  (row.Value1) !== 0) {
           divisor++
-          sum = sum + parseFloat(row.Value1) 
+          sum = sum + parseFloat(row.Value1)
         }
         if (row.Value2 !== '' &&  parseFloat(row.Value2) !== 0) {
           divisor++
@@ -1084,7 +1080,6 @@
       },
       //保存信息
       saveEntity() {
-        console.log("------this.formData.Id----", this.formData.Id)
         this.$refs['formData'].validate((valid) => {
           if (valid) {
             if (!this.formData.Id) {
@@ -1100,7 +1095,6 @@
       },
       //添加数据
       addEntityMain() {
-        console.log("-------this.formdata---", this.formData)
         for (var i = 0; i < this.certificateData.length; i++) {
           this.certificateData[i].InstrumentNo = this.formData.InstrumentNo
           this.certificateData[i].StanDevice = this.formData.StanDevice
@@ -1148,7 +1142,6 @@
           AlertOtherList: this.ReportAlerOtherData,//干扰误差
         }
         allform = Object.assign(allform, this.formCertificateData)
-        console.log("---------allform", allform)
         api.addEntity(allform, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
@@ -1171,7 +1164,6 @@
 
 
       updateEntity() {
-        console.log("------updatethis.formData.Id----", this.formData.Id)
         for (var i = 0; i < this.certificateData.length; i++) {
           this.certificateData[i].InstrumentNo = this.formData.InstrumentNo
           this.certificateData[i].StanDevice = this.formData.StanDevice
@@ -1219,7 +1211,6 @@
           AlertOtherList: this.ReportAlerOtherData,//干扰误差
         }
         allform = Object.assign(allform, this.formCertificateData)
-        console.log("---------allform", allform)
         api.updateEntity(this.formData.DataEntryId, allform, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
@@ -1247,7 +1238,7 @@
         column,
         _self
       }) {
-        console.log(createElement) //  function (a, b, c, d) { return createElement(vm, a, b, c, d, true); };
+        //  function (a, b, c, d) { return createElement(vm, a, b, c, d, true); };
         const label = column.label
         const labelArr = label.split(',')
         return createElement(
@@ -1258,7 +1249,7 @@
                 type: 'text'
               }
             }, [labelArr[0]]),
-            createElement('p', { // 创建第二个元素的标签可随意 
+            createElement('p', { // 创建第二个元素的标签可随意
               attrs: {
                 type: 'text',
                 style: 'font-size:12px'

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

@@ -718,7 +718,6 @@
       initDatas() {
         if (this.formData.DataEntryId) {
           api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
-            console.log("------resco2------", res.data)
             this.formData = res.data.mainitem;
             this.formData.DetectBasis = 'JJG 635-2011《一氧化碳/二氧化碳红外气体分析器》检定规程'
             this.formData.StandardDesc = '一氧化碳/二氧化碳红外气体分析器检定装置'
@@ -800,9 +799,7 @@
         let _this = this
         _this.$axios.get('/instrument/initlistdata', {})
           .then(function (response) {
-            console.log("jkkfddf", response.data.items)
             _this.DeviceList = response.data.items
-            console.log("-_this._this.DeviceList------", _this.DeviceList)
             if (!_this.DeviceList) {
               return false
             }
@@ -855,7 +852,6 @@
           return item.id === value;
         });
         this.formData.StanDevice = obj.name
-        console.log(obj.name);
         let _this = this
         _this.InstrumentNo = value
         //访问接口
@@ -1102,7 +1098,6 @@
 
       //保存信息
       saveEntity() {
-        console.log("------this.formData.Id----", this.formData.Id)
         this.$refs['formData'].validate((valid) => {
           if (valid) {
             if (!this.formData.Id) {
@@ -1118,7 +1113,6 @@
       },
       //添加数据
       addEntityMain() {
-        console.log("-------this.formdata---", this.formData)
         for (var i = 0; i < this.certificateData.length; i++) {
           this.certificateData[i].InstrumentNo = this.formData.InstrumentNo
           this.certificateData[i].StanDevice = this.formData.StanDevice
@@ -1167,7 +1161,6 @@
           AlertOtherList: this.ReportAlerOtherData, //干扰误差
         }
         allform = Object.assign(allform, this.formCertificateData)
-        console.log("---------allform", allform)
         api.addEntity(allform, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
@@ -1190,7 +1183,6 @@
 
 
       updateEntity() {
-        console.log("------updatethis.formData.Id----", this.formData.Id)
         for (var i = 0; i < this.certificateData.length; i++) {
           this.certificateData[i].InstrumentNo = this.formData.InstrumentNo
           this.certificateData[i].StanDevice = this.formData.StanDevice
@@ -1265,7 +1257,7 @@
         column,
         _self
       }) {
-        console.log(createElement) //  function (a, b, c, d) { return createElement(vm, a, b, c, d, true); };
+        //  function (a, b, c, d) { return createElement(vm, a, b, c, d, true); };
         const label = column.label
         const labelArr = label.split(',')
         return createElement(
@@ -1276,7 +1268,7 @@
                 type: 'text'
               }
             }, [labelArr[0]]),
-            createElement('p', { // 创建第二个元素的标签可随意 
+            createElement('p', { // 创建第二个元素的标签可随意
               attrs: {
                 type: 'text',
                 style: 'font-size:12px'

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

@@ -31,379 +31,379 @@
               </el-select>
             </el-form-item>
           </el-col>-->
-		  
+
           <!-- <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.Id" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Id" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="委托ID号">
-              <el-input v-model="formData.EId" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.EId" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="任务分配表ID">
-              <el-input v-model="formData.TaskBalanceId" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.TaskBalanceId" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="数据记录表ID">
-              <el-input v-model="formData.DataEntryId" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.DataEntryId" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col> -->
-		  
+
           <el-col :span="8">
             <el-form-item label="序号">
-              <el-input v-model="formData.OrderNo" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.OrderNo" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="安装位置">
-              <el-input v-model="formData.Position" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Position" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="编号">
-              <el-input v-model="formData.CustNo" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.CustNo" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="规格型号">
-              <el-input v-model="formData.Spec" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Spec" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="制造厂家">
-              <el-input v-model="formData.Manufacturer" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Manufacturer" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="产品状态">
-              <el-input v-model="formData.Status" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Status" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正开启压力Pa-1">
-              <el-input v-model="formData.PosPress1" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.PosPress1" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正开启压力Pa-2">
-              <el-input v-model="formData.PosPress2" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.PosPress2" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正开启压力Pa-3">
-              <el-input v-model="formData.PosPress3" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.PosPress3" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正开启压力Pa-4">
-              <el-input v-model="formData.PosPress4" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.PosPress4" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正开启压力Pa-5">
-              <el-input v-model="formData.PosPress5" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.PosPress5" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正开启压力Pa-6">
-              <el-input v-model="formData.PosPress6" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.PosPress6" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正开启压力Pa-7">
-              <el-input v-model="formData.PosPress7" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.PosPress7" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正开启压力Pa-8">
-              <el-input v-model="formData.PosPress8" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.PosPress8" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正开启压力Pa-9">
-              <el-input v-model="formData.PosPress9" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.PosPress9" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正开启压力Pa-平均值">
-              <el-input v-model="formData.PosPressAvg" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.PosPressAvg" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正压通气量1">
-              <el-input v-model="formData.PosCloud1" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.PosCloud1" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正压通气量2">
-              <el-input v-model="formData.PosCloud2" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.PosCloud2" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正压通气量3">
-              <el-input v-model="formData.PosCloud3" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.PosCloud3" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正压通气量-平均值">
-              <el-input v-model="formData.PosCloudAvg" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.PosCloudAvg" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正操作压力1">
-              <el-input v-model="formData.OperPress1" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.OperPress1" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正操作压力2">
-              <el-input v-model="formData.OperPress2" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.OperPress2" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正操作压力3">
-              <el-input v-model="formData.OperPress3" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.OperPress3" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正操作压力-平均值">
-              <el-input v-model="formData.OperPressAvg" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.OperPressAvg" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负操作压力1">
-              <el-input v-model="formData.OperPressNg1" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.OperPressNg1" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负操作压力2">
-              <el-input v-model="formData.OperPressNg2" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.OperPressNg2" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负操作压力3">
-              <el-input v-model="formData.OperPressNg3" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.OperPressNg3" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负操作压力-平均值">
-              <el-input v-model="formData.OperPressNgAvg" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.OperPressNgAvg" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负开启压力Pa-1">
-              <el-input v-model="formData.NgPress1" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.NgPress1" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负开启压力Pa-2">
-              <el-input v-model="formData.NgPress2" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.NgPress2" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负开启压力Pa-3">
-              <el-input v-model="formData.NgPress3" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.NgPress3" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负开启压力Pa-4">
-              <el-input v-model="formData.NgPress4" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.NgPress4" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负开启压力Pa-5">
-              <el-input v-model="formData.NgPress5" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.NgPress5" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负开启压力Pa-6">
-              <el-input v-model="formData.NgPress6" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.NgPress6" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负开启压力Pa-7">
-              <el-input v-model="formData.NgPress7" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.NgPress7" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负开启压力Pa-8">
-              <el-input v-model="formData.NgPress8" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.NgPress8" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负开启压力Pa-9">
-              <el-input v-model="formData.NgPress9" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.NgPress9" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负开启压力Pa-平均值">
-              <el-input v-model="formData.NgPressAvg" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.NgPressAvg" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负压通气量1">
-              <el-input v-model="formData.NgCloud1" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.NgCloud1" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负压通气量2">
-              <el-input v-model="formData.NgCloud2" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.NgCloud2" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负压通气量3">
-              <el-input v-model="formData.NgCloud3" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.NgCloud3" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负压通气量-平均值">
-              <el-input v-model="formData.NgCloudAvg" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.NgCloudAvg" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正p,Pa1">
-              <el-input v-model="formData.PosPa1" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.PosPa1" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正p,Pa2">
-              <el-input v-model="formData.PosPa2" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.PosPa2" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正p,Pa3">
-              <el-input v-model="formData.PosPa3" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.PosPa3" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="正p,Pa-平均值">
-              <el-input v-model="formData.PosPaAvg" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.PosPaAvg" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负p,Pa1">
-              <el-input v-model="formData.NgPa1" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.NgPa1" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负p,Pa2">
-              <el-input v-model="formData.NgPa2" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.NgPa2" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负p,Pa3">
-              <el-input v-model="formData.NgPa3" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.NgPa3" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="负p,Pa-平均值">
-              <el-input v-model="formData.NgPaAvg" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.NgPaAvg" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.Remark1" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Remark1" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.Remark2" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Remark2" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.CreateOn" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.CreateOn" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.CreateUserId" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.CreateUserId" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.CreateBy" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.CreateBy" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.ModifiedOn" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.ModifiedOn" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.ModifiedUserId" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.ModifiedUserId" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.ModifiedBy" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.ModifiedBy" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
         </el-row>
       </el-form>
     </el-card>
@@ -489,7 +489,7 @@
 		ModifiedOn: '',
 		ModifiedUserId: '',
 		ModifiedBy: '',
-		
+
         },
 
         //下拉选择项
@@ -501,7 +501,6 @@
     created() {
       this.serviceId = this.$route.params.opera;
       this.getDictOptions();
-      console.log(this.serviceId);
       if(this.serviceId != 'add' && this.serviceId>0) {
         this.formData.Id = this.serviceId;
         this.initDatas();
@@ -621,4 +620,4 @@
 
 <style lang="scss">
 
-</style>
+</style>

src/dashoo.cn/frontend_web/src/pages/lims/reportatmosvalve/subdata/datalist.vue

@@ -1045,7 +1045,6 @@
     },
     methods: {
       isPermissionsByCode () {
-        console.log(typeof this.DataStatus, this.DataStatus)
         let code = ''
         if (this.DataStatus == 2) {
           code = 'DATAPREAUDIT'
@@ -1060,7 +1059,6 @@
         this.$axios.get('/limsdataentry/ispermissionsbycode', {
           params
         }).then(res => {
-          console.log(res.data)
           this.isShow = res.data
         })
           .catch(err => {

src/dashoo.cn/frontend_web/src/pages/lims/reportbeampumpingUnits/subdata/dataopera.vue

@@ -36,11 +36,12 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="委托单位">
-                <el-select disabled ref="selectEntrustCorp" v-model="formData.EntrustCorp" filterable placeholder="请选择"
-                           style="width: 100%">
-                  <el-option v-for="item in EntrustCorpOptions" :key="item.Id" :label="item.CustomerName" :value="item.Id">
-                  </el-option>
-                </el-select>
+                <el-input v-model="EntrustCorpName" placeholder="请输入" style="width: 100%" readonly></el-input>
+                <!--<el-select disabled ref="selectEntrustCorp" v-model="formData.EntrustCorp" filterable placeholder="请选择"-->
+                           <!--style="width: 100%">-->
+                  <!--<el-option v-for="item in EntrustCorpOptions" :key="item.Id" :label="item.CustomerName" :value="item.Id">-->
+                  <!--</el-option>-->
+                <!--</el-select>-->
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -416,6 +417,7 @@
     },
     data () {
       return {
+        EntrustCorpName: '',
         ProoFreadShow: false,
         Descdisabled: true,
         dialogVisible: false,
@@ -941,6 +943,7 @@
       getEntrustInfo (EId) {
         entrustApi.getEntrustInfo(EId, this.$axios).then(res => {
           this.formData.EntrustCorp = res.data.CustomerId
+          this.EntrustCorpName = res.data.CustomerName
           this.getEntrustCorpItems(this.formData.EntrustCorp)
           this.getSpecification(res.data.DetectSampleId)
         }).catch(err => {

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

@@ -769,7 +769,6 @@
           return item.id === value;
         });
         this.formData.StanDevice = obj.name
-        console.log(obj.name);
         let _this = this
         _this.InstrumentNo = value
         //访问接口

src/dashoo.cn/frontend_web/src/pages/lims/reportelecground/subdata/datalist.vue

@@ -947,7 +947,6 @@
       },
       // 更改受检单位触发检测地点和分布区域的改变
       TestDepartChange (Id) {
-        console.log(Id)
         this.PositionCheckOptions = []
         for (let j = 0; j < this.PositionCheckOptionsBackUp.length; j++) {
           if (this.PositionCheckOptionsBackUp[j].ThrUnitId === Id) {

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

@@ -157,7 +157,6 @@
     created() {
       this.serviceId = this.$route.params.opera;
       this.getDictOptions();
-      console.log(this.serviceId);
       if(this.serviceId != 'add' && this.serviceId>0) {
         this.formData.Id = this.serviceId;
         this.initDatas();

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

@@ -309,7 +309,6 @@
     created() {
       this.serviceId = this.$route.params.opera;
       this.getDictOptions();
-      console.log(this.serviceId);
       if (this.serviceId != 'add' && this.serviceId > 0) {
         this.formData.Id = this.serviceId;
         this.initDatas();

src/dashoo.cn/frontend_web/src/pages/lims/reportleakprotect/subdata/datamain.vue

@@ -267,7 +267,6 @@
       },
       getAllGrade (customerId) {
         this.$axios.get('/limsreportelecground/allgradeinfo/' + customerId).then(res => {
-          console.log(res.data)
           this.TestDepartOptions = res.data.items['ThiUnits']
           this.PositionCheckOptions = res.data.items['PositionCheck']
           Object.assign(this.TestDepartOptionsBackUp, this.TestDepartOptions)

src/dashoo.cn/frontend_web/src/pages/lims/reportlightprotect/subdata/datamain.vue

@@ -203,7 +203,6 @@
       },
       InspecCorpChange (Id) {
         // 更新检测地点
-        console.log(Id)
         this.PositionCheckOptions = []
         this.formData.PositionCheckId = ''
         for (let j = 0; j < this.PositionCheckOptionsBackUp.length; j++) {

src/dashoo.cn/frontend_web/src/pages/lims/reportnobeampumpingUnits/subdata/dataopera.vue

@@ -41,11 +41,12 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="委托单位">
-                <el-select disabled ref="selectEntrustCorp" v-model="formData.EntrustCorp" filterable placeholder="请选择"
-                           style="width: 100%">
-                  <el-option v-for="item in EntrustCorpOptions" :key="item.Id" :label="item.CustomerName" :value="item.Id">
-                  </el-option>
-                </el-select>
+                <el-input v-model="EntrustCorpName" placeholder="请输入" style="width: 100%" readonly></el-input>
+                <!--<el-select disabled ref="selectEntrustCorp" v-model="formData.EntrustCorp" filterable placeholder="请选择"-->
+                           <!--style="width: 100%">-->
+                  <!--<el-option v-for="item in EntrustCorpOptions" :key="item.Id" :label="item.CustomerName" :value="item.Id">-->
+                  <!--</el-option>-->
+                <!--</el-select>-->
               </el-form-item>
             </el-col>
 
@@ -420,6 +421,7 @@
 
     data () {
       return {
+        EntrustCorpName: '',
         IsInner: 0,
         ProoFreadShow: false,
         Descdisabled: true,
@@ -939,6 +941,7 @@
       getEntrustInfo (EId) {
         entrustApi.getEntrustInfo(EId, this.$axios).then(res => {
           this.formData.EntrustCorp = res.data.CustomerId
+          this.EntrustCorpName = res.data.CustomerName
           this.getEntrustCorpItems(this.formData.EntrustCorp)
           this.getSpecification(res.data.DetectSampleId)
         }).catch(err => {

src/dashoo.cn/frontend_web/src/pages/lims/secondcenter/towLevelCenter.vue

@@ -203,7 +203,6 @@
           Code: 'lims.secondcenter.all'
         }
         api.getAuthority(params, this.$axios).then(res => {
-          console.log(res, 'res.data.items')
           this.Isauthority = res.data.items['isauth']
           if (res.data.items['unitId'] !== '') {
             this.UnitCheckId = parseInt(res.data.items['unitId'])

src/dashoo.cn/frontend_web/src/pages/lims/taskplan/index.vue

@@ -319,7 +319,6 @@
         _this.$axios.get('/customer/customerlistbyorg', {})
           .then(res => {
             _this.customerlist = res.data.items
-            console.log(_this.customerlist)
           })
       },
 

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

@@ -292,7 +292,6 @@
           })
           .then(res => {
             if (res.data instanceof Array && res.data.length > 0) {
-              console.log(res.data)
               res.data.forEach(element => {
                 _this.permissions[element.Code] = element.Isperm
               });
@@ -303,7 +302,7 @@
             console.error(err)
           })
       },
-      
+
       jstimehandle(val) {
         if (val === '') {
           return '----'

src/dashoo.cn/frontend_web/src/pages/lims/tasksbalance/index.vue

@@ -451,7 +451,6 @@
           })
           .then(res => {
             if (res.data instanceof Array && res.data.length > 0) {
-              console.log(res.data)
               res.data.forEach(element => {
                 _this.permissions[element.Code] = element.Isperm
               });

src/dashoo.cn/frontend_web/src/pages/lims/tasksbalance/taskbalance.vue

@@ -367,7 +367,6 @@
           })
           .then(res => {
             if (res.data instanceof Array && res.data.length > 0) {
-              console.log(res.data)
               res.data.forEach(element => {
                 _this.permissions[element.Code] = element.Isperm
               });

src/dashoo.cn/frontend_web/src/pages/lims/wzjys/reportpetroleumpipe/_opera/datalist.vue

@@ -766,7 +766,6 @@
       },
       // 提交校核
       makesure () {
-        console.log(this.formDataMain.Id, '====')
         if (!this.formDataMain.Id || this.formDataMain.Id < 0) {
           this.$message.warning('没有保存，不能提交！')
           return
@@ -778,7 +777,6 @@
         })
           .then(() => {
             this.ProoFreadShow = false
-            console.log('1')
             this.checkstatus()
           })
           .catch(() => {})

src/dashoo.cn/frontend_web/src/pages/lims/wzjys/reportpetroleumpipe/_opera/operation.vue

@@ -268,7 +268,6 @@
       initDatas () {
         if (this.formData.Id) {
           api.getEntity(this.formData.Id, this.$axios).then(res => {
-            console.log('initDatas')
             this.formData = res.data
             this.$emit('init-data')
             if (this.continueInsertChecked) {

src/dashoo.cn/frontend_web/src/pages/lims/wzjys/reportpipedrillpipe/_opera/datalist.vue

@@ -777,7 +777,6 @@
         this.searchForm.DataEntryId = this.DataEntryId
         Object.assign(params, this.searchForm)
         // 访问接口
-        console.log(params, 'params')
         api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
@@ -846,7 +845,6 @@
       },
       // 提交校核
       makesure () {
-        console.log(this.formDataMain.Id, '====')
         if (!this.formDataMain.Id || this.formDataMain.Id < 0) {
           this.$message.warning('没有保存，不能提交！')
           return
@@ -858,7 +856,6 @@
         })
           .then(() => {
             this.ProoFreadShow = false
-            console.log('1')
             this.checkstatus()
           })
           .catch(() => {})

src/dashoo.cn/frontend_web/src/pages/lims/wzjys/reportpipedrillpipe/_opera/operation.vue

@@ -328,7 +328,6 @@
       initDatas () {
         if (this.formData.Id) {
           api.getEntity(this.formData.Id, this.$axios).then(res => {
-            console.log('initDatas')
             this.formData = res.data
             this.$emit('init-data')
             if (this.continueInsertChecked) {

src/dashoo.cn/frontend_web/src/pages/material/materialCK/_opera/operation.vue

@@ -1363,7 +1363,6 @@
           })
           .then(res => {
             if (res.data instanceof Array && res.data.length > 0) {
-              console.log(res.data)
               res.data.forEach(element => {
                 _this.permissions[element.Code] = element.Isperm
               });

src/dashoo.cn/frontend_web/src/pages/setting/admincoderule/_opera/admincoderuleedit.vue

@@ -106,7 +106,6 @@
           this.$axios.get('admincoderule/getmodel/' + pid, {})
             .then(res => {
               // response
-              console.log(res.data)
               _this.admincoderuleinfoform = res.data
               _this.formtype = res.data.RuleItem + ''
               // _this.currentItemCount = res.data.currentItemCount

src/dashoo.cn/frontend_web/src/pages/setting/admincoderule/index.vue

@@ -116,7 +116,6 @@
           })
           .then(res => {
             // response
-            console.log(res.data)
             this.list = res.data.items
             _this.currentItemCount = res.data.currentItemCount
           })

src/dashoo.cn/frontend_web/src/pages/setting/materialstorehouse/_opera/edit.vue

@@ -257,7 +257,7 @@
           })
           .then(res => {
             _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
-            
+
           })
           .catch(err => {
             // handle error
@@ -337,7 +337,6 @@
         let _this = this
         _this.$axios.get('/materialstorehouse/editmaterialstorehouseinfo/' + pid)
           .then(function (response) {
-            console.log("------123123-------", )
             _this.formmodel = response.data
             // _this.selectedorg[_this.selectedorg.length - 1] = response.data.OrgId
             //console.log("-----------111111---------",_this.selectedorg[_this.selectedorg.length - 1])

src/dashoo.cn/frontend_web/src/pages/setting/paramset/index.vue

@@ -66,7 +66,6 @@
         _this.$axios.get('paramset/getparamset', {})
           .then(res => {
             // response
-            console.log('------------------------', res)
             if (res.data && res.data.length > 0) {
               for (var i = 0; i < res.data.length; i++) {
                 switch (res.data[i].Parametercode) {

src/dashoo.cn/frontend_web/src/pages/setting/samplenoteitem/_opera/operation.vue

@@ -85,7 +85,7 @@
     name: 'samplenoteitem',
     data() {
       return {
-        pagetitle: '', //界面标题       
+        pagetitle: '', //界面标题
         sampleItemForm: {
           Id: '',
           AccCode: '',
@@ -199,7 +199,6 @@
               _this.sampleItemForm.FieldContent = _this.Listvalues + ''
             }
             _this.sampleItemForm.FieldTypeName = _this.$refs.typeselect.selectedLabel
-            console.log("1111111111111", _this.sampleItemForm)
             _this.$axios.put('samplenoteitem/' + _this.ServiceId, _this.sampleItemForm)
               .then(res => {
                 // response

src/dashoo.cn/frontend_web/src/pages/setting/samplenoteitem0.vue

@@ -176,7 +176,6 @@
               // response
               _this.list = res.data.items
               _this.currentItemCount = res.data.currentItemCount
-              console.log(res.data)
             })
             .catch(err => {
               // handle error
@@ -309,10 +308,8 @@
       this.initData()
     },
       handleRemove(file, fileList) {
-        console.log(file, fileList)
                                    },
       handlePreview(file) {
-        console.log(file)
       }
     }
   }

src/dashoo.cn/frontend_web/src/pages/setting/samplesite0.vue

@@ -311,7 +311,6 @@
       this.initData()
     },
       handleRemove(file, fileList) {
-        console.log(file, fileList)
                                    },
       handlePreview(file) {
         console.log(file)

src/dashoo.cn/frontend_web/src/pages/setting/sampletemplate/sampletemplateadd.vue

@@ -11,7 +11,7 @@
       <span>
         <i class="icon icon-table2"></i> 添加样本导入模板
       </span>
-      <span style="float: right;">      
+      <span style="float: right;">
           <el-button  type="primary" @click="savedata('dataform')" class="el-button--small">保存</el-button>
           <el-button  type="primary" class="el-button--small" onclick="window.history.go(-1)">返回</el-button>
       </span>
@@ -144,7 +144,6 @@
     },
     methods: {
       initData () {
-        console.log('-')
       },
       getextends() {
         let _this = this

src/dashoo.cn/frontend_web/src/pages/setting/sampletype/_opera/sampletypeedit.vue

@@ -31,7 +31,7 @@
               </el-form-item>
           </el-col>
 
-      
+
             <el-col :span="8">
               <el-form-item label="名称" prop="Name" ><el-input placeholder="请输入名称" v-model="SampleTypeForm.Name"></el-input></el-form-item>
               <el-form-item label="默认容量">
@@ -45,7 +45,7 @@
           </el-col>
            <el-col :span="8">
                 <el-form-item label="分装容量" required>
-                  <el-input v-model="SampleTypeForm.SubpackageCapacity" placeholder="分装容量"></el-input>  
+                  <el-input v-model="SampleTypeForm.SubpackageCapacity" placeholder="分装容量"></el-input>
                 </el-form-item>
               </el-col>
 
@@ -238,7 +238,6 @@ export default {
           _this.SampleTypeForm.SubpackageCapacity = parseFloat(
             _this.SampleTypeForm.SubpackageCapacity
           );
-          console.log("________________---------",_this.SampleTypeForm)
           _this.$axios
             .put("sampletype/" + _this.SampleTypeForm.id, _this.SampleTypeForm)
             .then(res => {

src/dashoo.cn/frontend_web/src/pages/setting/testlist/packagesetting/_opera/packagesettingedit.vue

@@ -214,12 +214,10 @@
               // 选中状态
               _this.selectedorg = []
               let pidarr = res.data.message.split(',')
-              console.log("=====112====",pidarr)
               for (var i = pidarr.length - 1; i >= 0; i--) {
                 if (pidarr[i] !== '0') {
                   _this.selectedorg.push(parseInt(pidarr[i]))
                 }
-                console.log("=====1======",_this.selectedorg)
               }
             } else {
               _this.$message({
@@ -325,7 +323,6 @@
         this.$axios.get('inspection/getpackage/' + pid, {})
           .then(res => {
             // response
-            console.log("-=======----",res.data)
             _this.testlistform = res.data
             this.clicktext = this.testlistform.CalcMethod
             this.gettreelist()

src/dashoo.cn/frontend_web/src/pages/setting/testprinttemplate/_opera/testprinttemplateedit.vue

@@ -21,7 +21,7 @@
             <el-form-item label="送检单位"  required prop="OrgId">
                   <el-cascader :options="orgtreelist" style="width: 100%" :props="orgtreeprops" change-on-select :show-all-levels="true" v-model="OrgId"
                     placeholder="请选择组织"></el-cascader>
-                </el-form-item> 
+                </el-form-item>
          </el-col>
 
           <el-col :span="8">
@@ -46,7 +46,7 @@
               <el-input v-model="testlistform.Describe" placeholder="请输入试管类型"></el-input>
             </el-form-item>
           </el-col>
-         
+
         </el-row>
       </el-form>
     </el-card>
@@ -96,7 +96,7 @@
             message: '请输入模板文件',
             trigger: 'blur'
           }]
-        
+
         },
         list: [],
         formLabelWidth: '130px',
@@ -166,7 +166,6 @@
         this.$axios.get('inspection/gettemplate/' + pid, {})
           .then(res => {
             // response
-             console.log(res.data.OrgId)
             _this.Parentid = res.data.OrgId
             _this.getdata()
              _this.testlistform.OrgId = this.OrgId[this.OrgId.length - 1]+''

src/dashoo.cn/frontend_web/src/pages/system/organize.vue

@@ -89,7 +89,7 @@
                 :value="item.unitvalue">
               </el-option>
             </el-select>
-        </el-form-item>      
+        </el-form-item>
         <el-form-item label="联系人" label-width="120px">
           <el-input v-model="organizeform.Contacts" auto-complete="off"></el-input>
         </el-form-item>
@@ -413,7 +413,6 @@
           this.$axios.get('organizes/parentlist/' + v.Parentid, {})
             .then(res => {
               if (res.data.code === 0) {
-                console.log(_this.organizeform)
                 _this.dialogtitle = `编辑组织信息（${v.Fullname}）`
                 _this.organizeform.parentid = v.Parentid
                 _this.organizeform.fullname = v.Fullname