设备台账弹出框修改

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

@@ -226,14 +226,20 @@ func (this *LimsCheckEquipmentListController) GetEntity() {
 	Id := this.Ctx.Input.Param(":id")
 
 	var model limscheckequipmentlist.LimsCheckEquipmentList
+	var thrunit limscustomerposition.LimsCustomerPosition
 	var model1 []limscheckequipmentlist.Statutefile
 	svc := limscheckequipmentlist.GetLimsCheckEquipmentListService(utils.DBE)
+	tvc := limscustomerposition.GetLimsCustomerpositionService(utils.DBE)
 	svc.GetEntityByIdBytbl(this.User.AccCode+LimsCheckEquipmentListName, Id, &model)
+	var PosiitionId = model.PositionCheckId
 	svc.GetEntities(&model1," EId='"+Id+"'")
 
+	tvc.GetEntityByIdBytbl(this.User.AccCode+LimsCustomerpositionName,PosiitionId,&thrunit)
+
 	gatherData := make(map[string]interface{})
 	//登陆用户信息
 	gatherData["Items"] = model
+	gatherData["ThridUnit"] = thrunit.ThrUnitId
 	gatherData["FileItems"] = model1
 	this.Data["json"] = &gatherData
 	this.ServeJSON()

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

@@ -52,22 +52,10 @@
                            placeholder="按设备分类查询"
                            @change="ProjectTypeChangeHandler"
                            @clear="ProjectTypeClearHandler">
-                  <el-option-group
-                    v-for="group in options"
-                    :key="group.label"
-                    :label="group.label">
-                    <el-option
-                      v-for="item in group.options"
-                      :key="item.Id"
-                      :label="item.FullName"
-                      :value="item.Id">
-                    </el-option>
-                  </el-option-group>
-
-                  <!--<el-option v-for="item in projectTypeList"-->
-                             <!--:key="item.id"-->
-                             <!--:label="item.FullName"-->
-                             <!--:value="item.Id"></el-option>-->
+                  <el-option v-for="item in projectTypeList"
+                             :key="item.id"
+                             :label="item.FullName"
+                             :value="item.Id"></el-option>
                 </el-select>
               </el-form-item>
 
@@ -334,19 +322,18 @@
                     class="input-with-select"
                     @change="CheckCycleDate"
                     readonly>
-            <template slot="append">{{formData.CycleUnit}}</template>
-            <!--<el-select v-model="formData.CycleUnit"-->
-                       <!--slot="append"-->
-                       <!--placeholder="请选择"-->
-                       <!--style="width: 85px"-->
-                       <!--disabled>-->
-              <!--<el-option label="年"-->
-                         <!--value="年"></el-option>-->
-              <!--<el-option label="月"-->
-                         <!--value="月"></el-option>-->
-              <!--<el-option label="天"-->
-                         <!--value="天"></el-option>-->
-            <!--</el-select>-->
+            <el-select v-model="formData.CycleUnit"
+                       slot="append"
+                       placeholder="请选择"
+                       style="width: 85px"
+                       disabled>
+              <el-option label="年"
+                         value="年"></el-option>
+              <el-option label="月"
+                         value="月"></el-option>
+              <el-option label="天"
+                         value="天"></el-option>
+            </el-select>
           </el-input>
         </el-form-item>
         <el-form-item label="备注"
@@ -433,27 +420,8 @@ export default {
       }],
       detectionCycleList: [],
       FileItems: [],
+      ThridUnit: '',
       waituploads: [],
-      options: [{
-        label: '特检',
-        options: [
-          {Id: 179, FullName: '电气接地装置检测'},
-          {Id: 286, FullName: '防雷装置检测'},
-          {Id: 187, FullName: '防雷装置（等电位）检测'},
-          {Id: 181, FullName: '漏电保护器检测'}
-        ]
-      }, {
-        label: '宇信',
-        options: [
-          {Id: 156, FullName: '阻火器检测'},
-          {Id: 183, FullName: '呼吸阀检测'},
-          {Id: 154, FullName: '液压安全阀检测'},
-          {Id: 189, FullName: '空气泡沫产生器检测'},
-          {Id: 141, FullName: '游梁式抽油机检测'},
-          {Id: 173, FullName: '无游梁式抽油机检测'}
-        ]
-      }],
-
       statusValue: '',
       addoredittitle: '添加',
       QueryProjectTypeId: '',
@@ -801,16 +769,14 @@ export default {
       _this.$axios.get('/testtype/testypetreeall', {})
         .then(res => {
           _this.testTypeList = res.data.items
-          console.log(_this.testTypeList, '_this.testTypeList')
           if (!_this.testTypeList) {
             return false
           }
           for (var i = 0; i < _this.testTypeList.length; i++) {
-            if (_this.testTypeList[i].ParentId === 0) {
+            if (_this.testTypeList[i].ParentId == 0) {
               _this.projectTypeList.push(_this.testTypeList[i])
             }
           }
-          console.log(_this.projectTypeList, '_this.projectTypeList')
         })
         .catch(err => {
           // handle error
@@ -885,6 +851,7 @@ export default {
       this.formData.DepartmentId = 0
       this.formData.DepartmentName = ''
       this.formData.OrderNo = 0
+      this.ThridUnit = 0
       this.formData.PositionCheckId = 0
       this.formData.PositionCheck = ''
       this.formData.PositionID = 0
@@ -918,8 +885,10 @@ export default {
     },
 
     handlePositionChange (value) {
-      this.formData.PositionCheckId = value[0]
-      this.formData.PositionID = value[1]
+      console.log(value)
+      this.ThridUnit = value[0]
+      this.formData.PositionCheckId = value[1]
+      this.formData.PositionID = value[2]
     },
     ShowEntityDialog (entityId) {
       this.entityId = entityId
@@ -936,7 +905,9 @@ export default {
       if (entityId) {
         api.getEntity(entityId, this.$axios).then(res => {
           this.formData = res.data.Items
-          this.PositionList = [this.formData.PositionCheckId, this.formData.PositionID]
+          this.ThridUnit = res.data.ThridUnit
+          this.PositionList = [this.ThridUnit, this.formData.PositionCheckId, this.formData.PositionID]
+          console.log(this.PositionList)
           this.FileItems = res.data.FileItems
         }).catch(err => {
           console.error(err)
@@ -1042,8 +1013,9 @@ export default {
         if (valid) {
           this.saveLoading = true
           this.formData.TemplateTypeName = this.$refs.refProjectTypeId.selectedLabel + ''
-          this.formData.PositionCheck = this.$refs.cascaderPosition.presentText.split('/')[0]
-          this.formData.Position = this.$refs.cascaderPosition.presentText.split('/')[1]
+          this.formData.DepartmentId = this.$refs.cascaderPosition.presentText.split('/')[0]
+          this.formData.PositionCheck = this.$refs.cascaderPosition.presentText.split('/')[1]
+          this.formData.Position = this.$refs.cascaderPosition.presentText.split('/')[2]
           this.formData.Cycle = parseFloat(this.formData.Cycle)
           console.log(this.formData, 'this.formData')
           if (!this.formData.Id) {