根据内外部单位显示小加号

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

@@ -394,6 +394,27 @@ func (this *LimsEnturstController) GetEntrustInfo() {
 	this.ServeJSON()
 }
 
+// @Title 查看是否为内部单位
+// @Description 获取委托单详情
+// @Success 200 {object} business.device.DeviceChannels
+// @router /getInner/:id [get]
+func (this *LimsEnturstController) GetInner() {
+	Id := this.Ctx.Input.Param(":id")
+	where := "a.Id = '" + Id + "'"
+	var model limsentrust.CustomerEntrustModel
+	svc := limsentrust.GetLimsEnturstService(utils.DBE)
+	model = svc.GetEntrustInfoWithCustomor(this.User.AccCode+LimsEntrustMainName, this.User.AccCode+CustomerName, this.User.AccCode+LimsSampleTypeName, this.User.AccCode+TestPackageTypesName, where)
+	var isinner myorganize.Base_Organize
+	organizeSvc := myorganize.GetOrganizeService(utils.DBE)
+	initem := strconv.Itoa(model.CustomerId)
+	innerwhere := " Id = '" + initem + "'"
+	isinner = organizeSvc.QueryEntity(innerwhere)
+	gatherData := make(map[string]interface{})
+	gatherData["IsInner"] = isinner.Isinnerorganize
+	this.Data["json"] = &gatherData
+	this.ServeJSON()
+}
+
 // @Title 获取委托单详情
 // @Description 获取委托单详情
 // @Success 200 {object} business.device.DeviceChannels

src/dashoo.cn/frontend_web/src/api/lims/limsentrust.js

