Merge remote-tracking branch 'origin/dev' into dev

pages/meter-contract/contract-register/EditModal.vue

@@ -9,17 +9,17 @@
       <Col span="24">
         <Form id="test-item-form" :label-width="90" inline onsubmit="return false">
           <label class="label-sign" />
-          <Form-item :label-width="70" label="授权资质仪器名称" >
+          <Form-item :label-width="70" label="样品名称" >
             <Input
-              v-model="code"
+              v-model="name"
               @on-enter="_pageChange(1)"
-              placeholder="授权资质仪器名称"
+              placeholder="样品名称"
               style="width: 100%"
             />
           </Form-item>
           <Form-item label="检测依据名称">
             <Input
-              v-model="name"
+              v-model="basis"
               @on-enter="_pageChange(1)"
               placeholder="请输入检测依据名称"
               style="width: 100%"
@@ -102,7 +102,8 @@ export default {
       modalTitle: '',
       currentRowData: {},
       name: '',
-      code: ''
+      code: '',
+      basis: ''
     }
   },
   methods: {
@@ -110,6 +111,7 @@ export default {
       this.modalTitle = '选择检测依据'
       this.name = ''
       this.code = ''
+      this.basis = ''
       this._judge()
     },
     _judge() {
@@ -145,6 +147,9 @@ export default {
       if (this.code) {
         data.code = this.code
       }
+      if (this.basis) {
+        data.basis = this.basis
+      }
       return this.$extend(data, this.pageParams)
     },
     _search() {

pages/meter-contract/contract-register/VerificationModal.vue

@@ -9,14 +9,6 @@
       <Col span="24">
         <Form id="test-item-form" :label-width="90" inline onsubmit="return false">
           <label class="label-sign" />
-          <Form-item :label-width="70" label="授权资质仪器名称" >
-            <Input
-              v-model="code"
-              @on-enter="_pageChange(1)"
-              placeholder="授权资质仪器名称"
-              style="width: 100%"
-            />
-          </Form-item>
           <Form-item label="检测依据名称">
             <Input
               v-model="name"
@@ -56,8 +48,8 @@
       </Col>
       <Col span="24">
         <Page
-          :total="getPage.total"
-          :page-size="getPage.size"
+          :total="total"
+          :page-size="size"
           @on-change="_pageChange"
           @on-page-size-change="_pageRows"
           placement="top"
@@ -93,6 +85,8 @@ export default {
       },
       loading: true,
       pageParams: { rows: 20 },
+      total: 0,
+      size: 0,
       pageColumns: [
         { title: '检定依据', key: 'verification', width: 120 },
         { title: '检定依据名称', key: 'name', width: 140 }
@@ -110,7 +104,8 @@ export default {
       modalTitle: '',
       currentRowData: {},
       name: '',
-      code: ''
+      code: '',
+      verification: ''
     }
   },
   methods: {
@@ -118,6 +113,7 @@ export default {
       this.modalTitle = '选择检测依据'
       this.name = ''
       this.code = ''
+      this.verification = ''
       this._judge()
     },
     _judge() {
@@ -126,7 +122,7 @@ export default {
       this._page()
     },
     _page: async function() {
-      const result = await meterAptitude.page(this.formObj)
+      const result = await meterAptitude.page(this._searchParams())
       if (result) {
         this.getPage = result.records
         console.log(this.getPage)
@@ -134,6 +130,8 @@ export default {
           this.getPage[i].verification =
             this.getPage[i].code + this.getPage[i].name
         }
+        this.total = result.total
+        this.size = result.size
         this.loading = false
       }
     },
@@ -153,6 +151,9 @@ export default {
       if (this.code) {
         data.code = this.code
       }
+      if (this.verification) {
+        data.verification = this.verification
+      }
       return this.$extend(data, this.pageParams)
     },
     _search() {

pages/meter-entrust/client-online/EditModal.vue

@@ -9,17 +9,17 @@
       <Col span="24">
         <Form id="test-item-form" :label-width="90" inline onsubmit="return false">
           <label class="label-sign" />
-          <Form-item :label-width="70" label="授权资质仪器名称" >
+          <Form-item :label-width="70" label="样品名称" >
             <Input
-              v-model="code"
-              placeholder="授权资质仪器名称"
+              v-model="name"
+              placeholder="请输入样品名称"
               style="width: 100%"
               @on-enter="_pageChange(1)"
             />
           </Form-item>
           <Form-item label="检测依据名称">
             <Input
-              v-model="name"
+              v-model="basis"
               placeholder="请输入检测依据名称"
               style="width: 100%"
               @on-enter="_pageChange(1)"
@@ -57,8 +57,8 @@
       </Col>
       <Col span="24">
         <Page
-          :total="getPage.total"
-          :page-size="getPage.size"
+          :total="total"
+          :page-size="size"
           placement="top"
           show-total
           show-elevator
@@ -90,6 +90,8 @@ export default {
     return {
       loading: true,
       pageParams: { rows: 20 },
+      total: 0,
+      size: 0,
       pageColumns: [
         { title: '样品名称', key: 'name' },
         { title: '检定依据', key: 'code' },
@@ -100,7 +102,8 @@ export default {
       modalTitle: '',
       currentRowData: {},
       name: '',
-      code: ''
+      code: '',
+      basis: ''
     }
   },
   methods: {
@@ -108,6 +111,7 @@ export default {
       this.modalTitle = '选择检测依据'
       this.name = ''
       this.code = ''
+      this.basis = ''
       this._judge()
     },
     _judge() {
@@ -121,6 +125,8 @@ export default {
         console.log('查询结果')
         console.log(result)
         this.getPage = result.records
+        this.total = result.total
+        this.size = result.size
         this.loading = false
         console.log(this.getPage)
       }
@@ -141,6 +147,9 @@ export default {
       if (this.code) {
         data.code = this.code
       }
+      if (this.basis) {
+        data.basis = this.basis
+      }
       return this.$extend(data, this.pageParams)
     },
     _search() {

pages/meter-entrust/go-out-test/ContractModal.vue

@@ -9,33 +9,37 @@
       <Col span="24">
         <Form id="test-item-form" :label-width="90" inline onsubmit="return false">
           <label class="label-sign" />
-          <Form-item :label-width="70" label="授权资质仪器名称" >
+          <Form-item :label-width="70" label="委托单位" >
             <Input
-              v-model="code"
-              placeholder="授权资质仪器名称"
-              style="width: 100%"
+              v-model="client"
               @on-enter="_pageChange(1)"
+              placeholder="委托单位"
+              style="width: 100%"
             />
           </Form-item>
-          <Form-item label="检测依据名称">
+          <Form-item label="合同编号">
             <Input
-              v-model="name"
-              placeholder="请输入检测依据名称"
-              style="width: 100%"
+              v-model="salesCode"
               @on-enter="_pageChange(1)"
+              placeholder="合同编号"
+              style="width: 100%"
             />
           </Form-item>
+          <Form-item class="search-btn">
+            <Button @click="_pageChange(1)" type="primary">搜索</Button>
+          </Form-item>
         </Form>
       </Col>
       <Col span="24" style="margin-bottom: 10px">
         <el-table
           :data="getPage"
+          :height="tableHeight"
+          @row-click="_rowChange"
+          @row-dblclick="_dbClick"
           border
           size="small"
           highlight-current-row
           style="width: 100%"
-          @row-click="_rowChange"
-          @row-dblclick="_dbClick"
         >
           <el-table-column
             v-for="item in pageColumns"
@@ -56,23 +60,23 @@
       </Col>
       <Col span="24">
         <Page
-          :total="getPage.total"
-          :page-size="getPage.size"
+          :total="total"
+          :page-size="size"
+          @on-change="_pageChange"
+          @on-page-size-change="_pageRows"
           placement="top"
           show-total
           show-elevator
           show-sizer
-          @on-change="_pageChange"
-          @on-page-size-change="_pageRows"
         />
         <div style="clear: both" />
       </Col>
     </Row>
     <div slot="footer" class="btn-width">
-      <Button style="margin-left: 8px" @click="_cancel">
+      <Button @click="_cancel" style="margin-left: 8px">
         取消
       </Button>
-      <Button type="primary" @click="_ok">
+      <Button @click="_ok" type="primary">
         确定
       </Button>
     </div>
@@ -93,6 +97,8 @@ export default {
       },
       loading: true,
       pageParams: { rows: 20 },
+      total: 0,
+      size: 0,
       pageColumns: [
         { title: '合同编号', key: 'salesCode', width: 120 },
         { title: '委托单位', key: 'client' },
@@ -113,7 +119,14 @@ export default {
       modalTitle: '',
       currentRowData: {},
       name: '',
-      code: ''
+      code: '',
+      client: '',
+      salesCode: ''
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      return this.$tableHeight('tableModal')
     }
   },
   methods: {
@@ -136,9 +149,13 @@ export default {
     //   }
     // },
     _page: async function() {
-      const result = await meterContract.pageContractForEntrust(this.formObj)
+      const result = await meterContract.pageContractForEntrust(
+        this._searchParams()
+      )
       if (result) {
         this.getPage = result.records
+        this.total = result.total
+        this.size = result.size
         console.log(this.getPage)
         this.loading = false
       }
@@ -159,6 +176,12 @@ export default {
       if (this.code) {
         data.code = this.code
       }
+      if (this.client) {
+        data.client = this.client
+      }
+      if (this.salesCode) {
+        data.salesCode = this.salesCode
+      }
       return this.$extend(data, this.pageParams)
     },
     _search() {

pages/meter-entrust/go-out-test/EditModal.vue

@@ -9,17 +9,17 @@
       <Col span="24">
         <Form id="test-item-form" :label-width="90" inline onsubmit="return false">
           <label class="label-sign" />
-          <Form-item :label-width="70" label="授权资质仪器名称" >
+          <Form-item :label-width="70" label="样品名称" >
             <Input
-              v-model="code"
-              placeholder="授权资质仪器名称"
+              v-model="name"
+              placeholder="样品名称"
               style="width: 100%"
               @on-enter="_pageChange(1)"
             />
           </Form-item>
           <Form-item label="检测依据名称">
             <Input
-              v-model="name"
+              v-model="basis"
               placeholder="请输入检测依据名称"
               style="width: 100%"
               @on-enter="_pageChange(1)"
@@ -57,8 +57,8 @@
       </Col>
       <Col span="24">
         <Page
-          :total="getPage.total"
-          :page-size="getPage.size"
+          :total="total"
+          :page-size="size"
           placement="top"
           show-total
           show-elevator
@@ -90,6 +90,8 @@ export default {
     return {
       loading: true,
       pageParams: { rows: 20 },
+      total: 0,
+      size: 0,
       pageColumns: [
         { title: '样品名称', key: 'name' },
         { title: '检定依据', key: 'code' },
@@ -100,7 +102,8 @@ export default {
       modalTitle: '',
       currentRowData: {},
       name: '',
-      code: ''
+      code: '',
+      basis: ''
     }
   },
   methods: {
@@ -108,6 +111,7 @@ export default {
       this.modalTitle = '选择检测依据'
       this.name = ''
       this.code = ''
+      this.basis = ''
       this._judge()
     },
     _judge() {
@@ -119,6 +123,8 @@ export default {
       const result = await meterManage.page(this._searchParams())
       if (result) {
         this.getPage = result.records
+        this.total = result.total
+        this.size = result.size
         this.loading = false
       }
     },
@@ -138,6 +144,9 @@ export default {
       if (this.code) {
         data.code = this.code
       }
+      if (this.basis) {
+        data.basis = this.basis
+      }
       return this.$extend(data, this.pageParams)
     },
     _search() {

pages/meter-entrust/go-out-test/VerificationModal.vue

@@ -9,14 +9,6 @@
       <Col span="24">
         <Form id="test-item-form" :label-width="90" inline onsubmit="return false">
           <label class="label-sign" />
-          <Form-item :label-width="70" label="授权资质仪器名称" >
-            <Input
-              v-model="code"
-              @on-enter="_pageChange(1)"
-              placeholder="授权资质仪器名称"
-              style="width: 100%"
-            />
-          </Form-item>
           <Form-item label="检测依据名称">
             <Input
               v-model="name"
@@ -25,6 +17,9 @@
               style="width: 100%"
             />
           </Form-item>
+          <Form-item class="search-btn">
+            <Button @click="_pageChange(1)" type="primary">搜索</Button>
+          </Form-item>
         </Form>
       </Col>
       <Col span="24" style="margin-bottom: 10px">
@@ -56,8 +51,8 @@
       </Col>
       <Col span="24">
         <Page
-          :total="getPage.total"
-          :page-size="getPage.size"
+          :total="total"
+          :page-size="size"
           @on-change="_pageChange"
           @on-page-size-change="_pageRows"
           placement="top"
@@ -93,6 +88,8 @@ export default {
       },
       loading: true,
       pageParams: { rows: 20 },
+      total: 0,
+      size: 0,
       pageColumns: [
         { title: '检定依据', key: 'verification', width: 120 },
         { title: '检定依据名称', key: 'name', width: 140 }
@@ -126,9 +123,11 @@ export default {
       this._page()
     },
     _page: async function() {
-      const result = await meterAptitude.page(this.formObj)
+      const result = await meterAptitude.page(this._searchParams())
       if (result) {
         this.getPage = result.records
+        this.total = result.total
+        this.size = result.size
         console.log(this.getPage)
         for (let i = 0; i < this.getPage.length; i++) {
           this.getPage[i].verification =

pages/meter-entrust/send-test/ContractModal.vue

@@ -9,27 +9,31 @@
       <Col span="24">
         <Form id="test-item-form" :label-width="90" inline onsubmit="return false">
           <label class="label-sign" />
-          <Form-item :label-width="70" label="授权资质仪器名称" >
+          <Form-item :label-width="70" label="委托单位" >
             <Input
-              v-model="code"
+              v-model="client"
               @on-enter="_pageChange(1)"
-              placeholder="授权资质仪器名称"
+              placeholder="请输入委托单位"
               style="width: 100%"
             />
           </Form-item>
-          <Form-item label="检测依据名称">
+          <Form-item label="合同编号">
             <Input
-              v-model="name"
+              v-model="salesCode"
               @on-enter="_pageChange(1)"
-              placeholder="请输入检测依据名称"
+              placeholder="请输入合同编号"
               style="width: 100%"
             />
           </Form-item>
+          <Form-item class="search-btn">
+            <Button @click="_pageChange(1)" type="primary">搜索</Button>
+          </Form-item>
         </Form>
       </Col>
       <Col span="24" style="margin-bottom: 10px">
         <el-table
           :data="getPage"
+          :height="tableHeight"
           @row-click="_rowChange"
           @row-dblclick="_dbClick"
           border
@@ -56,8 +60,8 @@
       </Col>
       <Col span="24">
         <Page
-          :total="getPage.total"
-          :page-size="getPage.size"
+          :total="total"
+          :page-size="size"
           @on-change="_pageChange"
           @on-page-size-change="_pageRows"
           placement="top"
@@ -93,6 +97,8 @@ export default {
       },
       loading: true,
       pageParams: { rows: 20 },
+      total: 0,
+      size: 0,
       pageColumns: [
         { title: '合同编号', key: 'salesCode', width: 120 },
         { title: '委托单位', key: 'client' },
@@ -113,7 +119,14 @@ export default {
       modalTitle: '',
       currentRowData: {},
       name: '',
-      code: ''
+      code: '',
+      client: '',
+      salesCode: ''
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      return this.$tableHeight('tableModal')
     }
   },
   methods: {
@@ -121,6 +134,8 @@ export default {
       this.modalTitle = '选择合同'
       this.name = ''
       this.code = ''
+      this.salesCode = ''
+      this.client = ''
       this._judge()
     },
     _judge() {
@@ -129,9 +144,13 @@ export default {
       this._page()
     },
     _page: async function() {
-      const result = await meterContract.pageContractForEntrust(this.formObj)
+      const result = await meterContract.pageContractForEntrust(
+        this._searchParams()
+      )
       if (result) {
         this.getPage = result.records
+        this.total = result.total
+        this.size = result.size
         this.loading = false
       }
     },
@@ -151,6 +170,12 @@ export default {
       if (this.code) {
         data.code = this.code
       }
+      if (this.client) {
+        data.client = this.client
+      }
+      if (this.salesCode) {
+        data.salesCode = this.salesCode
+      }
       return this.$extend(data, this.pageParams)
     },
     _search() {

pages/meter-entrust/send-test/EditModal.vue

@@ -9,17 +9,17 @@
       <Col span="24">
         <Form id="test-item-form" :label-width="90" inline onsubmit="return false">
           <label class="label-sign" />
-          <Form-item :label-width="70" label="授权资质仪器名称" >
+          <Form-item :label-width="70" label="样品名称" >
             <Input
-              v-model="code"
-              placeholder="授权资质仪器名称"
+              v-model="name"
+              placeholder="样品名称"
               style="width: 100%"
               @on-enter="_pageChange(1)"
             />
           </Form-item>
           <Form-item label="检测依据名称">
             <Input
-              v-model="name"
+              v-model="basis"
               placeholder="请输入检测依据名称"
               style="width: 100%"
               @on-enter="_pageChange(1)"
@@ -57,8 +57,8 @@
       </Col>
       <Col span="24">
         <Page
-          :total="getPage.total"
-          :page-size="getPage.size"
+          :total="total"
+          :page-size="size"
           placement="top"
           show-total
           show-elevator
@@ -90,6 +90,8 @@ export default {
     return {
       loading: true,
       pageParams: { rows: 20 },
+      total: 0,
+      size: 0,
       pageColumns: [
         { title: '样品名称', key: 'name' },
         { title: '检定依据', key: 'code' },
@@ -100,7 +102,8 @@ export default {
       modalTitle: '',
       currentRowData: {},
       name: '',
-      code: ''
+      code: '',
+      basis: ''
     }
   },
   methods: {
@@ -108,6 +111,7 @@ export default {
       this.modalTitle = '选择检测依据'
       this.name = ''
       this.code = ''
+      this.basis = ''
       this._judge()
     },
     _judge() {
@@ -119,6 +123,8 @@ export default {
       const result = await meterManage.page(this._searchParams())
       if (result) {
         this.getPage = result.records
+        this.total = result.total
+        this.size = result.size
         this.loading = false
       }
     },
@@ -138,6 +144,9 @@ export default {
       if (this.code) {
         data.code = this.code
       }
+      if (this.basis) {
+        data.basis = this.basis
+      }
       return this.$extend(data, this.pageParams)
     },
     _search() {

pages/meter-entrust/send-test/VerificationModal.vue

@@ -9,14 +9,6 @@
       <Col span="24">
         <Form id="test-item-form" :label-width="90" inline onsubmit="return false">
           <label class="label-sign" />
-          <Form-item :label-width="70" label="授权资质仪器名称" >
-            <Input
-              v-model="code"
-              @on-enter="_pageChange(1)"
-              placeholder="授权资质仪器名称"
-              style="width: 100%"
-            />
-          </Form-item>
           <Form-item label="检测依据名称">
             <Input
               v-model="name"
@@ -25,6 +17,9 @@
               style="width: 100%"
             />
           </Form-item>
+          <Form-item class="search-btn">
+            <Button @click="_pageChange(1)" type="primary">搜索</Button>
+          </Form-item>
         </Form>
       </Col>
       <Col span="24" style="margin-bottom: 10px">
@@ -56,8 +51,8 @@
       </Col>
       <Col span="24">
         <Page
-          :total="getPage.total"
-          :page-size="getPage.size"
+          :total="total"
+          :page-size="size"
           @on-change="_pageChange"
           @on-page-size-change="_pageRows"
           placement="top"
@@ -93,6 +88,8 @@ export default {
       },
       loading: true,
       pageParams: { rows: 20 },
+      total: 0,
+      size: 0,
       pageColumns: [
         { title: '检定依据', key: 'verification', width: 120 },
         { title: '检定依据名称', key: 'name', width: 140 }
@@ -126,9 +123,11 @@ export default {
       this._page()
     },
     _page: async function() {
-      const result = await meterAptitude.page(this.formObj)
+      const result = await meterAptitude.page(this._searchParams())
       if (result) {
         this.getPage = result.records
+        this.total = result.total
+        this.size = result.size
         console.log(this.getPage)
         for (let i = 0; i < this.getPage.length; i++) {
           this.getPage[i].verification =