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

components/table/elementTable.vue

@@ -91,7 +91,7 @@ export default {
       },
       extendsData: {}, // 扩展数据，数据传不过来使用
       rowData: {},
-      pageSizeOpts: this.$pageSizeOpts,
+      pageSizeOpts: this.$pageSizeOpt,
       sampleHandleValue: '',
       checkData: []
     }
@@ -101,6 +101,13 @@ export default {
     this.sampleHandleValue = Number(localStorage.getItem('sampleHandleValue'))
   },
   methods: {
+    // _initTable() {
+    //   this.loading = false
+    //   if (this.tableName) {
+    //     // tableName存在-----支持自定义表格
+    //     this._getByUserTable()
+    //   }
+    // },
     // 点击单元格触发
     _cellClick(row, event, column) {
       if (event.label === '操作') {

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

@@ -28,7 +28,7 @@
           <!--表格-->
           <Col span="24">
             <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
-                        :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" >
+                        :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -47,16 +47,19 @@
     </div>
     <MeterPersonItemTaskManage ref="personModal"></MeterPersonItemTaskManage>
     <personModal ref="personModal"></personModal>
+    <ListModal ref="ListModal"></ListModal>
   </div>
 </template>
 <script>
 import { meterDevice, meterSample } from '../../../api'
 import personModal from '../../../components/user-info-single/assignPerson'
 import MeterPersonItemTaskManage from './MeterPersonItemTaskManage'
+import ListModal from './transferListModal'
 export default {
   components: {
     MeterPersonItemTaskManage,
-    personModal
+    personModal,
+    ListModal
   },
   data() {
     return {
@@ -88,6 +91,7 @@ export default {
         aptitude: undefined
       },
       selectIds: [],
+      selectData: [],
       getPage: {},
       pageColumns: [
         { title: '样品名称', key: 'name', width: 120 },
@@ -129,6 +133,9 @@ export default {
           case '任务转发':
             this.$refs.personModal._open('salesman')
             break
+          case '流转':
+            this._sampleReceive()
+            break
           case '仪器领用':
             this._receiveApparatus()
             break
@@ -147,6 +154,17 @@ export default {
         }
       })
     },
+    _sampleReceive() {
+      const ids = this.selectIds
+      const selectData = this.selectData
+      console.log(selectData)
+      if (ids.length === 0) {
+        this.$Message.warning('请至少选择一条数据!')
+      } else {
+        // this._receiveByIds(ids, `确认要接收 ${ids.length} 条数据吗?`)
+        this.$refs.ListModal._open(selectData)
+      }
+    },
     _carManage() {
       this.$refs.carEdit._open()
     },
@@ -241,9 +259,16 @@ export default {
         case 'iconClick':
           this._iconClick(data.name, data.rowData, data.componentName)
           break
-        case 'selectIds':
-          this.selectIds = data
+        case 'selectData':
+          this.selectData = data
+          this.selectIds = []
+          for (let i = 0; i < data.length; i++) {
+            this.selectIds.push(data[i].id)
+          }
           break
+        // case 'selectIds':
+        //   this.selectIds = data
+        //   break
         case 'changeSize':
           this._page()
           break

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

+<template>
+  <div>
+    <Modal v-model="showListModal" width="1200px">
+      <Row>
+        <Col span="24" />
+        <element-table
+          ref="pageTable"
+          :page-columns="pageColumns"
+          :table-height="500"
+          :get-page="getPage"
+        >
+          <el-table-column
+            v-for="(item,index) in pageColumns"
+            :key="index"
+            :prop="item.key"
+            :label="item.title"
+            :align="item.align"
+            :width="item.width"
+            :min-width="200"
+            sortable
+          >
+            <template slot-scope="scope">
+              <span v-if="item.datetime">
+                {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):'' }}
+              </span>
+              <span v-else-if="item.status">
+                {{ scope.row[item.key].display }}
+              </span>
+              <span v-else-if="item.key==='quantity'">
+                <InputNumber v-model="scope.row.quantity" name="quantity" placeholder="请输入数量" style="width: 100px;" />
+              </span>
+              <span v-else-if="item.key==='unit'">
+                <!--                <Input v-model="scope.row.unit" name="unit" placeholder="请输入单位" style="width: 100px;" />-->
+                <Select v-model="scope.row.unit">
+                  <Option v-for="item in options" :key="item.name" :value="item.name" name="unit">
+                    {{ item.name }}
+                  </Option>
+                </Select>
+              </span>
+              <span v-else-if="item.key==='flower'">
+                <!--                <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="请选择人员"
+                />
+              </span>
+              <span v-else-if="item.key==='flowTime'">
+                <el-date-picker
+                  v-model="scope.row.flowTime"
+                  type="datetime"
+                  placeholder="选择日期时间"
+                  default-time="12:00:00"
+                />
+              </span>
+              <span v-else>
+                {{ scope.row[item.key] }}
+              </span>
+            </template>
+          </el-table-column>
+        </element-table>
+
+        </Col>
+      </Row>
+      <div slot="footer">
+        <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult" />
+      </div>
+    </Modal>
+    <UserInfo ref="userModal" @on-result-change="_userData" is-change />
+  </div>
+</template>
+
+<script>
+import UserInfo from '../../../components/user-info-single/assignPerson'
+// import { drugSample } from '../../api'
+import Global from '../../../api/config'
+
+export default {
+  name: 'TransferListModal',
+  components: {
+    UserInfo
+  },
+  data() {
+    return {
+      showListModal: false,
+      getPage: {
+        records: []
+      },
+      footerList: [
+        { id: '', name: '确定流转', type: 'primary' },
+        { id: '', name: '取消', type: '' }
+      ],
+      num: 0,
+      dataIndex: undefined,
+      unit: '',
+      person: '',
+      salesmanId: '',
+      salesmanPhone: '',
+      time: '',
+      options: [
+        {
+          name: '支'
+        },
+        {
+          name: '盒'
+        },
+        {
+          name: '条'
+        }
+      ],
+      pageColumns: [
+        {
+          title: '样品名称',
+          key: 'name',
+          width: 180,
+          fixed: 'left',
+          align: 'center'
+        },
+        { title: '样品编号', key: 'code', width: 180, align: 'center' },
+        {
+          title: '型号规格',
+          key: 'spec',
+          width: 180,
+          fixed: 'left',
+          align: 'center'
+        },
+        { title: '流转数量', key: 'quantity', width: 130, align: 'center' },
+        { title: '流转人', key: 'flower', width: 180, align: 'center' },
+        { title: '流转时间', key: 'flowTime', width: 300, align: 'center' }
+      ]
+    }
+  },
+  methods: {
+    getNowTime() {
+      const now = new Date()
+      const year = now.getFullYear() // 得到年份
+      let month = now.getMonth() // 得到月份
+      let date = now.getDate() // 得到日期
+      let hour = now.getHours()
+      let min = now.getMinutes()
+      let second = now.getSeconds()
+      month = month + 1
+      month = month.toString().padStart(2, '0')
+      date = date.toString().padStart(2, '0')
+      hour = hour.toString().padStart(2, '0')
+      min = min.toString().padStart(2, '0')
+      second = second.toString().padStart(2, '0')
+      const defaultDate = `${year}-${month}-${date} ${hour}:${min}:${second}`
+      // this.$set(this.searchFormField, 'date', defaultDate)
+      // console.log(now)
+      // console.log('当前时间', defaultDate)
+      // console.log('时间', now)
+      // this.formObj.outTime = now
+      // this.formObj.inStockTime = defaultDate
+      // this.obj.flowTime = defaultDate
+      return defaultDate
+      // this.$set(this.searchFormField, 'date', defaultDate)
+    },
+    _selectStaff(index) {
+      this.dataIndex = index
+      console.log(index)
+      this.$refs.userModal._open('salesman')
+    },
+    _userData(data, msg, index, contractTempData) {
+      console.log(data)
+      // 选择人员返回数据
+      // 选择业务员
+      this.person = data.realname
+      this.getPage.records[this.dataIndex].flower = data.realname
+      // alert(this.dataIndex)
+      this.getPage.records[this.dataIndex].flowerId = data.userId
+      // console.log(this.person)
+      // this.getPage = data
+      console.log(this.getPage.records)
+    },
+    _open(data) {
+      this.showListModal = true
+      this.getPage.records = []
+      const length = data.length
+      const user = Global.getUserInfo()
+      const time = this.getNowTime()
+      console.log(time)
+      for (let i = 0; i < length; i++) {
+        const object = data[i]
+        const obj = {}
+        // obj.sampleId = object.id
+        obj.code = object.code
+        obj.name = object.name
+        obj.spec = object.spec
+        obj.factoryNumber = object.factoryNumber
+        obj.quantity = object.quantity
+        obj.flower = user.realname
+        obj.flowerId = user.userId
+        obj.flowTime = time
+        obj.flowQuantity = 1
+        this.getPage.records.push(obj)
+      }
+      // this.$refs.pageTable._initTable()
+    },
+    _footerResult(msg) {
+      switch (msg) {
+        case '确定流转':
+          this._ok()
+          break
+        case '取消':
+          this._cancel()
+          break
+      }
+    },
+    _cancel() {
+      this.showListModal = false
+    },
+    _ok() {
+      const data = this.getPage.records
+      this._flow(data)
+      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')
+      // }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
+<style>
+.el-date-editor .el-range-separator {
+  padding: 0px;
+}
+</style>

pages/meter-subcontract/subpackage-input/UploadByReport.vue

@@ -19,8 +19,8 @@
         </Form>
       </div>
       <div slot="footer" class="btn-width">
-
-        <label style="margin-bottom: 0">
+        <Button @click="_cancel" style="margin-left: 8px">取消</Button>
+        <label style="margin-bottom: 0;float: right;margin-left: 20px;">
           <Upload
             :action="action"
             :on-success="_handelsuccess"
@@ -30,7 +30,7 @@
             :with-credentials="true"
             :show-upload-list="false"
           >
-            <Button @click="_cancel" style="margin-left: 8px">取消</Button>
+
             <Button :disabled="isDisable" type="primary">上传</Button>
           </Upload>
         </label>
@@ -65,6 +65,7 @@ export default {
   },
   methods: {
     _open(reportId) {
+      console.log(reportId)
       this.showSubmitModal = true
       this.isLoad = false
       this.reportId = reportId
@@ -80,9 +81,11 @@ export default {
       }
     },
     _action() {
+      // http://api.pertest.patzn.com:7000/meter/v1/report/upload_1111?reason=111111&reportCode=2222222
       this.action =
         global.baseURL +
-        '/food/v1/sample_report/upload_report/' +
+        // /v1/report/upload_{sampleId}
+        '/meter/v1/report/upload_' +
         this.reportId +
         '?reason=' +
         this.remark +