宇信检测地点

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

@@ -41,10 +41,11 @@
               <el-row :gutter="10">
                 <el-col :span="8">
                   <el-form-item label="委托单位">
-                    <el-select disabled ref="selectEntrustCorp" v-model="EntrustCorp"  filterable placeholder="请选择" style="width: 100%" @change="TestDepartChange">
-                      <el-option v-for="item in EntrustCorpOptions" :key="item.Id" :label="item.CustomerName" :value="item.Id">
-                      </el-option>
-                    </el-select>
+                    <!--<el-select disabled ref="selectEntrustCorp" v-model="EntrustCorp"  filterable placeholder="请选择" style="width: 100%" @change="TestDepartChange">-->
+                      <!--<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-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -332,6 +333,7 @@
   import DataOpera from './dataopera.vue'
   import DataHistory from './datahistory.vue'
   import {makePy} from '@/utils/initials.js'
+  import eapi from '@/api/lims/dataEntry'
 
   export default {
     computed: {
@@ -396,6 +398,7 @@
         CGRMeterList: [],
         GRMeterList: [],
         EntrustCorp: '',
+        EntrustCorpName: '',
         formData: {
           TestDepartId: '',
           PositionCheckId: '',
@@ -852,6 +855,7 @@
         let EId = this.EId
         entrustApi.getEntrustInfo(EId, this.$axios).then(res => {
           this.EntrustCorp = res.data.CustomerId
+          this.EntrustCorpName = res.data.CustomerName
           let CustomerId = res.data.CustomerId
           // 获取级联所有信息
           this.getAllGrade(CustomerId)
@@ -883,8 +887,19 @@
           console.error(err)
         })
       },
-      changePositionCheck () {
+      changePositionCheck (val) {
         // this.$refs['DataoperaCompoment'].PositionCheckChange(this.PositionCheckId)
+        let params = {
+          EId: this.EId,
+          TaskBalanceId: this.TaskBalanceId,
+          DataEntryId: this.DataEntryId,
+          DataDocId: this.DataDocId,
+          PositionCheckId: val
+        }
+        eapi.getEntrustEquipment(params, this.$axios).then(res => {
+          this.entityList = []
+          this.initDatas()
+        })
       },
       // 更改受检单位触发检测地点和分布区域的改变
       TestDepartChange (Id) {

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

@@ -33,7 +33,7 @@
         </span>
       </div>
       <data-main :DataEntryId="DataEntryId + ''" :EId="EId + ''" :DataDocId="DataDocId+''" :TaskBalanceId="TaskBalanceId+''"
-                 :DataStatus="DataStatus" @init-data-main="initDatas"></data-main>
+                 :DataStatus="DataStatus" @init-data-main="initDatas" @getEntrustEquipment="getEntrustEquipment"></data-main>
       <el-table ref="EntityTable" :data="entityList" border height="calc(100vh - 345px)" highlight-current-row style="width: 100%" @sort-change="orderby"
                 @current-change="saveTableRow" @row-dblclick="dbTableRow">
         <el-table-column  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" label="操作" min-width="150" align="center" fixed>
@@ -254,7 +254,7 @@
 <script>
   import { mapGetters } from 'vuex'
   import api from '@/api/lims/reportequipotent'
-  import entrustApi from '@/api/lims/limsentrust'
+  import eapi from '@/api/lims/dataEntry'
   import DataOpera from './dataopera.vue'
   import DataMain from './datamain.vue'
   import cmp from '@/utils/strings.js'
@@ -361,6 +361,19 @@
       this.getUsersByRole()
     },
     methods: {
+      getEntrustEquipment (PositionCheckId) {
+        let params = {
+          EId: this.EId,
+          TaskBalanceId: this.TaskBalanceId,
+          DataEntryId: this.DataEntryId,
+          DataDocId: this.DataDocId,
+          PositionCheckId: PositionCheckId
+        }
+        eapi.getEntrustEquipment(params, this.$axios).then(res => {
+          this.entityList = []
+          this.initDatas()
+        })
+      },
       setCurrentRow (row) {
         this.$refs.EntityTable.setCurrentRow(row)
       },

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

@@ -8,14 +8,15 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="委托单位">
-              <el-select disabled ref="selectEntrustCorp" v-model="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-select disabled ref="selectEntrustCorp" v-model="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-form-item>
           </el-col>
 
@@ -36,7 +37,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: 70%"
-                         :filter-method="positionCheckFilter" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                         :filter-method="positionCheckFilter" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @change="changPositionCheck">
                 <el-option
                   v-for="item in PositionCheckOptions"
                   :key="item.Id"
@@ -124,6 +125,7 @@
         MainProductsList: [],
         MainProductsNoOptions: [],
         EntrustCorp: 0,
+        EntrustCorpName: '',
         PositionCheckId: '0',
         ResistanceStr: '',
         formData: {
@@ -152,6 +154,9 @@
       // this.getDataEntry(this.DataEntryId)
     },
     methods: {
+      changPositionCheck (val) {
+        this.$emit('getEntrustEquipment', val)
+      },
       positionCheckFilter (val) {
         if (val) {
           let len = val.length
@@ -234,7 +239,7 @@
         }
       },
       getDictOptions () {
-        api.getDictList(this.$axios).then(res => {f
+        api.getDictList(this.$axios).then(res => {
           this.EntrustCorpOptions = res.data.items['EntrustCorp']
           this.MainProductsList = res.data.items['MainProducts']
         }).catch(err => {
@@ -255,6 +260,7 @@
       getEntrustInfo (EId) {
         entrustApi.getEntrustInfo(EId, this.$axios).then(res => {
           this.EntrustCorp = res.data.CustomerId
+          this.EntrustCorpName = res.data.CustomerName
           this.getAllGrade(this.EntrustCorp)
         }).catch(err => {
           // handle error

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

@@ -32,7 +32,7 @@
         </span>
       </div>
       <data-main :DataEntryId="DataEntryId + ''" :EId="EId + ''" :DataDocId="DataDocId+''" :TaskBalanceId="TaskBalanceId+''"
-                 :DataStatus="DataStatus" @init-data-main="initDatas"></data-main>
+                 :DataStatus="DataStatus" @init-data-main="initDatas" @getEntrustEquipment="getEntrustEquipment"></data-main>
       <el-table ref="entityList" :data="entityList" border height="calc(100vh - 250px)" highlight-current-row style="width: 100%" @sort-change="orderby"
                 @current-change="saveTableRow" @row-dblclick="dbTableRow">
         <el-table-column  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" label="操作" min-width="150" align="center" fixed>
@@ -355,6 +355,7 @@
   import entrustApi from '@/api/lims/limsentrust'
   import DataOpera from './dataopera.vue'
   import DataMain from './datamain.vue'
+  import eapi from '@/api/lims/dataEntry'
 
   export default {
     computed: {
@@ -485,6 +486,19 @@
       this.getUsersByRole()
     },
     methods: {
+      getEntrustEquipment (PositionCheckId) {
+        let params = {
+          EId: this.EId,
+          TaskBalanceId: this.TaskBalanceId,
+          DataEntryId: this.DataEntryId,
+          DataDocId: this.DataDocId,
+          PositionCheckId: PositionCheckId
+        }
+        eapi.getEntrustEquipment(params, this.$axios).then(res => {
+          this.entityList = []
+          this.initDatas()
+        })
+      },
       // 获取校核人列表
       getUsersByRole () {
         // request

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

@@ -8,14 +8,15 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="委托单位">
-              <el-select disabled ref="selectEntrustCorp" v-model="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-select disabled ref="selectEntrustCorp" v-model="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-form-item>
           </el-col>
 
@@ -37,7 +38,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: 70%"
-                         :filter-method="positionCheckFilter"
+                         :filter-method="positionCheckFilter" @change="changPositionCheck"
                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                 <el-option
                   v-for="item in PositionCheckOptions"
@@ -113,6 +114,7 @@
         MainProductsList: [],
         MainProductsNoOptions: [],
         EntrustCorp: 0,
+        EntrustCorpName: '',
         PositionCheckId: '0',
         dataentry: {},
         PositionCheck: '',
@@ -142,6 +144,9 @@
       // this.getDataEntry(this.DataEntryId)
     },
     methods: {
+      changPositionCheck (val) {
+        this.$emit('getEntrustEquipment', val)
+      },
       positionCheckFilter (val) {
         if (val) {
           let len = val.length
@@ -263,6 +268,7 @@
       getEntrustInfo (EId) {
         entrustApi.getEntrustInfo(EId, this.$axios).then(res => {
           this.EntrustCorp = res.data.CustomerId
+          this.EntrustCorpName = res.data.CustomerName
           this.getAllGrade(this.EntrustCorp)
         }).catch(err => {
           // handle error

src/dashoo.cn/frontend_web/src/pages/lims/reportlightprotect/datareview.vue

@@ -40,7 +40,7 @@
       </div>
       <div>
         <data-main :DataEntryId="queryParamsdiglog.DataEntryId + ''" :EId="queryParamsdiglog.EId + ''" :DataDocId="queryParamsdiglog.DataDocId+''"
-                   :TaskBalanceId="queryParamsdiglog.TaskBalanceId+''" :DataStatus="queryParams.DataStatus" @init-data-main="initDatas"></data-main>
+                   :TaskBalanceId="queryParamsdiglog.TaskBalanceId+''" :DataStatus="queryParams.DataStatus" @init-data-main="initDatas" @getEntrustEquipment="getEntrustEquipment"></data-main>
         <el-table ref="EntityTable" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" highlight-current-row @sort-change="orderby"
                   @current-change="saveTableRow" @row-dblclick="dbTableRow">
           <el-table-column v-if="queryParams.DataStatus == 0||queryParams.DataStatus ==5||queryParams.DataStatus ==3" label="操作" min-width="150" align="center" fixed>
@@ -273,6 +273,7 @@
   import DataEditDialog from './subdata/dataopera.vue'
   import DataMain from './subdata/datamain.vue'
   import cmp from '@/utils/strings.js'
+  import eapi from '@/api/lims/dataEntry'
 
   export default {
     computed: {
@@ -440,6 +441,19 @@
       this.getDictOptions()
     },
     methods: {
+      getEntrustEquipment (PositionCheckId) {
+        let params = {
+          EId: this.queryParams.EId,
+          TaskBalanceId: this.queryParams.TaskBalanceId,
+          DataEntryId: this.queryParams.DataEntryId,
+          DataDocId: this.queryParams.DataDocId,
+          PositionCheckId: PositionCheckId
+        }
+        eapi.getEntrustEquipment(params, this.$axios).then(res => {
+          this.entityList = []
+          this.initDatas()
+        })
+      },
       // 打开校核弹窗
       jiaoheshowdialog () {
         this.jiaoheForm.DataEntryId = this.queryParams.DataEntryId

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

@@ -8,14 +8,15 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="委托单位">
-              <el-select disabled ref="selectEntrustCorp" v-model="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-select disabled ref="selectEntrustCorp" v-model="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-form-item>
           </el-col>
 
@@ -36,7 +37,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%"
-                         :filter-method="positionCheckFilter" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                         :filter-method="positionCheckFilter" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @change="changPositionCheck">
                 <el-option
                   v-for="item in PositionCheckOptions"
                   :key="item.Id"
@@ -143,6 +144,7 @@
         CGRMeterList: [],
         GRMeterList: [],
         EntrustCorp: 0,
+        EntrustCorpName: '',
         CGRMeterOptions: [],
         GRMeterOptions: [],
         formData: {
@@ -172,6 +174,9 @@
       // this.getDataEntry(this.DataEntryId)
     },
     methods: {
+      changPositionCheck (val) {
+        this.$emit('getEntrustEquipment', val)
+      },
       getDataHistory () {
         if (this.formData.TestDepartId <= 0 || this.formData.PositionCheckId <= 0) {
           this.$message.warning('受检单位、检测地点不能为空！')
@@ -222,6 +227,7 @@
       getEntrustInfo (EId) {
         entrustApi.getEntrustInfo(EId, this.$axios).then(res => {
           this.EntrustCorp = res.data.CustomerId
+          this.EntrustCorpName = res.data.CustomerName
           this.getAllGrade(this.EntrustCorp)
         }).catch(err => {
           // handle error