@@ -1,6 +1,6 @@
-/*import axios from 'axios';*/
+/*import axios from 'axios'; */
 export default {
-  entrustList(EntrustTime, params, myAxios) {
+  entrustList (EntrustTime, params, myAxios) {
     return myAxios({
       url: '/limsentrust/entrustlist?EntrustTime=' + EntrustTime,
       method: 'GET',
@@ -8,15 +8,15 @@ export default {
     })
   },
 
-  entrustPlanList(EntrustTime, params, myAxios) {
+  entrustPlanList (EntrustTime, params, myAxios) {
     return myAxios({
       url: '/limsentrust/entrustplanlist?EntrustTime=' + EntrustTime,
       method: 'GET',
       params: params
-    });
+    })
   },
 
-  addEntrust(mainForm, myAxios) {
+  addEntrust (mainForm, myAxios) {
     return myAxios({
       url: '/limsentrust/addentrust',
       method: 'post',
@@ -24,8 +24,8 @@ export default {
     })
   },
 
-  editEntrust(serviceId, mainForm, myAxios) {
-    //return myAxios.put('limsentrust/editentrust/' + serviceId, mainForm)
+  editEntrust (serviceId, mainForm, myAxios) {
+    // return myAxios.put('limsentrust/editentrust/' + serviceId, mainForm)
     return myAxios({
       url: 'limsentrust/editentrust/' + serviceId,
       method: 'put',
@@ -33,7 +33,7 @@ export default {
     })
   },
 
-  applyEntrust(serviceId, mainForm, myAxios) {
+  applyEntrust (serviceId, mainForm, myAxios) {
     return myAxios({
       url: 'limsentrust/entrustsampleapply/' + serviceId,
       method: 'put',
@@ -41,19 +41,25 @@ export default {
     })
   },
 
-  getEntrustInfo(entityId, myAxios) {
+  getEntrustInfo (entityId, myAxios) {
     return myAxios({
       url: 'limsentrust/getentrustinfo/' + entityId,
       method: 'get'
     })
   },
+  getInner (entityId, myAxios) {
+    return myAxios({
+      url: 'limsentrust/getInner/' + entityId,
+      method: 'get'
+    })
+  },
 
-  waitestList(params, myAxios) {
+  waitestList (params, myAxios) {
     return myAxios({
       url: '/limsentrust/waitestlist',
       method: 'GET',
       params: params
-    });
-  },
+    })
+  }
 
 }

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

@@ -28,18 +28,18 @@
                   :value="item.Id">
                 </el-option>
               </el-select>
-              <!--<template>-->
-                <!--<el-popover-->
-                  <!--placement="left"-->
-                  <!--title="添加检测地点"-->
-                  <!--width="200"-->
-                  <!--trigger="click">-->
-                  <!--<el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>-->
-                  <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>-->
-                  <!--<el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-plus"></i>-->
-                  <!--</el-button>-->
-                <!--</el-popover>-->
-              <!--</template>-->
+              <template>
+                <el-popover
+                  placement="left"
+                  title="添加检测地点"
+                  width="200"
+                  trigger="click">
+                  <el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>
+                  <el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>
+                  <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" v-if=" IsInner != 1"><i class="el-icon-plus"></i>
+                  </el-button>
+                </el-popover>
+              </template>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -131,6 +131,7 @@
       return {
         Descdisabled: true,
         activeName: '1',
+        IsInner: 0,
         checkboxvalues: [],
         // 下拉选择项
         EntrustCorpOptions: [],
@@ -185,11 +186,12 @@
       this.getEntrustInfo(this.EId)
       // 查询列表
       // this.initDatas()
+      this.getInner(this.EId)
     },
     methods: {
       changPositionCheck (val) {
         this.PositionCheckOptions = this.PositionCheckOptionsBackUp
-        this.$emit('getEntrustEquipment',val)
+        this.$emit('getEntrustEquipment', val)
       },
       positionCheckFilter (val) {
         if (val) {
@@ -265,7 +267,14 @@
           console.error(err)
         })
       },
-
+      getInner (EId) {
+        entrustApi.getInner(EId, this.$axios).then(res => {
+          this.IsInner = res.data.IsInner
+        }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
       getDataEntry () {
         this.$axios.get('/limsdataentry/getdataentry/' + this.DataEntryId).then(res => {
           this.formData = res.data

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

@@ -14,7 +14,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="PositionId" label="安装位置" required :rules="[{ required: true, message: '安装位置不能为空'}]">
-              <el-select ref="selectPosition" v-model="formData.PositionId" filterable default-first-option placeholder="请选择" style="width: 65%"
+              <el-select ref="selectPosition" v-model="formData.PositionId" filterable default-first-option placeholder="请选择" style="width: 70%"
                          :filter-method="positionFilter" @change="initGroupOptions">
                 <el-option-group
                   v-for="group in groupOptions"
@@ -28,18 +28,18 @@
                   </el-option>
                 </el-option-group>
               </el-select>
-              <!--<template>-->
-                <!--<el-popover-->
-                  <!--placement="left"-->
-                  <!--title="添加安装位置"-->
-                  <!--width="200"-->
-                  <!--trigger="click">-->
-                  <!--<el-input ref="inputPosition" v-model="Position" size="small" style="width: 70%"></el-input>-->
-                  <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPosition">保存</el-button>-->
-                  <!--<el-button slot="reference"><i class="el-icon-plus"></i>-->
-                  <!--</el-button>-->
-                <!--</el-popover>-->
-              <!--</template>-->
+              <template>
+                <el-popover
+                  placement="left"
+                  title="添加安装位置"
+                  width="200"
+                  trigger="click">
+                  <el-input ref="inputPosition" v-model="Position" size="small" style="width: 70%"></el-input>
+                  <el-button size="small" style="width: 30%; text-align: center" @click="addPosition">保存</el-button>
+                  <el-button slot="reference" v-if="IsInner != 1"><i class="el-icon-plus"></i>
+                  </el-button>
+                </el-popover>
+              </template>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -259,6 +259,7 @@
         dialogVisible: false,
         serviceId: '',
         activeName: '1',
+        IsInner: 0,
         queryParams: {
           EId: 0,
           TaskBalanceId: 0,
@@ -376,6 +377,7 @@
       }
       // 初始值备份
       Object.assign(this.historyData, this.formData)
+      this.getInner(this.EId)
     },
     methods: {
       initGroupOptions () {
@@ -576,18 +578,18 @@
         this.formData.MainProducts = this.checkboxvalues.join(',')
       },
       setRemark1 () {
-          if (this.formData.Remark1 && this.formData.Remark1.length > 0) {
-            this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
-          } else {
-            this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
-          }
+        if (this.formData.Remark1 && this.formData.Remark1.length > 0) {
+          this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        } else {
+          this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        }
       },
       setRemark2 () {
-          if (this.formData.Remark2 && this.formData.Remark2.length > 0) {
-            this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
-          } else {
-            this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
-          }
+        if (this.formData.Remark2 && this.formData.Remark2.length > 0) {
+          this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        } else {
+          this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        }
       },
 
       setChosen () {
@@ -692,6 +694,14 @@
           console.error(err)
         })
       },
+      getInner (EId) {
+        entrustApi.getInner(EId, this.$axios).then(res => {
+          this.IsInner = res.data.IsInner
+        }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
       getEntrustCorpItems (CId) {
         this.$axios.get('/limsreporthuxf/getEntrustCorp/' + CId)
           .then(res => {

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

@@ -33,18 +33,18 @@
                     :value="item.Id">
                   </el-option>
                 </el-select>
-                <!--<template>-->
-                  <!--<el-popover-->
-                    <!--placement="left"-->
-                    <!--title="添加检测地点"-->
-                    <!--width="200"-->
-                    <!--trigger="click">-->
-                    <!--<el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>-->
-                    <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>-->
-                    <!--<el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-plus"></i>-->
-                    <!--</el-button>-->
-                  <!--</el-popover>-->
-                <!--</template>-->
+                <template>
+                  <el-popover
+                    placement="left"
+                    title="添加检测地点"
+                    width="200"
+                    trigger="click">
+                    <el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>
+                    <el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>
+                    <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" v-if=" IsInner != 1"><i class="el-icon-plus"></i>
+                    </el-button>
+                  </el-popover>
+                </template>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -176,6 +176,7 @@
       return {
         Descdisabled: true,
         activeName: '1',
+        IsInner: 0,
         checkboxvalues: [],
         // 下拉选择项
         EntrustCorpOptions: [],
@@ -233,6 +234,7 @@
       this.getEntrustInfo(this.EId)
       // 查询列表
       // this.initDatas()
+      this.getInner(this.EId)
     },
     methods: {
       changeInstrument (val) {
@@ -328,7 +330,14 @@
           console.error(err)
         })
       },
-
+      getInner (EId) {
+        entrustApi.getInner(EId, this.$axios).then(res => {
+          this.IsInner = res.data.IsInner
+        }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
       getDataEntry () {
         this.$axios.get('/limsdataentry/getdataentry/' + this.DataEntryId).then(res => {
           this.formData = res.data

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

@@ -33,18 +33,18 @@
                   </el-option>
                 </el-option-group>
               </el-select>
-              <!--<template>-->
-                <!--<el-popover-->
-                  <!--placement="left"-->
-                  <!--title="添加安装位置"-->
-                  <!--width="200"-->
-                  <!--trigger="click">-->
-                  <!--<el-input ref="inputPosition" v-model="Position" size="small" style="width: 70%"></el-input>-->
-                  <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPosition">保存</el-button>-->
-                  <!--<el-button slot="reference"><i class="el-icon-plus"></i>-->
-                  <!--</el-button>-->
-                <!--</el-popover>-->
-              <!--</template>-->
+              <template>
+                <el-popover
+                  placement="left"
+                  title="添加安装位置"
+                  width="200"
+                  trigger="click">
+                  <el-input ref="inputPosition" v-model="Position" size="small" style="width: 70%"></el-input>
+                  <el-button size="small" style="width: 30%; text-align: center" @click="addPosition">保存</el-button>
+                  <el-button slot="reference" v-if="IsInner != 1"><i class="el-icon-plus"></i>
+                  </el-button>
+                </el-popover>
+              </template>
             </el-form-item>
           </el-col>
 
@@ -676,6 +676,7 @@
         dialogVisible: false,
         serviceId: '',
         activeName: '1',
+        IsInner: 0,
         /* queryParams: {
           EId: 0,
           TaskBalanceId: 0,
@@ -899,6 +900,7 @@
       this.getDictOptions()
       // 初始值备份
       Object.assign(this.historyData, this.formData)
+      this.getInner(this.EId)
     },
     methods: {
       initGroupOptions () {
@@ -1047,18 +1049,18 @@
           })
       },
       setRemark1 () {
-          if (this.formData.Remark1 && this.formData.Remark1.length > 0) {
-            this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
-          } else {
-            this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
-          }
+        if (this.formData.Remark1 && this.formData.Remark1.length > 0) {
+          this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        } else {
+          this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        }
       },
       setRemark2 () {
-          if (this.formData.Remark2 && this.formData.Remark2.length > 0) {
-            this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
-          } else {
-            this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
-          }
+        if (this.formData.Remark2 && this.formData.Remark2.length > 0) {
+          this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        } else {
+          this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        }
       },
       setAllPosBaseNum (num) {
         this.formData.PosBaseNum1 = num
@@ -1667,6 +1669,14 @@
           console.error(err)
         })
       },
+      getInner (EId) {
+        entrustApi.getInner(EId, this.$axios).then(res => {
+          this.IsInner = res.data.IsInner
+        }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
       getSpecification (sid) {
         this.$axios.get('/limsentrust/getSpec/' + sid)
           .then(res => {

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

@@ -60,18 +60,18 @@
                     </el-option>
                   </el-option-group>
                 </el-select>
-                <!--<template>-->
-                  <!--<el-popover-->
-                    <!--placement="left"-->
-                    <!--title="添加检测地点"-->
-                    <!--width="200"-->
-                    <!--trigger="click">-->
-                    <!--<el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>-->
-                    <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>-->
-                    <!--<el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"><i class="el-icon-plus"></i>-->
-                    <!--</el-button>-->
-                  <!--</el-popover>-->
-                <!--</template>-->
+                <template>
+                  <el-popover
+                    placement="left"
+                    title="添加检测地点"
+                    width="200"
+                    trigger="click">
+                    <el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>
+                    <el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>
+                    <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" v-if="IsInner != 1"><i class="el-icon-plus"></i>
+                    </el-button>
+                  </el-popover>
+                </template>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -423,6 +423,7 @@
         activeName: '1',
         DataStatus: '0',
         sign: '2',
+        IsInner: 0,
         queryParams: {
           EId: 0,
           TaskBalanceId: 0,
@@ -580,6 +581,7 @@
 
       // 初始值备份
       Object.assign(this.historyData, this.formData)
+      this.getInner(this.queryParams.EId)
     },
     methods: {
       initGroupOptions () {
@@ -946,6 +948,14 @@
           console.error(err)
         })
       },
+      getInner (EId) {
+        entrustApi.getInner(EId, this.$axios).then(res => {
+          this.IsInner = res.data.IsInner
+        }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
       getEntrustCorpItems (CId) {
         this.$axios.get('/limsreportbeampumpingunits/getEntrustCorp/' + CId)
           .then(res => {

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

@@ -60,23 +60,23 @@
                 <el-col :span="8">
                   <el-form-item prop="PositionCheckId" label="检测地点" :rules="{ required: true, message: '检测地点不能为空！'}">
                     <el-select ref="selectPositionCheck" v-model="formData.PositionCheckId" filterable placeholder="请选择"
-                               style="width: 100%" @change="changePositionCheck" :filter-method="positionCheckFilter"
+                               style="width: 70%" @change="changePositionCheck" :filter-method="positionCheckFilter"
                                :disabled="DataStatus != 0 && DataStatus != 5&& DataStatus!=3">
                       <el-option v-for="item in PositionCheckOptions" :key="item.Id" :label="item.PositionName" :value="item.Id">
                       </el-option>
                     </el-select>
-                    <!--<template>-->
-                      <!--<el-popover-->
-                        <!--placement="left"-->
-                        <!--title="添加检测地点"-->
-                        <!--width="200"-->
-                        <!--trigger="click">-->
-                        <!--<el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>-->
-                        <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>-->
-                        <!--<el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-plus"></i>-->
-                        <!--</el-button>-->
-                      <!--</el-popover>-->
-                    <!--</template>-->
+                    <template>
+                      <el-popover
+                        placement="left"
+                        title="添加检测地点"
+                        width="200"
+                        trigger="click">
+                        <el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>
+                        <el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>
+                        <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" v-if=" IsInner != 1"><i class="el-icon-plus"></i>
+                        </el-button>
+                      </el-popover>
+                    </template>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -364,6 +364,7 @@
         activeName: '1',
         Id: 0,
         EId: '0',
+        IsInner: 0,
         DataStatus: 0,
         TaskBalanceId: '0',
         DataEntryId: '0',
@@ -479,6 +480,7 @@
       this.getEntrustInfo()
       this.isPermissionsByCode()
       // this.getDataEntry()
+      this.getInner(this.EId)
     },
     methods: {
       isPermissionsByCode () {
@@ -897,6 +899,15 @@
           console.error(err)
         })
       },
+
+      getInner (EId) {
+        entrustApi.getInner(EId, this.$axios).then(res => {
+          this.IsInner = res.data.IsInner
+        }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
       initDatas () {
         // 分页及列表条件
         let params = {

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

@@ -21,24 +21,24 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item prop="DistrictId" label="分布区域" :rules="{ required: true, message: '分布区域不能为空！'}">
-                  <el-select ref="selectDistrict" v-model="formData.DistrictId" filterable placeholder="请选择" style="width: 100%" :filter-method="DistrictFilter">
+                  <el-select ref="selectDistrict" v-model="formData.DistrictId" filterable placeholder="请选择" style="width: 70%" :filter-method="DistrictFilter">
                     <el-option-group v-for="group in groupOptions" :key="group.label" :label="group.label">
                       <el-option v-for="item in group.options" :key="item.Id" :label="item.PositionName" :value="item.Id">
                       </el-option>
                     </el-option-group>
                   </el-select>
-                  <!--<template>-->
-                  <!--<el-popover-->
-                    <!--placement="left"-->
-                    <!--title="添加分布位置"-->
-                    <!--width="150px"-->
-                    <!--trigger="click">-->
-                    <!--<el-input ref="inputDistrict" v-model="District" size="small" style="width: 70%"></el-input>-->
-                    <!--<el-button size="small" style="width: 30%; text-align: center" @click="addDistrict">保存</el-button>-->
-                    <!--<el-button slot="reference"><i class="el-icon-plus"></i>-->
-                    <!--</el-button>-->
-                  <!--</el-popover>-->
-                <!--</template>-->
+                  <template>
+                  <el-popover
+                    placement="left"
+                    title="添加分布位置"
+                    width="150px"
+                    trigger="click">
+                    <el-input ref="inputDistrict" v-model="District" size="small" style="width: 70%"></el-input>
+                    <el-button size="small" style="width: 30%; text-align: center" @click="addDistrict">保存</el-button>
+                    <el-button slot="reference" v-if="IsInner != 1"><i class="el-icon-plus"></i>
+                    </el-button>
+                  </el-popover>
+                </template>
                 </el-form-item>
               </el-col>
 
@@ -160,6 +160,7 @@
         dialogVisible: false,
         serviceId: '',
         activeName: '1',
+        IsInner: 0,
         queryParams: {
           EId: 0,
           TaskBalanceId: 0,
@@ -244,6 +245,7 @@
       }
       // 初始值备份
       Object.assign(this.historyData, this.formData)
+      this.getInner(this.EId)
     },
     methods: {
       DistrictFilter (val) {
@@ -426,6 +428,14 @@
           console.error(err)
         })
       },
+      getInner (EId) {
+        entrustApi.getInner(EId, this.$axios).then(res => {
+          this.IsInner = res.data.IsInner
+        }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
       getDistrict () {
         this.$axios.get('/limsreportelecground/getdistrict/' + this.PositionCheckId).then(res => {
           // this.groupOptions[0].options = res.data.items

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

@@ -53,7 +53,7 @@
                   trigger="click">
                   <el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>
                   <el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>
-                  <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-plus"></i>
+                  <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" v-if=" IsInner != 1"><i class="el-icon-plus"></i>
                   </el-button>
                 </el-popover>
               </template>
@@ -122,6 +122,7 @@
       return {
         PositionCheck: '',
         activeName: '1',
+        IsInner: 0,
         // 下拉选择项
         TestDepartOptions: [],
         EntrustCorpOptions: [],
@@ -159,6 +160,7 @@
       this.getDictOptions()
       this.getEntrustInfo(this.EId)
       // this.getDataEntry(this.DataEntryId)
+      this.getInner(this.EId)
     },
     methods: {
       changPositionCheck (val) {
@@ -274,6 +276,14 @@
           console.error(err)
         })
       },
+      getInner (EId) {
+        entrustApi.getInner(EId, this.$axios).then(res => {
+          this.IsInner = res.data.IsInner
+        }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
       getDataEntry () {
         this.$axios.get('/limsdataentry/getdataentry/' + this.DataEntryId).then(res => {
           this.formData = res.data

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

@@ -39,7 +39,7 @@
                     trigger="click">
                     <el-input ref="inputDistrict" v-model="District" size="small" style="width: 70%"></el-input>
                     <el-button size="small" style="width: 30%; text-align: center" @click="addDistrict">保存</el-button>
-                    <el-button slot="reference"><i class="el-icon-plus"></i>
+                    <el-button slot="reference" v-if="IsInner != 1"><i class="el-icon-plus"></i>
                     </el-button>
                   </el-popover>
                 </template>
@@ -128,6 +128,7 @@
     },
     data () {
       return {
+        IsInner: 0,
         District: '',
         continueInsertChecked: false,
         dialogVisible: false,
@@ -224,6 +225,7 @@
       }
       // 初始值备份
       Object.assign(this.historyData, this.formData)
+      this.getInner(this.EId)
     },
     methods: {
       DistrictFilter (val) {
@@ -403,6 +405,14 @@
           console.error(err)
         })
       },
+      getInner (EId) {
+        entrustApi.getInner(EId, this.$axios).then(res => {
+          this.IsInner = res.data.IsInner
+        }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
       positionSelectNext () {
         if (this.groupOptions[0].options.length > 0) {
           this.formData.DistrictId = this.groupOptions[0].options[0].Id

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

@@ -32,18 +32,18 @@
                   :value="item.Id">
                 </el-option>
               </el-select>
-              <!--<template>-->
-                <!--<el-popover-->
-                  <!--placement="left"-->
-                  <!--title="添加检测地点"-->
-                  <!--width="200"-->
-                  <!--trigger="click">-->
-                  <!--<el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>-->
-                  <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>-->
-                  <!--<el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-plus"></i>-->
-                  <!--</el-button>-->
-                <!--</el-popover>-->
-              <!--</template>-->
+              <template>
+                <el-popover
+                  placement="left"
+                  title="添加检测地点"
+                  width="200"
+                  trigger="click">
+                  <el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>
+                  <el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>
+                  <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" v-if="IsInner != 1"><i class="el-icon-plus"></i>
+                  </el-button>
+                </el-popover>
+              </template>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -170,6 +170,7 @@
       return {
         Descdisabled: true,
         activeName: '1',
+        IsInner: 0,
         checkboxvalues: [],
         // 下拉选择项
         StandardItemsOptions: [],
@@ -233,6 +234,7 @@
       this.getEntrustInfo(this.EId)
       // 查询列表
       // this.initDatas()
+      this.getInner(this.EId)
     },
     methods: {
       changeInstrument (val) {
@@ -249,7 +251,7 @@
       },
       changPositionCheck (val) {
         this.PositionCheckOptions = this.PositionCheckOptionsBackUp
-        this.$emit('getEntrustEquipment',val)
+        this.$emit('getEntrustEquipment', val)
       },
       positionCheckFilter (val) {
         if (val) {
@@ -324,6 +326,14 @@
           console.error(err)
         })
       },
+      getInner (EId) {
+        entrustApi.getInner(EId, this.$axios).then(res => {
+          this.IsInner = res.data.IsInner
+        }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
 
       getDataEntry () {
         this.$axios.get('/limsdataentry/getdataentry/' + this.DataEntryId).then(res => {

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

@@ -29,18 +29,18 @@
                     </el-option>
                   </el-option-group>
                 </el-select>
-                <!--<template>-->
-                  <!--<el-popover-->
-                    <!--placement="left"-->
-                    <!--title="添加安装位置"-->
-                    <!--width="200"-->
-                    <!--trigger="click">-->
-                    <!--<el-input ref="inputPosition" v-model="Position" size="small" style="width: 70%"></el-input>-->
-                    <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPosition">保存</el-button>-->
-                    <!--<el-button slot="reference"><i class="el-icon-plus"></i>-->
-                    <!--</el-button>-->
-                  <!--</el-popover>-->
-                <!--</template>-->
+                <template>
+                  <el-popover
+                    placement="left"
+                    title="添加安装位置"
+                    width="200"
+                    trigger="click">
+                    <el-input ref="inputPosition" v-model="Position" size="small" style="width: 70%"></el-input>
+                    <el-button size="small" style="width: 30%; text-align: center" @click="addPosition">保存</el-button>
+                    <el-button slot="reference" v-if="IsInner != 1"><i class="el-icon-plus"></i>
+                    </el-button>
+                  </el-popover>
+                </template>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -371,6 +371,7 @@
         dialogVisible: false,
         serviceId: '',
         activeName: '1',
+        IsInner: 0,
         // queryParams: {
         //   EId: 0,
         //   TaskBalanceId: 0,
@@ -506,6 +507,7 @@
       }
       // 初始值备份
       Object.assign(this.historyData, this.formData)
+      this.getInner(this.EId)
     },
     methods: {
       initGroupOptions () {
@@ -817,18 +819,18 @@
         }
       },
       setRemark1 () {
-          if (this.formData.Remark1 && this.formData.Remark1.length > 0) {
-            this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
-          } else {
-            this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
-          }
+        if (this.formData.Remark1 && this.formData.Remark1.length > 0) {
+          this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        } else {
+          this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        }
       },
       setRemark2 () {
-          if (this.formData.Remark2 && this.formData.Remark2.length > 0) {
-            this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
-          } else {
-            this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
-          }
+        if (this.formData.Remark2 && this.formData.Remark2.length > 0) {
+          this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        } else {
+          this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        }
       },
       setAllPosBaseNum (num) {
         this.formData.PosBaseNum1 = num
@@ -917,6 +919,14 @@
           console.error(err)
         })
       },
+      getInner (EId) {
+        entrustApi.getInner(EId, this.$axios).then(res => {
+          this.IsInner = res.data.IsInner
+        }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
       getEntrustCorpItems (CId) {
         this.$axios.get('/limsreporthuxf/getEntrustCorp/' + CId)
           .then(res => {

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

@@ -47,18 +47,18 @@
                   :value="item.Id">
                 </el-option>
               </el-select>
-              <!--<template>-->
-                <!--<el-popover-->
-                  <!--placement="left"-->
-                  <!--title="添加检测地点"-->
-                  <!--width="200"-->
-                  <!--trigger="click">-->
-                  <!--<el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>-->
-                  <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>-->
-                  <!--<el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-plus"></i>-->
-                  <!--</el-button>-->
-                <!--</el-popover>-->
-              <!--</template>-->
+              <template>
+                <el-popover
+                  placement="left"
+                  title="添加检测地点"
+                  width="200"
+                  trigger="click">
+                  <el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>
+                  <el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>
+                  <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" v-if=" IsInner != 1"><i class="el-icon-plus"></i>
+                  </el-button>
+                </el-popover>
+              </template>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -111,6 +111,7 @@
     data () {
       return {
         activeName: '1',
+        IsInner: 0,
         // 下拉选择项
         TestDepartOptions: [],
         TestDepartOptionsBackUp: [],
@@ -149,6 +150,7 @@
       this.getDictOptions()
       this.getEntrustInfo(this.EId)
       // this.getDataEntry(this.DataEntryId)
+      this.getInner(this.EId)
     },
     methods: {
       changPositionCheck (val) {
@@ -285,6 +287,14 @@
           console.error(err)
         })
       },
+      getInner (EId) {
+        entrustApi.getInner(EId, this.$axios).then(res => {
+          this.IsInner = res.data.IsInner
+        }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
       saveMainInfo () {
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {

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

@@ -33,7 +33,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item prop="PositionId" label="安装地点" :rules="{ required: true, message: '安装地点不能为空！'}">
-                <el-select ref="selectPosition" v-model="formData.PositionId"  placeholder="请选择" style="width: 80%"
+                <el-select ref="selectPosition" v-model="formData.PositionId"  placeholder="请选择" style="width: 70%"
                            filterable :filter-method="positionFilter">
                   <el-option-group
                     v-for="group in groupOptions"
@@ -47,18 +47,18 @@
                     </el-option>
                   </el-option-group>
                 </el-select>
-                <!--<template>-->
-                  <!--<el-popover-->
-                    <!--placement="left"-->
-                    <!--title="添加安装位置"-->
-                    <!--width="200"-->
-                    <!--trigger="click">-->
-                    <!--<el-input ref="inputPosition" v-model="Position" size="small" style="width: 70%"></el-input>-->
-                    <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPosition">保存</el-button>-->
-                    <!--<el-button slot="reference"><i class="el-icon-plus"></i>-->
-                    <!--</el-button>-->
-                  <!--</el-popover>-->
-                <!--</template>-->
+                <template>
+                  <el-popover
+                    placement="left"
+                    title="添加安装位置"
+                    width="200"
+                    trigger="click">
+                    <el-input ref="inputPosition" v-model="Position" size="small" style="width: 70%"></el-input>
+                    <el-button size="small" style="width: 30%; text-align: center" @click="addPosition">保存</el-button>
+                    <el-button slot="reference" v-if="IsInner != 1"><i class="el-icon-plus"></i>
+                    </el-button>
+                  </el-popover>
+                </template>
               </el-form-item>
             </el-col>
 
@@ -198,6 +198,7 @@
     data () {
       return {
         Position: '',
+        IsInner: 0,
         continueInsertChecked: false,
         dialogVisible: false,
         serviceId: '',
@@ -304,6 +305,7 @@
       }
       // 初始值备份
       Object.assign(this.historyData, this.formData)
+      this.getInner(this.EId)
     },
     methods: {
       positionFilter (val) {
@@ -542,6 +544,14 @@
           console.error(err)
         })
       },
+      getInner (EId) {
+        entrustApi.getInner(EId, this.$axios).then(res => {
+          this.IsInner = res.data.IsInner
+        }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
       positionSelectNext () {
         if (this.groupOptions[0].options.length > 0) {
           this.formData.PositionId = this.groupOptions[0].options[0].Id

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

@@ -36,7 +36,7 @@
 
           <el-col :span="8">
             <el-form-item prop="PositionCheckId" label="检测地点" :rules="{ required: true, message: '检测地点不能为空！'}">
-              <el-select ref="selectPositionCheck" v-model="formData.PositionCheckId" filterable placeholder="请选择" style="width: 100%"
+              <el-select ref="selectPositionCheck" v-model="formData.PositionCheckId" filterable placeholder="请选择" style="width: 70%"
                          :filter-method="positionCheckFilter" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @change="changPositionCheck">
                 <el-option
                   v-for="item in PositionCheckOptions"
@@ -45,18 +45,18 @@
                   :value="item.Id">
                 </el-option>
               </el-select>
-              <!--<template>-->
-                <!--<el-popover-->
-                  <!--placement="left"-->
-                  <!--title="添加检测地点"-->
-                  <!--width="200"-->
-                  <!--trigger="click">-->
-                  <!--<el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>-->
-                  <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>-->
-                  <!--<el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-plus"></i>-->
-                  <!--</el-button>-->
-                <!--</el-popover>-->
-              <!--</template>-->
+              <template>
+                <el-popover
+                  placement="left"
+                  title="添加检测地点"
+                  width="200"
+                  trigger="click">
+                  <el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>
+                  <el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>
+                  <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" v-if=" IsInner != 1"><i class="el-icon-plus"></i>
+                  </el-button>
+                </el-popover>
+              </template>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -139,6 +139,7 @@
     data () {
       return {
         activeName: '1',
+        IsInner: 0,
         // 下拉选择项
         TestDepartOptions: [],
         TestDepartOptionsBackUp: [],
@@ -179,6 +180,7 @@
       this.getDictOptions()
       this.getEntrustInfo(this.EId)
       // this.getDataEntry(this.DataEntryId)
+      this.getInner(this.EId)
     },
     methods: {
       changPositionCheck (val) {
@@ -241,6 +243,14 @@
           console.error(err)
         })
       },
+      getInner (EId) {
+        entrustApi.getInner(EId, this.$axios).then(res => {
+          this.IsInner = res.data.IsInner
+        }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
       setPositionCheckOptions (Id) {
         // 更新检测地点
         this.PositionCheckOptions = []

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

@@ -29,18 +29,18 @@
                     </el-option>
                   </el-option-group>
                 </el-select>
-                <!--<template>-->
-                  <!--<el-popover-->
-                    <!--placement="left"-->
-                    <!--title="添加分布位置"-->
-                    <!--width="150px"-->
-                    <!--trigger="click">-->
-                    <!--<el-input ref="inputDistrict" v-model="District" size="small" style="width: 70%"></el-input>-->
-                    <!--<el-button size="small" style="width: 30%; text-align: center" @click="addDistrict">保存</el-button>-->
-                    <!--<el-button slot="reference"><i class="el-icon-plus"></i>-->
-                    <!--</el-button>-->
-                  <!--</el-popover>-->
-                <!--</template>-->
+                <template>
+                  <el-popover
+                    placement="left"
+                    title="添加分布位置"
+                    width="150px"
+                    trigger="click">
+                    <el-input ref="inputDistrict" v-model="District" size="small" style="width: 70%"></el-input>
+                    <el-button size="small" style="width: 30%; text-align: center" @click="addDistrict">保存</el-button>
+                    <el-button slot="reference" v-if="IsInner != 1"><i class="el-icon-plus"></i>
+                    </el-button>
+                  </el-popover>
+                </template>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -134,6 +134,7 @@
 
     data () {
       return {
+        IsInner: 0,
         District: '',
         continueInsertChecked: false,
         dialogtitle: '',
@@ -234,6 +235,7 @@
         this.dialogtitle = '编辑'
       }
       this.initlist()
+      this.getInner(this.EId)
     },
     methods: {
       DistrictFilter (val) {
@@ -440,6 +442,14 @@
           console.error(err)
         })
       },
+      getInner (EId) {
+        entrustApi.getInner(EId, this.$axios).then(res => {
+          this.IsInner = res.data.IsInner
+        }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
       positionSelectNext () {
         if (this.groupOptions[0].options.length > 0) {
           this.formData.DistrictId = this.groupOptions[0].options[0].Id

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

@@ -66,18 +66,18 @@
                     </el-option>
                   </el-option-group>
                 </el-select>
-                <!--<template>-->
-                  <!--<el-popover-->
-                    <!--placement="left"-->
-                    <!--title="添加检测地点"-->
-                    <!--width="200"-->
-                    <!--trigger="click">-->
-                    <!--<el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>-->
-                    <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>-->
-                    <!--<el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"><i class="el-icon-plus"></i>-->
-                    <!--</el-button>-->
-                  <!--</el-popover>-->
-                <!--</template>-->
+                <template>
+                  <el-popover
+                    placement="left"
+                    title="添加检测地点"
+                    width="200"
+                    trigger="click">
+                    <el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>
+                    <el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>
+                    <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7" v-if="IsInner != 1"><i class="el-icon-plus"></i>
+                    </el-button>
+                  </el-popover>
+                </template>
               </el-form-item>
             </el-col>
 
@@ -420,6 +420,7 @@
 
     data () {
       return {
+        IsInner: 0,
         ProoFreadShow: false,
         Descdisabled: true,
         dialogVisible: false,
@@ -579,6 +580,7 @@
       this.getUsersByRole()
       // 初始值备份
       Object.assign(this.historyData, this.formData)
+      this.getInner(this.queryParams.EId)
     },
     methods: {
       initGroupOptions () {
@@ -944,6 +946,14 @@
           console.error(err)
         })
       },
+      getInner (EId) {
+        entrustApi.getInner(EId, this.$axios).then(res => {
+          this.IsInner = res.data.IsInner
+        }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
       getEntrustCorpItems (CId) {
         this.$axios.get('/limsreportbeampumpingunits/getEntrustCorp/' + CId)
           .then(res => {

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

@@ -48,7 +48,7 @@
                   </el-select>
                   <el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>
                   <el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>
-                  <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-plus"></i>
+                  <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" v-if=" IsInner != 1"><i class="el-icon-plus"></i>
                   </el-button>
                 </el-popover>
               </template>
@@ -179,6 +179,7 @@
         TestDepartId: '',
         Descdisabled: true,
         activeName: '1',
+        IsInner: 0,
         checkboxvalues: [],
         // 下拉选择项
         EntrustCorpOptions: [],
@@ -241,6 +242,7 @@
       this.getEntrustInfo(this.EId)
       // 查询列表
       // this.initDatas()
+      this.getInner(this.EId)
     },
     methods: {
       changeInstrument (val) {
@@ -339,7 +341,14 @@
           console.error(err)
         })
       },
-
+      getInner (EId) {
+        entrustApi.getInner(EId, this.$axios).then(res => {
+          this.IsInner = res.data.IsInner
+        }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
       getDataEntry () {
         this.$axios.get('/limsdataentry/getdataentry/' + this.DataEntryId).then(res => {
           this.formData = res.data

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

@@ -37,7 +37,7 @@
                     trigger="click">
                     <el-input ref="inputPosition" v-model="Position" size="small" style="width: 70%"></el-input>
                     <el-button size="small" style="width: 30%; text-align: center" @click="addPosition">保存</el-button>
-                    <el-button slot="reference"><i class="el-icon-plus"></i>
+                    <el-button slot="reference" v-if="IsInner != 1"><i class="el-icon-plus"></i>
                     </el-button>
                   </el-popover>
                 </template>
@@ -320,6 +320,7 @@
         dialogVisible: false,
         serviceId: '',
         activeName: '1',
+        IsInner: 0,
         queryParams: {
           EId: 0,
           TaskBalanceId: 0,
@@ -459,6 +460,7 @@
       }
       // 初始值备份
       Object.assign(this.historyData, this.formData)
+      this.getInner(this.EId)
     },
     methods: {
       initGroupOptions () {
@@ -597,18 +599,18 @@
       //   }
       // },
       setRemark1 () {
-          if (this.formData.Remark1 && this.formData.Remark1.length > 0) {
-            this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
-          } else {
-            this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
-          }
+        if (this.formData.Remark1 && this.formData.Remark1.length > 0) {
+          this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        } else {
+          this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
+        }
       },
       setRemark2 () {
-          if (this.formData.Remark2 && this.formData.Remark2.length > 0) {
-            this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
-          } else {
-            this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
-          }
+        if (this.formData.Remark2 && this.formData.Remark2.length > 0) {
+          this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        } else {
+          this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
+        }
       },
       getPwPaAvg () {
         var divisor = 0
@@ -798,6 +800,14 @@
           console.error(err)
         })
       },
+      getInner (EId) {
+        entrustApi.getInner(EId, this.$axios).then(res => {
+          this.IsInner = res.data.IsInner
+        }).catch(err => {
+          // handle error
+          console.error(err)
+        })
+      },
       getDataEntry () {
         this.groupOptions[0].options = []
         this.groupOptions[1].options = []