优化修改

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

@@ -105,8 +105,8 @@ export default {
       selectData: [],
       getPage: {},
       pageColumns: [
-        { title: '样品名称', key: 'name', width: 120 },
-        { title: '样品编号', key: 'code', width: 120 },
+        { title: '样品名称', key: 'name', width: 130 },
+        { title: '样品编号', key: 'code', width: 150 },
         { title: '型号规格', key: 'spec' },
         { title: '出厂编号', key: 'factoryNumber' },
         { title: '检测类型', key: 'type' },

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

@@ -6,29 +6,29 @@
         <Row>
           <!--查询-->
           <Col span="24" style="margin-top: 10px">
-            <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
+            <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" @on-enter="_formSearch" name="name" placeholder="请输入样品名称" clearable/>
+                <Input v-model="formObj.name" name="name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item class="search-item" label="样品编号:">
-                <Input v-model="formObj.code" @on-enter="_formSearch" name="aptitude" placeholder="请输入样品编号" clearable/>
+                <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>
+                <Button type="primary" @click="_formSearch">搜索</Button>
               </Form-item>
             </Form>
           </Col>
           <!--操作-->
           <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 ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
-                        :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
+                        :get-page="getPage" :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -160,9 +160,9 @@ export default {
       getPage: {},
       pageColumns: [
         { title: '样品名称', key: 'name', width: 120 },
-        { title: '样品编号', key: 'code', width: 120 },
+        { title: '样品编号', key: 'code', width: 150 },
         { title: '证书是否编制', key: 'onlineReported', width: 120 },
-        { title: '证书编号', key: 'reportCode', width: 130 },
+        { title: '证书编号', key: 'reportCode', width: 150 },
         { title: '型号规格', key: 'spec', width: 115 },
         { title: '出厂编号', key: 'factoryNumber', width: 115 },
         { title: '制造厂商', key: 'manufacturer', width: 125 },
@@ -402,6 +402,7 @@ export default {
         //   data.tempId,
         //   data.dataSource
         // )
+        console.log('_certificateSelectBack--', data)
         this._makeCode(data)
       } else {
         const ids = this.selectIds

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

@@ -184,6 +184,7 @@ export default {
         const param = {
           sampleId: this.sampleId,
           tempId: this.selectData[0].id,
+          remark: this.selectData[0].remark,
           dataSource: this.sampleData
         }
         console.log(param)

pages/meter-send/task-distribute/MeterTaskAlloca.vue

@@ -43,11 +43,15 @@
                      {{scope.row[item.key]===1?'是':'否'}}
                   </div>
                   <div v-else-if="item.key==='type'">
-                    <Select v-model="scope.row.type">
-                      <Option v-for="(item,index) in options" :key="item.name" :value="index">
-                        {{ item.name }}
-                      </Option>
-                    </Select>
+                      <span v-if="scope.row[item.key]===0">
+                        检定
+                      </span>
+                    <span v-if="scope.row[item.key]===1">
+                        校准
+                      </span>
+                    <span v-if="scope.row[item.key]===2">
+                        外观检查
+                     </span>
                   </div>
                   <div v-else>{{scope.row[item.key]}}</div>
                 </template>
@@ -116,12 +120,12 @@ export default {
           type: 'success',
           id: 'meter-task-alloca-allocation-btn',
           name: '分配任务'
-        },
-        {
-          type: 'success',
-          id: 'meter-task-alloca-import-item-btn',
-          name: '导入检测项目'
         }
+        //, {
+        //   type: 'success',
+        //   id: 'meter-task-alloca-import-item-btn',
+        //   name: '导入检测项目'
+        // }
       ],
       searchOpen: false,
       options: [
@@ -142,9 +146,9 @@ export default {
       selectData: [],
       getPage: {},
       pageColumns: [
-        { title: '样品编号', key: 'code', width: 120 },
+        { title: '样品编号', key: 'code', width: 135 },
         { title: '样品名称', key: 'name', width: 140 },
-        { title: '检测项目', key: 'itemNames', width: 140 },
+        // { title: '检测项目', key: 'itemNames', width: 140 },
         { title: '型号规格', key: 'spec', width: 140 },
         { title: '出厂编号', key: 'factoryNumber', width: 140 },
         { title: '是否分包', key: 'jobOut', width: 110 },