土工试验Lims

pages/soil-sample-manage/sample-preparation/Preparation.vue

@@ -5,7 +5,7 @@
       <Row>
         <!--操作-->
         <Col span="24">
-          <btn-list :msg="btn" @on-result-change="_btnClick" class="contHide"></btn-list>
+          <btn-list :msg="btn" class="contHide" @on-result-change="_btnClick"></btn-list>
         </Col>
         <!--内容-->
         <Col span="24">
@@ -14,10 +14,10 @@
             :table-height="tableHeight"
             :get-page="getPage"
             :form-id="formId"
-            @on-result-change="_tableResultChange"
             select-data
             is-edit
-            hide-page>
+            hide-page
+            @on-result-change="_tableResultChange">
             <vxe-table-column
               v-for="item in pageColumns"
               :key="item.key"
@@ -32,8 +32,8 @@
               <template v-slot:edit="scope">
                 <div v-if="item.key==='prepareWay'" @click="_handleRow(scope)">
                   <AutoComplete v-model="scope.row.prepareWay" :down-data="preparationWayData" :way-data="wayData"
-                                 :handle-obj="scope" @on-result-change="_preparationChange" clearable
-                                 placeholder="输入或选择制备方式"></AutoComplete>
+                                 :handle-obj="scope" clearable placeholder="输入或选择制备方式"
+                                 @on-result-change="_preparationChange"></AutoComplete>
                 </div>
                 <div v-else-if="item.key==='unit'" @click="_handleRow(scope)">
                   <el-input v-model="scope.row.unit" name="unit" placeholder="输入或选择单位">
@@ -46,13 +46,13 @@
                 <span v-else-if="item.key==='type'">{{ scope.row[item.key]===0? '检样':'备样' }}</span>
                 <div v-else-if="item.key==='keepWay'" @click="_handleRow(scope)">
                   <AutoComplete v-model="scope.row.keepWay" :handle-obj="scope" :down-data="saveWayData"
-                                @on-result-change="_saveChange" clearable
-                                placeholder="输入或选择保存方式" show-key="name"></AutoComplete>
+                                clearable placeholder="输入或选择保存方式"
+                                show-key="name" @on-result-change="_saveChange"></AutoComplete>
                 </div>
                 <div v-else-if="item.key==='keepContainer'" @click="_handleRow(scope)">
                   <AutoComplete v-model="scope.row.keepContainer" :handle-obj="scope" :down-data="packList"
-                                @on-result-change="_packSaveChange" clearable
-                                placeholder="输入或选择保存容器" show-key="name"></AutoComplete>
+                                clearable placeholder="输入或选择保存容器"
+                                show-key="name" @on-result-change="_packSaveChange"></AutoComplete>
                 </div>
 <!--                <div v-else-if="item.key==='prepareDate'" @click="_handleTimeRow(scope)">-->
 <!--                  <el-date-picker-->
@@ -62,8 +62,8 @@
 <!--                  </el-date-picker>-->
 <!--                </div>-->
                 <div v-else-if="item.key==='prepareDate'" @click="_handleRow(scope)">
-                  <el-date-picker @change="timeChange(scope.row)" v-model="scope.row.prepareDate" type="datetime" format="yyyy-MM-dd HH:mm" style="width:100%;"
-                               placeholder="请选择日期"></el-date-picker>
+                  <el-date-picker v-model="scope.row.prepareDate" type="datetime" format="yyyy-MM-dd HH:mm" style="width:100%;" placeholder="请选择日期"
+                               @change="timeChange(scope.row)"></el-date-picker>
                 </div>
 <!--                <div v-else-if="item.key==='prepareDate' && isAccurate === '是'" @click="_handleRow(scope)">-->
 <!--                  <date-picker :editable="false" :transfer="true" v-model="scope.row.prepareDate" type="datetime"-->
@@ -90,12 +90,12 @@
 <!--                  </el-date-picker>-->
 <!--                </div>-->
                 <div v-else-if="item.key==='preparer'" @click="_handleRow(scope)">
