Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev

api/meter/meter-sample.js

@@ -70,6 +70,12 @@ export default {
     http
       .post('meter/v1/sample/submit_report_to_check?ids=' + data)
       .then(res => res),
+
+  submitFlow: data =>
+    https
+      .post('meter/v1/sample/sample_flow', JSON.stringify(data))
+      .then(res => res),
+
   generateReport: data =>
     https
       .post('meter/v1/sample/report_generate', JSON.stringify(data))

components/import/DownloadTemplateImport.vue

@@ -15,7 +15,7 @@
         </Spin>
       </div>
       <div>
-        <Button @click="_download" v-if="hideDownloadBtn===undefined" size="large">下载模板</Button>
+        <Button v-if="hideDownloadBtn===undefined" size="large" @click="_download">下载模板</Button>
       </div>
 
       <div slot="footer" class="btn-width">
@@ -107,9 +107,10 @@ export default {
     _handelsuccess(response, file, fileList) {
       // 上传成功
       if (response.success) {
+        console.log('---response', response)
         this.isLoad = false
         this.$Message.success('导入成功！')
-        this.$emit('on-result-change')
+        this.$emit('on-result-change', response.data)
         this.showModal = false
         this.isDisabled = false
         this.showError = false

pages/meter-business/quote-register/MeterQuoteRegisterEdit.vue

@@ -6,8 +6,8 @@
         <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline>
 
           <Form-item  label="委托单位" prop="client" class="width-48">
-            <AutoComplete :value="formObj.client" :downData="customerData" @on-result-change="_cusNameChange"
-                          name="client" placeholder="请输入或选择委托单位"
+            <AutoComplete :value="formObj.client" :down-data="customerData" name="client"
+                          placeholder="请输入或选择委托单位" @on-result-change="_cusNameChange"
             ></AutoComplete>
           </Form-item>
           <Form-item label="联系人" prop="operation.person" class="width-48">
@@ -20,7 +20,7 @@
             <Input v-model="formObj.operation.fax" name="operation.fax" placeholder="请输入委托单位"/>
           </Form-item>
           <Form-item label="省、市、区" prop="testedCityData" class="width-48">
-            <CityNameCascader :value="testedCityData" @on-result-change="_cascaderResult" name="tested">
+            <CityNameCascader :value="testedCityData" name="tested" @on-result-change="_cascaderResult">
             </CityNameCascader>
           </Form-item>
 
@@ -35,8 +35,8 @@
             <Input v-model="formObj.operation.email" name="operation.email" placeholder="请输入实验室名称"/>
           </Form-item>
           <Form-item label="委托日期：" prop="edate" class="width-48">
-            <Date-picker @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
-                         placeholder="请选择委托日期"></Date-picker>
+            <Date-picker type="date" split-panels style="width:100%;" placeholder="请选择委托日期"
+                         @on-change="_ctimeChange"></Date-picker>
           </Form-item>
           <Form-item label="备注：" prop="remark" style="width: 99.8%">
             <Input v-model="formObj.remark" :rows="3" name="remark" type="textarea"
@@ -50,8 +50,8 @@
         <!--操作-->
         <Col span="24">
 
-          <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
-                    class="contHide"></btn-list>
+          <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
+                    @on-result-change="_btnClick"></btn-list>
         </Col>
         <Col span="24">
           <PTVXETable
@@ -73,7 +73,7 @@
             >
               <template slot-scope="scope">
                 <div v-if="item.key==='name'" @click.stop="_handleRow(scope)">
-                  <el-input v-model="scope.row.name" @on-result-change="_judgeBasisChange" @click.native="_selectjudgeBasis(scope.$rowIndex)" blur  placeholder="请输入或选择样品名称"
+                  <el-input v-model="scope.row.name" blur placeholder="请输入或选择样品名称" @on-result-change="_judgeBasisChange"  @click.native="_selectjudgeBasis(scope.$rowIndex)"
                   ></el-input>
                 </div>
                 <div v-if="item.key==='spec'" @click.stop="_handleRow(scope)">
@@ -94,9 +94,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>
@@ -108,8 +108,8 @@
         <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
       </div>
     </Modal>
-    <EditModal ref="EditModal" @on-result-change="_backData" is-change />
-    <importModal ref="importModal"  aptitude-item></importModal>
+    <EditModal ref="EditModal" is-change @on-result-change="_backData" />
+    <importModal ref="importModal" aptitude-item   @on-result-change="_inputBack"></importModal>
   </div>
 </template>
 <script>
@@ -347,6 +347,14 @@ export default {
       console.log(data)
       console.log(this.getPage.records)
     },
+
+    _inputBack(data) {
+      if (undefined !== data) {
+        for (let i = 0; i < data.length; i++) {
+          this.getPage.records.push(data[i])
+        }
+      }
+    },
     _add() {
       const data = {
         name: '',

pages/meter-send/sample-flow/MeterSampleFlow.vue

@@ -47,7 +47,7 @@
     </div>
     <MeterPersonItemTaskManage ref="personModal"></MeterPersonItemTaskManage>
     <personModal ref="personModal"></personModal>
-    <ListModal ref="ListModal"></ListModal>
+    <ListModal ref="ListModal" @on-result-change="_page"></ListModal>
   </div>
 </template>
 <script>

pages/meter-send/sample-flow/transferListModal.vue

@@ -41,9 +41,9 @@
                 <!--                <Input v-model="scope.row.person" name="person" placeholder="请输入流转人" style="width: 100px;" />-->
                 <Input
                   v-model="scope.row.flower"
-                  @click.native="_selectStaff(scope.$index)"
                   readonly="readonly"
                   placeholder="请选择人员"
+                  @click.native="_selectStaff(scope.$index)"
                 />
               </span>
               <span v-else-if="item.key==='flowTime'">
@@ -67,7 +67,7 @@
         <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult" />
       </div>
     </Modal>
-    <UserInfo ref="userModal" @on-result-change="_userData" is-change />
+    <UserInfo ref="userModal" is-change @on-result-change="_userData" />
   </div>
 </template>
 
@@ -75,6 +75,7 @@
 import UserInfo from '../../../components/user-info-single/assignPerson'
 // import { drugSample } from '../../api'
 import Global from '../../../api/config'
+import { meterSample } from '../../../api'
 
 export default {
   name: 'TransferListModal',
@@ -185,6 +186,7 @@ export default {
         const object = data[i]
         const obj = {}
         // obj.sampleId = object.id
+        obj.id = object.id
         obj.code = object.code
         obj.name = object.name
         obj.spec = object.spec
@@ -193,7 +195,7 @@ export default {
         obj.flower = user.realname
         obj.flowerId = user.userId
         obj.flowTime = time
-        obj.flowQuantity = 1
+        obj.flowQuantity = object.quantity
         this.getPage.records.push(obj)
       }
       // this.$refs.pageTable._initTable()
@@ -217,12 +219,12 @@ export default {
       console.log(data)
     },
     _flow: async function(data) {
-      // const result = await drugSample.submitFlow({ sampleFlows: data })
-      // if (result) {
-      //   this.showListModal = false
-      //   this.$message.success('流转成功')
-      //   this.$emit('on-result-change')
-      // }
+      const result = await meterSample.submitFlow({ sampleVOList: data })
+      if (result) {
+        this.showListModal = false
+        this.$message.success('流转成功')
+        this.$emit('on-result-change')
+      }
     }
   }
 }