存储介质

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

@@ -92,6 +92,12 @@ type LimsReportHuxf struct {
 	DifPressTran       string    `xorm:"comment('压力变送器') VARCHAR(30)"`
 	StandardDesc       string    `xorm:"comment('依据标准描述') VARCHAR(255)"`
 	PUType             string    `xorm:"comment('新品 老品') VARCHAR(4)"`
+	StoreContainer     string    `xorm:"comment('存储介质') VARCHAR(500)"`
+	PressLevel         string    `xorm:"comment('压力分级') VARCHAR(50)"`
+	PosPressStart      string    `xorm:"default 0.00 comment('正开启压-启始') DECIMAL(10,2)"`
+	PosPressEnd        string    `xorm:"default 0.00 comment('正开启压-结尾') DECIMAL(10,2)"`
+	NgPressStart       string    `xorm:"default 0.00 comment('负开启压-启始') DECIMAL(10,2)"`
+	NgPressEnd         string    `xorm:"default 0.00 comment('负开启压-结尾') DECIMAL(10,2)"`
 	Remark1            string    `xorm:"VARCHAR(255)"`
 	Remark2            string    `xorm:"VARCHAR(255)"`
 	CreateOn           time.Time `xorm:"not null DATETIME"`

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

@@ -404,6 +404,7 @@ func (this *LimsReportHuxfController) GetDictList() {
 	dictList["Position"] = dictSvc.GetKeyValueItems("Position")
 	dictList["ProductStatus"] = dictSvc.GetKeyValueItems("ProductStatus")
 	dictList["YxCheckForm"] = dictSvc.GetKeyValueItems("YxCheckForm")
+	dictList["StoreContainer"] = dictSvc.GetKeyValueItems("StoreContainer")
 	var userEntity userRole.Base_User
 	userSvc.GetEntityById(this.User.Id, &userEntity)
 	dictList["Supervisers"] = userSvc.GetUserListByDepartmentId(this.User.AccCode, userEntity.Departmentid)
@@ -700,6 +701,12 @@ func (this *LimsReportHuxfController) UpdateEntity() {
 		"PosBaseNum7",
 		"PosBaseNum8",
 		"PosBaseNum9",
+		"StoreContainer",
+		"PressLevel",
+		"PosPressStart",
+		"PosPressEnd",
+		"Ngpressstart",
+		"Ngpressend",
 	}
 	err := svc.UpdateEntityBytbl(this.User.AccCode+LimsReportHuxfName, id, &model, cols)
 	if err == nil {

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

@@ -95,7 +95,7 @@
 
           <el-col :span="8">
             <el-form-item label="压力分级">
-              <el-select placeholder="请选择" style="width: 100%">
+              <el-select v-model="formData.PressLevel" placeholder="请选择" style="width: 100%">
                 <el-option
                   v-for="item in PressLevels"
                   :key="item.value"
@@ -107,19 +107,19 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="正开启压">
-              <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 47%">
+              <el-input v-model="formData.PosPressStart" @keyup.native="PosPressCheck('PosPressStart')" placeholder="请输入" style="width: 47%">
               </el-input>
               <span style="width: 6%">&nbsp;~&nbsp;</span>
-              <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 47%">
+              <el-input v-model="formData.PosPressEnd" @keyup.native="PosPressCheck('PosPressEnd')" placeholder="请输入" style="width: 47%">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="负开启压">
-              <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 47%">
+              <el-input v-model="formData.NgPressStart" @keyup.native="PosPressCheck('NgPressStart')" placeholder="请输入" style="width: 47%">
               </el-input>
               <span style="width: 6%">&nbsp;~&nbsp;</span>
-              <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 47%">
+              <el-input v-model="formData.NgPressEnd" @keyup.native="PosPressCheck('NgPressEnd')" placeholder="请输入" style="width: 47%">
               </el-input>
             </el-form-item>
           </el-col>
@@ -128,9 +128,24 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="存储介质">
-              <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%">
+              <!--<el-input v-model="formData.StoreContainer" placeholder="请输入" style="width: 100%">
                 <el-button slot="append" icon="el-icon-plus"></el-button>
-              </el-input>
+              </el-input>-->
+              <el-select
+                v-model="StoreContainerList"
+                multiple
+                filterable
+                allow-create
+                @change="handleStorContainerChange"
+                style="width: 100%"
+                placeholder="存储介质">
+                <el-option
+                  v-for="item in StoreContainerOptions"
+                  :key="item.Id"
+                  :label="item.Key"
+                  :value="item.Value">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -766,6 +781,12 @@
           DifPressTran: '',
           StandardDesc: '',
           PUType: 'O',
+          StoreContainer: '',
+          PressLevel: 'A',
+          PosPressStart: '',
+          PosPressEnd: '',
+          NgPressStart: '',
+          NgPressEnd: '',
           Remark1: '',
           Remark2: '',
           CreateOn: '',
@@ -801,6 +822,8 @@
         SafAccDetectorOptions: [],
         GasFlowMeterOptions: [],
         DifPressTranOptions: [],
+        StoreContainerOptions: [],
+        StoreContainerList: [],
         SpecOptions: [],
         entityList: [],
         groupOptions: [{
@@ -1050,6 +1073,9 @@
           this.Descdisabled = true
         }
       },
+      handleStorContainerChange () {
+        this.formData.StoreContainer = this.StoreContainerList.join(',')
+      },
       getDataEntry () {
         this.groupOptions[0].options = []
         this.groupOptions[1].options = []
@@ -1561,6 +1587,7 @@
               this.HxfType.HxfD = specArray[1]
               this.HxfType.Level = specArray[2]
             }
+            this.StoreContainerList = res.data.StoreContainer.split(',')
             // 刷新子列表
             this.$emit('init-data')
             if (this.continueInsertChecked) {
@@ -1592,6 +1619,8 @@
           this.SafAccDetectorOptions = res.data.items['SafAccDetector']
           this.GasFlowMeterOptions = res.data.items['GasFlowMeter']
           this.DifPressTranOptions = res.data.items['DifPressTran']
+          this.StoreContainerOptions = res.data.items['StoreContainer']
+
           this.HxfNoOptions = res.data.items['Spec1']
           this.ZJOptions = res.data.items['Spec2']
           this.LevelOption = res.data.items['Spec3']
@@ -1945,6 +1974,18 @@
           case 'PosPress9' :
             this.formData.PosPress9 = this.formData.PosPress9.replace(/[^0-9.]/g, '')
             break
+          case 'PosPressStart' :
+            this.formData.PosPressStart = this.formData.PosPressStart.replace(/[^0-9.]/g, '')
+            break
+          case 'PosPressEnd' :
+            this.formData.PosPressEnd = this.formData.PosPressEnd.replace(/[^0-9.]/g, '')
+            break
+          case 'NgPressStart' :
+            this.formData.NgPressStart = this.formData.NgPressStart.replace(/[^0-9.]/g, '')
+            break
+          case 'NgPressEnd' :
+            this.formData.NgPressEnd = this.formData.NgPressEnd.replace(/[^0-9.]/g, '')
+            break
         }
       },
       PosCloudCheck (str) {