-                  <el-input v-model="scope.row.preparer" @focus="_handleRow(scope)"
-                            placeholder="制备人" size="small" name="preparer"></el-input>
+                  <el-input v-model="scope.row.preparer" placeholder="制备人"
+                            size="small" name="preparer" @focus="_handleRow(scope)"></el-input>
                 </div>
                 <div v-else-if="item.key==='remark'" @click="_handleRow(scope)">
-                  <el-input v-model="scope.row.remark" @focus="_handleRow(scope)" placeholder="备注"
-                            size="small"></el-input>
+                  <el-input v-model="scope.row.remark" placeholder="备注" size="small"
+                            @focus="_handleRow(scope)"></el-input>
                 </div>
                 <span v-else>{{scope.row[item.key]}}</span>
               </template>
@@ -124,6 +124,8 @@
       <!--打印标签-->
       <!--选择人员-->
     </Modal>
+    <!--下载插件-->
+    <downloadPlugin ref="downloadPlugin" />
   </div>
 </template>
 
@@ -131,10 +133,14 @@
 import AutoComplete from '../../../components/base/AutoCompletes'
 import Global from '../../../api/config'
 import { soilEntrust } from '../../../api'
-
+import { getLodop } from '../../../plugins/clodop/LodopFuncs'
+// eslint-disable-next-line no-unused-vars
+import downloadPlugin from '../../../plugins/download/downloadPlugin'
+let LODOP
 export default {
   components: {
-    AutoComplete
+    AutoComplete,
+    downloadPlugin
   },
   data() {
     return {
@@ -146,7 +152,6 @@ export default {
       footerList: [],
       list: [
         { name: '取消', type: '', id: '' },
-        // {name: '仅流转微生物', type: 'primary', id: ''},
         { name: '制备完成', type: 'primary', id: '' }
       ],
       btn: [
@@ -510,7 +515,7 @@ export default {
       switch (msg) {
         case '打印标签':
           if (this.selectData.length > 0) {
-            this.$refs.printer._open()
+            this._printMessage()
           } else {
             this.$Message.warning('请至少选择一条数据')
           }
@@ -520,6 +525,71 @@ export default {
           break
       }
     },
+    // 下载插件
+    _pluginDownload() {
+      this.$refs.downloadPlugin._open()
+    },
+    _printMessage: function() {
+      LODOP = getLodop()
+      if (LODOP === 'undefined' || LODOP === undefined) {
+        this._pluginDownload()
+        return false
+      }
+      if (LODOP.GET_PRINTER_COUNT() === 0) {
+        this.$Messager.warning('系统未关联打印机,请确认....')
+        return false
+      }
+      const data = this.selectData
+      for (let i = 0; i < data.length; i++) {
+        LODOP.PRINT_INITA(
+          '0mm',
+          '0mm',
+          '60.01mm',
+          '40.01mm',
+          '打印控件功能演示_Lodop功能_打印图片3'
+        )
+        LODOP.ADD_PRINT_BARCODE(
+          '0.08mm',
+          '18.39mm',
+          '58.87mm',
+          '24.74mm',
+          'QRCode',
+          data[i].sampleCode + '-' + data[i].groupName
+        )
+        LODOP.ADD_PRINT_TEXT(
+          130,
+          13,
+          186,
+          20,
+          this._formatDate(data[i].prepareDate)
+        )
+        LODOP.SET_PRINT_STYLEA(0, 'Alignment', 2)
+        LODOP.ADD_PRINT_TEXT(113, 13, 187, 20, data[i].groupName)
+        LODOP.SET_PRINT_STYLEA(0, 'Alignment', 2)
+        LODOP.ADD_PRINT_TEXT(95, 12, 188, 20, data[i].sampleCode)
+        LODOP.SET_PRINT_STYLEA(0, 'Alignment', 2)
+
+        LODOP.PRINT_DESIGN()
+      }
+    },
+    // 时间戳转换方法    date:时间戳数字
+    _formatDate(time) {
+      const date = new Date(time)
+      const YY = date.getFullYear() + '-'
+      const MM =
+        (date.getMonth() + 1 < 10
+          ? '0' + (date.getMonth() + 1)
+          : date.getMonth() + 1) + '-'
+      const DD = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+      const hh =
+        (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':'
+      const mm =
+        (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) +
+        ':'
+      const ss =
+        date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+      return YY + MM + DD + ' ' + hh + mm + ss
+    },
     _printerResult(data) {
       this.$refs.printNumber._open(this.selectData, data.printerVal)
     },

pages/soil-sample-manage/sample-receive/ReceiveByEntrust.vue

@@ -348,7 +348,7 @@ export default {
       this.$nextTick(() => {
         switch (res) {
           case '管理样品':
-            this._editModal(data.id, data.type, data.cname)
+            this._editModal(data.id, data.type, data.entrustCode)
             break
           case '项目管理':
             this.$refs.itemManageModal._open(data.id)

pages/soil-sample-manage/sample-receive/ReceiveBySample.vue

@@ -94,13 +94,7 @@ export default {
           id: '',
           name: '管理样品'
         },
-        // {
-        //   type: 'md-create',
-        //   id: '',
-        //   name: '编辑协议'
-        // },
         { type: 'md-cloud', id: '', name: '附件' },
-        // { type: 'md-trash', id: '', name: '删除' },
         {
           type: 'ios-clock',
           id: '',
@@ -354,7 +348,7 @@ export default {
       this.$nextTick(() => {
         switch (res) {
           case '管理样品':
-            this._editModal(data.id, data.type, data.cname)
+            this._editModal(data.id, data.type, data.entrustCode)
             break
           case '项目管理':
             this.$refs.itemManageModal._open(data.id)

pages/soil-sample-manage/sample-receive/entrust-sample-manage/AlreadyIssuedHis.vue

@@ -40,7 +40,7 @@
                 <div v-if="item.detail"><a @click.stop="_detailModal(scope.row.id)">{{scope.row[item.key]}}</a></div>
                 <div v-else-if="item.key ==='shape'">{{scope.row['shape']}} {{scope.row['shapeRemark']}}</div>
                 <div v-else-if="item.date">
-                  {{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
+                  {{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):''}}
                 </div>
                 <div v-else>{{scope.row[item.key]}}</div>
               </template>
@@ -66,6 +66,11 @@ export default {
         { title: '试样编号', key: 'sampleCode', width: 100, fixed: 'left' },
         { title: '试样深度', key: 'sampleDepth', width: 95 },
         { title: '现场编号', key: 'siteNo', width: 100 },
+        { title: '接收人', key: 'receiver', width: 120 },
+        { title: '接收时间', key: 'receiveTime', width: 145, date: true },
+        { title: '收样存储位置', key: 'receiveLocation', width: 140 },
+        { title: '发放人', key: 'sender', width: 120 },
+        { title: '发放时间', key: 'sendTime', width: 144, date: true },
         { title: '土质描述', key: 'sampleDescribe', width: 185 },
         { title: '样品包装类型', key: 'samplePack', width: 120 }
       ],

pages/soil-sample-manage/sample-receive/entrust-sample-manage/SampleManage.vue

 <template>
   <div>
-    <Modal v-model="showSampleModal" @on-visible-change="_visibleChange" width="818"
+    <Modal v-model="showSampleModal" @on-visible-change="_visibleChange" width="1000"
            class="zIndex-900 modal-footer-none">
       <p slot="header"> {{name}}--管理样品</p>
       <div>

pages/soil-sample-manage/sample-receive/entrust-sample-manage/SampleManageHis.vue

 <template>
   <div>
-    <Modal v-model="showSampleModal" @on-visible-change="_visibleChange" width="818"
+    <Modal v-model="showSampleModal" @on-visible-change="_visibleChange" width="1100"
            class="zIndex-900 modal-footer-none">
       <p slot="header"> {{name}}--管理样品</p>
       <div>

pages/soil-sample-manage/sample-receive/entrust-sample-manage/WaitReceive.vue

@@ -66,11 +66,12 @@ export default {
       selectIds: [],
       getPage: {},
       pageColumns: [
-        { title: '试样编号', key: 'sampleCode', width: 100, fixed: 'left' },
-        { title: '试样深度', key: 'sampleDepth', width: 95 },
-        { title: '现场编号', key: 'siteNo', width: 100 },
-        { title: '土质描述', key: 'sampleDescribe', width: 185 },
-        { title: '样品包装类型', key: 'samplePack', width: 120 }
+        { title: '试样编号', key: 'sampleCode', width: 120, fixed: 'left' },
+        { title: '试样深度', key: 'sampleDepth', width: 120 },
+        { title: '现场编号', key: 'siteNo', width: 120 },
+        { title: '土质描述', key: 'sampleDescribe', width: 205 },
+        { title: '样品包装类型', key: 'samplePack', width: 120 },
+        { title: '备注', key: 'remark', width: 210 }
       ],
       iconMsg: [{ type: 'ios-list', id: '', name: '试验项目' }],
       type: '',

pages/soil-sample-manage/sample-receive/entrust-sample-manage/WaitReceiveHis.vue

@@ -46,7 +46,7 @@
                 <div v-if="item.detail"><a @click.stop="_detailModal(scope.row.id)">{{scope.row[item.key]}}</a></div>
                 <div v-else-if="item.key ==='shape'">{{scope.row['shape']}} {{scope.row['shapeRemark']}}</div>
                 <div v-else-if="item.date">
-                  {{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
+                  {{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):''}}
                 </div>
                 <div v-else>{{scope.row[item.key]}}</div>
               </template>
@@ -77,6 +77,9 @@ export default {
         { title: '试样编号', key: 'sampleCode', width: 100, fixed: 'left' },
         { title: '试样深度', key: 'sampleDepth', width: 95 },
         { title: '现场编号', key: 'siteNo', width: 100 },
+        { title: '接收人', key: 'receiver', width: 120 },
+        { title: '接收时间', key: 'receiveTime', width: 140, date: true },
+        { title: '收样存储位置', key: 'receiveLocation', width: 140 },
         { title: '土质描述', key: 'sampleDescribe', width: 185 },
         { title: '样品包装类型', key: 'samplePack', width: 120 }
       ],

pages/soil-sample-manage/sample-take/TakeByEntrust.vue

@@ -107,12 +107,8 @@ export default {
         { title: '水深（米）', key: 'waterDepth', width: 120 },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
         { title: '进度', key: 'progress', width: 120, status: true },
-        // { title: '工程号', key: 'projectNo', width: 120 },
-        // { title: '报告编号', key: 'reportCode', width: 120 },
         { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
         { title: '制表人', key: 'tabulater', width: 120 },
-        // { title: '批准日期', key: 'approveDate', width: 120, date: true },
-        // { title: '批准人', key: 'approver', width: 120 },
         { title: '检验类别', key: 'testType', width: 120 }
       ],
       searchOpen: false,
@@ -211,7 +207,7 @@ export default {
       this.$nextTick(() => {
         switch (res) {
           case '管理样品':
-            this._editModal(data.id, data.type, data.cname)
+            this._editModal(data.id, data.type, data.entrustCode)
             break
           case '项目管理':
             this.$refs.itemManageModal._open(data.id)

pages/soil-sample-manage/sample-take/TakeSampleManage.vue

 <template>
   <div>
-    <Modal v-model="showSampleModal" width="818"
+    <Modal v-model="showSampleModal" width="1100"
            class="zIndex-900 modal-footer-none">
     <div>
       <!--内容-->
       <Row>
         <!--查询-->
         <Col span="24" style="padding-bottom: 5px">
-          <Form id="search-wait" :label-width="90" v-show="searchOpen" inline onsubmit="return false">
+          <Form v-show="searchOpen" id="search-wait" :label-width="90" inline onsubmit="return false">
             <label class="label-sign"></label>
             <Form-item label="试样编号:" class="search-item">
-              <Input @on-enter="_formSearch" v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入样品编号" clearable></Input>
+              <Input v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入样品编号" clearable @on-enter="_formSearch"></Input>
               <input name="contractId" type="hidden">
             </Form-item>
             <Form-item class="search-btn">
-              <Button @click="_formSearch" type="primary">搜索</Button>
+              <Button type="primary" @click="_formSearch">搜索</Button>
             </Form-item>
           </Form>
         </Col>
         <Col span="24">
-          <btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" :show-search-btn="true" class="contHide">
+          <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide" @on-result-change="_btnClick">
             <!--<template slot="processTask">-->
             <!--<div class="fr process-task">-->
             <!--<Button @click="_exportReceiveRecord">导出交接记录</Button>-->
@@ -30,11 +30,11 @@
         <Col span="24">
           <PTVXETable
             ref="pageTable"
-            :tableHeight="tableHeight"
-            @on-result-change="_tableResultChange"
-            :getPage="getPage"
+            :table-height="tableHeight"
+            :get-page="getPage"
             :icon-msg="iconMsg"
-            select-data>
+            select-data
+            @on-result-change="_tableResultChange">
             <vxe-table-column
               v-for="item in pageColumns"
               :key="item.key"
@@ -48,7 +48,7 @@
                 <div v-if="item.detail"><a @click.stop="_detailModal(scope.row.id)">{{scope.row[item.key]}}</a></div>
                 <div v-else-if="item.key ==='shape'">{{scope.row['shape']}} {{scope.row['shapeRemark']}}</div>
                 <div v-else-if="item.date">
-                  {{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
+                  {{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):''}}
                 </div>
                 <div v-else>{{scope.row[item.key]}}</div>
               </template>
@@ -75,9 +75,12 @@ export default {
       pageColumns: [
         { title: '试样编号', key: 'sampleCode', width: 100, fixed: 'left' },
         { title: '试样深度', key: 'sampleDepth', width: 95 },
-        { title: '现场编号', key: 'siteNo', width: 100 },
+        { title: '检测科室', key: 'groupName', width: 95 },
         { title: '土质描述', key: 'sampleDescribe', width: 185 },
-        { title: '样品包装类型', key: 'samplePack', width: 120 }
+        { title: '样品描述', key: 'describeDetail', width: 185 },
+        { title: '样品包装类型', key: 'samplePack', width: 120 },
+        { title: '样品制备人', key: 'preparer', width: 120 },
+        { title: '样品制备时间', key: 'prepareDate', width: 135, date: true }
       ],
       iconMsg: [{ type: 'ios-list', id: '', name: '试验项目' }],
       type: '',

pages/soil-test-manage/test-task-manage/entrust-sample-manage/SampleManage.vue

@@ -12,10 +12,6 @@
             <WaitScan ref="waitScanModal"></WaitScan>
           </el-tab-pane>
         </el-tabs>
-<!--        <keep-alive>-->
-<!--          &lt;!&ndash; eslint-disable-next-line vue/require-component-is &ndash;&gt;-->
-<!--          <component ref="refModal" :is="currentComponent"></component>-->
-<!--        </keep-alive>-->
       </div>
     </Modal>
   </div>

plugins/download/downloadPlugin.vue

+<template>
+  <div>
+    <Modal v-model="showBackModal" class="zIndex-1100 modal-footer-none">
+      <p slot="header">{{modalTitle}}</p>
+      <div>
+        <p @click="_download">未安装打印控件,点此<span style="color: blue;cursor:pointer">下载</span>,安装完请刷新当前页面</p>
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+/**
+ * 打印下载 exe
+ */
+export default {
+  data() {
+    return {
+      modalTitle: '下载',
+      showBackModal: false
+    }
+  },
+  methods: {
+    _open() {
+      this.showBackModal = true
+    },
+    _cancel() {
+      this.showBackModal = false
+    },
+    _download() {
+      window.open(
+        'http://static.patzn.com/clodop/CLodop_Setup_for_Win32NT.exe',
+        '_blank'
+      )
+      this._cancel()
+    }
+  }
+}
+</script>