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

api/meter/meter-sample.js

@@ -14,6 +14,11 @@ export default {
   // 车辆管理
   pageCarManage: data =>
     http.post('/res/v1/car_info/page_car_manage', data).then(res => res),
+  pageCarList: data =>
+    http.post('meter/v1/test_car/page', data).then(res => res),
+  // 仪器列表
+  pageInstrutEdit: data =>
+    http.post('meter/v1/test_device/page', data).then(res => res),
   // 个人任务
   pagePersonTask: data =>
     http.post('meter/v1/item/page', data).then(res => res),

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

@@ -27,7 +27,7 @@
           </Form-item>
           <Form-item label="省、市、区" prop="name" class="width-48">
 <!--            <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>-->
-            <CityNameCascader :value="testedCityData" name="tested" @on-result-change="_cascaderResult">
+            <CityNameCascader :value="testedCityData" @on-result-change="_cascaderResult" name="tested">
             </CityNameCascader>
           </Form-item>
           <Form-item label="街道" prop="street" class="width-48">
@@ -41,7 +41,9 @@
             <Input v-model="formObj.operation.email" name="operation.email" placeholder="请输入实验室名称"/>
           </Form-item>
           <Form-item label="委托日期：" prop="edate" class="width-48">
-            <Input v-model="formObj.edate" name="edate" placeholder="请输入联系人"/>
+<!--            <Input v-model="formObj.edate" name="edate" placeholder="请输入联系人"/>-->
+            <Date-picker @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
+                         placeholder="请选择委托日期"></Date-picker>
           </Form-item>
           <Form-item label="合同号：" prop="contractCode" class="width-48">
             <Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入联系人"/>
@@ -54,7 +56,7 @@
         <Col span="24">
           <!--          <btn-list :msg="btn" :open="searchOpen" :showSearchBtn="false" @on-result-change="_btnClick"-->
           <!--                    class="contHide"></btn-list>-->
-          <Button type="success" @click="_add()">添加</Button>
+          <Button @click="_add()" type="success">添加</Button>
         </Col>
         <Col span="24">
           <PTVXETable
@@ -76,7 +78,7 @@
             >
               <template slot-scope="scope">
                 <div v-if="item.key==='name'" @click.stop="_handleRow(scope)">
-                  <el-input v-model="scope.row.name" blur placeholder="请输入或选择样品名称" @on-result-change="_judgeBasisChange"  @click.native="_selectjudgeBasis(scope.$rowIndex)"
+                  <el-input v-model="scope.row.name" @on-result-change="_judgeBasisChange" @click.native="_selectjudgeBasis(scope.$rowIndex)" blur  placeholder="请输入或选择样品名称"
                   ></el-input>
                 </div>
                 <div v-if="item.key==='spec'" @click.stop="_handleRow(scope)">
@@ -97,9 +99,9 @@
                 <div v-if="item.key==='quantity'" @click.stop="_handleRow(scope)">
                   <el-input
                     v-model="scope.row.quantity"
+                    @keydown.native="channelInputLimit"
                     type="number"
                     placeholder="请输入或选择数量"
-                    @keydown.native="channelInputLimit"
                   />
                 </div>
               </template>
@@ -110,7 +112,7 @@
       <div slot="footer">
         <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
       </div>
-      <EditModal ref="EditModal" is-change @on-result-change="_backData" />
+      <EditModal ref="EditModal" @on-result-change="_backData" is-change />
     </Modal>
   </div>
 </template>
@@ -199,7 +201,14 @@ export default {
       ruleValidate: {
         client: [
           { required: true, message: '委托单位不能为空', trigger: 'blur' }
-        ]
+        ],
+        'operation.person': [
+          { required: true, message: '联系人不能为空', trigger: 'blur' }
+        ],
+        'operation.tel': [
+          { required: true, message: '联系电话不能为空', trigger: 'blur' }
+        ],
+        name: [{ required: true, message: '省市区不能为空', trigger: 'blur' }]
       },
       clearingWayList: ['款到后测试', '先测试后付款', '其他情况（）'],
       clearingWayListTemp: ['款到后测试', '先测试后付款', '其他情况（）'],
@@ -219,6 +228,10 @@ export default {
     )
   },
   methods: {
+    _ctimeChange(data) {
+      console.log('时间', data)
+      this.formObj.edate = data
+    },
     _backData(data) {
       console.log(typeof this.index)
       this.getPage.records[this.index].name = data.name

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

@@ -37,7 +37,9 @@
             <Input v-model="formObj.operation.email" name="operation.email" placeholder="请输入实验室名称"/>
           </Form-item>
           <Form-item label="委托日期：" prop="edate" class="width-48">
-            <Input v-model="formObj.edate" name="edate" placeholder="请输入联系人"/>
+<!--            <Input v-model="formObj.edate" name="edate" placeholder="请输入联系人"/>-->
+            <Date-picker @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
+                         placeholder="请选择委托日期"></Date-picker>
           </Form-item>
           <Form-item label="合同号：" prop="contractCode" class="width-48">
             <Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入联系人"/>
@@ -201,8 +203,16 @@ export default {
       ruleValidate: {
         client: [
           { required: true, message: '委托单位不能为空', trigger: 'blur' }
-        ]
+        ],
+        'operation.person': [
+          { required: true, message: '联系人不能为空', trigger: 'blur' }
+        ],
+        'operation.tel': [
+          { required: true, message: '联系电话不能为空', trigger: 'blur' }
+        ],
+        name: [{ required: true, message: '省市区不能为空', trigger: 'blur' }]
       },
+
       clearingWayList: ['款到后测试', '先测试后付款', '其他情况（）'],
       clearingWayListTemp: ['款到后测试', '先测试后付款', '其他情况（）'],
       showModal: false,
@@ -221,6 +231,12 @@ export default {
     )
   },
   methods: {
+    _ctimeChange(data) {
+      console.log('时间', data)
+      this.formObj.edate = data
+      // this.formObj.ctimeBegin = data[0]
+      // this.formObj.ctimeEnd = data[1]
+    },
     _judgeBasisChange(msg, data) {
       switch (msg) {
         case 'select':

pages/meter-out/personal-task/CarManage.vue

@@ -2,11 +2,14 @@
   <!--仓库-->
   <Modal v-model="showModal" width="1000">
     <p slot="header">选择车辆</p>
-    <Form onsubmit="return false">
-      <Form-item>
-        <Input v-model="license" @on-enter="_search" placeholder="请输入车牌号,回车查询" style="width:100%"
+    <Form :label-width="50" onsubmit="return false" inline>
+      <Form-item label="车牌号">
+        <Input v-model="license" @on-enter="_search" placeholder="请输入车牌号,回车查询"
                icon="ios-search-strong"/>
       </Form-item>
+      <Form-item class="search-btn" style="margin-left: -10px">
+        <Button @click="_search" type="primary">搜索</Button>
+      </Form-item>
     </Form>
     <Row>
       <Col span="24">
@@ -89,7 +92,9 @@ export default {
       }
       // this.$refs.pageTable._page('search-form-car', 'LmsCarInfo/page', data)
       const result = await meterSample.pageCarManage(data)
+      const result2 = await meterSample.pageCarList(data)
       console.log('result', result)
+      console.log('result2', result2)
       if (result) {
         this.getPage = result
       }

pages/meter-out/personal-task/InstrumentEdit.vue

+<template>
+  <!--仓库-->
+  <Modal v-model="showModal" width="1000">
+    <p slot="header">仪器领用</p>
+    <Form :label-width="60" onsubmit="return false" inline>
+      <Form-item label="仪器名称">
+        <Input v-model="license" @on-enter="_search" placeholder="请输入仪器名称,回车查询"
+               icon="ios-search-strong"/>
+      </Form-item>
+      <Form-item class="search-btn" style="margin-left: -10px">
+        <Button @click="_search" type="primary">搜索</Button>
+      </Form-item>
+    </Form>
+    <Row>
+      <Col span="24">
+        <PTVXETable ref="pageTable" :tableHeight="tableHeight"
+                    @on-result-change="_tableResultChange" :getPage="getPage" select-data>
+          <vxe-table-column
+            :field="item.key"
+            :title="item.title"
+            :min-width="item.width?item.width:200"
+            :fixed="item.fixed?item.fixed:undefined"
+            v-for="item in pageColumns"
+            :key="item.key" sortable>
+            <template slot-scope="scope">
+              <div v-if="item.date">{{$dateformat(scope.row[item.key],'yyyy-mm-dd')}}</div>
+              <div v-else>{{scope.row[item.key]}}</div>
+            </template>
+          </vxe-table-column>
+        </PTVXETable>
+      </Col>
+    </Row>
+    <div slot="footer">
+      <ModalFooter ref="footerModal" @on-result-change="_footerResult" :footer="footerList"></ModalFooter>
+    </div>
+  </Modal>
+</template>
+<script>
+/**
+ * 选择车辆
+ */
+import ModalFooter from '../../../components/base/modalFooter'
+import { meterSample } from '../../../api'
+export default {
+  components: {
+    ModalFooter
+  },
+  data() {
+    return {
+      showModal: false,
+      license: '',
+      selectNames: '',
+      selectIds: '',
+      getPage: {},
+      tableHeight: '300',
+      pageColumns: [
+        { title: '仪器名称', key: 'name' },
+        { title: '测量范围', key: 'measuringRange' },
+        { title: '不确定度/准确度', key: 'uncertaintyAccuray' }
+        // { title: '购买/租用时间', key: 'buyDate' },
+        // { title: '备注', key: 'remark' }
+      ],
+      footerList: [
+        { id: '', name: '取消', type: '' },
+        { id: '', name: '确定', type: 'primary' }
+      ]
+    }
+  },
+  methods: {
+    _footerResult(name) {
+      switch (name) {
+        case '取消':
+          this._cancel()
+          break
+        case '确定':
+          this._ok()
+          break
+      }
+    },
+    _hideLoading() {
+      this.$refs.footerModal._hideLoading()
+    },
+    _open() {
+      this.showModal = true
+      this.license = ''
+      this._page()
+    },
+    _page: async function() {
+      const data = {}
+      if (this.license) {
+        data.license = this.license
+      }
+      // this.$refs.pageTable._page('search-form-car', 'LmsCarInfo/page', data)
+      const result = await meterSample.pageInstrutEdit(data)
+      console.log('result', result)
+      if (result) {
+        this.getPage = result
+      }
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'page':
+          this.selectIds = []
+          this.selectNames = []
+          this.getPage = this.$store.state.LmsCarInfo.page
+          break
+        case 'selectData':
+          const nameList = []
+          const idList = []
+          for (let i = 0; i < data.length; i++) {
+            nameList.push(data[i].license)
+            idList.push(data[i].id)
+          }
+          this.selectIds = idList
+          this.selectNames = nameList
+          break
+        case 'changeSize':
+          this._page()
+          break
+      }
+    },
+    _ok() {
+      this.$emit('on-result-change', {
+        ids: this.selectIds,
+        names: this.selectNames
+      })
+      this.showModal = false
+      this._hideLoading()
+    },
+    _cancel() {
+      this.showModal = false
+      this._hideLoading()
+    },
+    _search() {
+      // tree查询
+      this._page()
+    }
+  }
+}
+</script>

pages/meter-out/personal-task/MeterOutPersonalTask.vue

@@ -6,24 +6,24 @@
         <Row>
           <!--查询-->
           <Col span="24" style="margin-top: 10px">
-            <Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
+            <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
               <label class="label-sign"></label>
               <Form-item class="search-item" label="实验室名称:">
-                <Input v-model="formObj.name" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/>
               </Form-item>
               <Form-item class="search-item" label="资质:">
-                <Input v-model="formObj.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
               </Form-item>
               <Form-item class="search-btn">
-                <Button type="primary" @click="_formSearch">搜索</Button>
+                <Button @click="_formSearch" type="primary">搜索</Button>
               </Form-item>
             </Form>
           </Col>
           <!--操作-->
           <Col span="24">
 
-            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
-                     @on-result-change="_btnClick"></btn-list>
+            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
+                     class="contHide"></btn-list>
           </Col>
           <!--表格-->
           <Col span="24">
@@ -47,6 +47,7 @@
     </div>
     <SelEquip ref="SelEquip" @on-result-change="_equipSelectBack"></SelEquip>
     <CarManage ref="carEdit"></CarManage>
+    <InstruMentEdit ref="InstruEdit"></InstruMentEdit>
     <MeterPersonItemTaskManage ref="personModal"></MeterPersonItemTaskManage>
     <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
   </div>
@@ -57,12 +58,14 @@ import SelEquip from '../../../components/select-equip/SelEquip'
 import MeterSubcontractorEdit from './MeterGoOutTestEdit'
 import CarManage from './CarManage'
 import MeterPersonItemTaskManage from './MeterPersonItemTaskManage'
+import InstruMentEdit from './InstrumentEdit'
 export default {
   components: {
     MeterSubcontractorEdit,
     CarManage,
     MeterPersonItemTaskManage,
-    SelEquip
+    SelEquip,
+    InstruMentEdit
   },
   data() {
     return {
@@ -205,6 +208,12 @@ export default {
       this.currentComponent = componentName
       this.$nextTick(function() {
         switch (res) {
+          case '仪器领用':
+            this.$refs.InstruEdit._open()
+            break
+          case '车辆管理':
+            this.$refs.carEdit._open()
+            break
           case '编辑':
             // this._editModal(true, data.id)
             this._personModal(data)