证书编制修改

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

@@ -183,10 +183,14 @@ export default {
       pageColumns: [
         { title: '样品名称', key: 'name', width: 160 },
         { title: '型号规格', key: 'spec' },
+        { title: '检定依据', key: 'verification' },
         { title: '出厂编号', key: 'factoryNumber' },
+        { title: '制造单位', key: 'manufacturer' },
         { title: '检测类型', key: 'type' },
-        { title: '数量', key: 'quantity' }
-        // {title: '限制范围或说明', key: 'limitDescription'},
+        { title: '数量', key: 'quantity' },
+        { title: '单价', key: 'price' },
+        { title: '总价', key: 'totalPrice' },
+        { title: '备注', key: 'remark' }
       ],
       btn: [
         {

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

@@ -52,6 +52,7 @@
 <script>
 import { meterEntrust } from '../../../api'
 import MeterSampleManage from '../MeterSampleManage'
+import http from '../../../api/http'
 import MeterSubcontractorEdit from './MeterSendTestEdit'
 import MeterSendOperation from './MeterSendOperation'
 export default {
@@ -90,6 +91,7 @@ export default {
           name: '管理样品'
         },
         { type: 'md-cloud', id: '', name: '附件' },
+        { type: 'md-document', id: '', name: '导出委托单' },
         { type: 'md-remove-circle', id: '', name: '删除' },
         {
           type: 'ios-clock',
@@ -164,6 +166,9 @@ export default {
           case '附件':
             this._upload(data.id)
             break
+          case '导出委托单':
+            this._exportEntrust(data.id)
+            break
           case '删除':
             this._deleteByIds([data.id])
             break
@@ -284,6 +289,16 @@ export default {
       // 上传文件
       this.$refs.FileManage._open(id, 'contractId')
     },
+    _exportEntrust(id) {
+      this.$Modal.confirm({
+        title: '提示',
+        content: '确定导出委托单？',
+        onOk: () => {
+          http.open('/meter/v1/entrust/export_send_entrust/?id=' + id)
+        }
+      })
+    },
+
     _getById: async function(id) {
       const result = await meterEntrust.getVOById(id)
       if (result) {

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

@@ -88,15 +88,19 @@
                 </div>
 
                 <div v-if="item.key==='verification'" @click.stop="_handleRow(scope)">
-                  <el-input v-model="scope.row.verification" blur placeholder="请输入或选择检定依据"
+                  <el-input v-model="scope.row.verification" blur placeholder="请输入检定依据"
                   ></el-input>
                 </div>
                 <div v-if="item.key==='spec'" @click.stop="_handleRow(scope)">
-                  <el-input v-model="scope.row.spec" blur placeholder="请输入或选择型号规格"
+                  <el-input v-model="scope.row.spec" blur placeholder="请输入型号规格"
                   ></el-input>
                 </div>
                 <div v-if="item.key==='factoryNumber'" @click.stop="_handleRow(scope)">
-                  <el-input v-model="scope.row.factoryNumber" blur placeholder="请输入或选择出厂编号"
+                  <el-input v-model="scope.row.factoryNumber" blur placeholder="请输入出厂编号"
+                  ></el-input>
+                </div>
+                <div v-if="item.key==='manufacturer'" @click.stop="_handleRow(scope)">
+                  <el-input v-model="scope.row.manufacturer" blur placeholder="请输入制造单位"
                   ></el-input>
                 </div>
                 <div v-if="item.key==='type'" @click.stop="_handleRow(scope)">
@@ -204,6 +208,7 @@ export default {
         { title: '型号规格', key: 'spec' },
         { title: '检定依据', key: 'verification' },
         { title: '出厂编号', key: 'factoryNumber' },
+        { title: '制造单位', key: 'manufacturer' },
         { title: '检测类型', key: 'type' },
         { title: '数量', key: 'quantity' },
         { title: '单价', key: 'price' },

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

@@ -8,11 +8,11 @@
           <Col span="24" style="margin-top: 10px">
             <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" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/>
+              <Form-item class="search-item" label="样品名称:">
+                <Input v-model="formObj.name" name="name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
               </Form-item>
-              <Form-item class="search-item" label="资质:">
-                <Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
+              <Form-item class="search-item" label="样品编号:">
+                <Input v-model="formObj.code" name="aptitude" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item class="search-btn">
                 <Button @click="_formSearch" type="primary">搜索</Button>
@@ -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"
@@ -122,6 +122,11 @@ export default {
         {
           type: 'success',
           id: '',
+          name: '提交至证书编制'
+        },
+        {
+          type: 'success',
+          id: '',
           name: '检定条件'
         }
       ],
@@ -155,13 +160,15 @@ export default {
       ],
       formObj: {
         name: undefined,
-        aptitude: undefined
+        code: undefined
       },
       selectIds: [],
+      selectData: [],
       getPage: {},
       pageColumns: [
         { title: '样品名称', key: 'name', width: 120 },
         { title: '样品编号', key: 'code', width: 120 },
+        { title: '证书是否编制', key: 'onlineReported', width: 120 },
         { title: '型号规格', key: 'spec', width: 120 },
         { title: '出厂编号', key: 'factoryNumber', width: 120 },
         { title: '检测类型', key: 'type', width: 100 },
@@ -208,7 +215,10 @@ export default {
             this._editModal(false)
             break
           case '提交':
-            this._submitToReview()
+            this._submitToReportReview()
+            break
+          case '提交至证书编制':
+            this._submitToReportMake()
             break
           case 'search':
             this.searchOpen = !this.searchOpen
@@ -233,26 +243,57 @@ export default {
         this.$refs.SelEquip._open('sample-input')
       }
     },
-    _submitToReview() {
-      this._submitByContractIds('委托评审')
+    _submitToReportReview() {
+      const ids = this.selectIds
+      const data = this.selectData
+      if (ids.length === 0) {
+        this.$Message.warning('请至少选择一条数据！')
+      } else {
+        for (let i = 0; i < data.length; i++) {
+          if (data[i].recordId === undefined) {
+            this.$Message.warning(
+              '您选择的样品编号为' + data[i].code + '暂未编制证书，无法提交！'
+            )
+            return false
+          }
+        }
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定要把这 ' + ids.length + ' 条记录提交到证书核准？',
+          onOk: () => {
+            this._submitReportCheck(ids)
+          }
+        })
+      }
+    },
+    _submitReportCheck: async function(ids) {
+      const result = await meterSample.toReportCheck(ids)
+      if (result) {
+        await this._page()
+        this.$Message.success('提交成功！')
+      }
     },
-    _submitByContractIds(cont) {
+    _submitToReportMake() {
       const ids = this.selectIds
       if (ids.length === 0) {
         this.$Message.warning('请至少选择一条数据！')
       } else {
         this.$Modal.confirm({
           title: '提示',
-          content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？',
+          content: '确定要把这 ' + ids.length + ' 条记录提交到证书编制？',
           onOk: () => {
-            const result = meterSample.submit(ids)
-            if (result) {
-              console.log(result)
-            }
+            this._submitReportMake(ids)
           }
         })
       }
     },
+    _submitReportMake: async function(ids) {
+      const result = await meterSample.toReportMake(ids)
+      if (result) {
+        await this._page()
+        this.$Message.success('提交成功！')
+      }
+    },
     _iconClick(res, data, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {
@@ -361,8 +402,12 @@ 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 'changeSize':
           this._page()

pages/meter-send/sample-input/MeterSampleInput.vue

@@ -8,11 +8,11 @@
           <Col span="24" style="margin-top: 10px">
             <Form v-show="searchOpen" id="formId" :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"/>
+              <Form-item class="search-item" label="样品名称:">
+                <Input v-model="formObj.name" name="name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
               </Form-item>
-              <Form-item class="search-item" label="资质:">
-                <Input v-model="formObj.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/>
+              <Form-item class="search-item" label="样品编号:">
+                <Input v-model="formObj.code" name="aptitude" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item class="search-btn">
                 <Button type="primary" @click="_formSearch">搜索</Button>
@@ -151,7 +151,7 @@ export default {
       ],
       formObj: {
         name: undefined,
-        aptitude: undefined
+        code: undefined
       },
       selectIds: [],
       selectData: [],