土工试验Lims

pages/soil-test-manage/test-task-manage-his/entrust-sample-manage/item-tabs/ItemRightList.vue

@@ -6,21 +6,21 @@
         <Form id="task-assign-item-right" :label-width="70" inline onsubmit="return false">
           <label class="label-sign"></label>
           <Form-item class="search-item" label="检测项目:">
-            <Input v-model="formObj.client" @on-enter="_formSearch" placeholder="请输入检测项目" clearable></Input>
+            <Input v-model="formObj.client" placeholder="请输入检测项目" clearable @on-enter="_formSearch"></Input>
           </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" @on-result-change="_btnClick" class="contHide"></btn-list>
+        <btn-list :msg="btn" class="contHide" @on-result-change="_btnClick"></btn-list>
       </Col>
       <!-- 表格 -->
       <Col span="24">
-        <PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight"
-                    @on-result-change="_tableResultChange" :getPage="getPage" :table-name="tableName"  is-task select-data>
+        <PTVXETable ref="pageTable" :page-columns="pageColumns" :table-height="tableHeight"
+                    :get-page="getPage" :table-name="tableName" is-task  select-data @on-result-change="_tableResultChange">
           <vxe-table-column
             v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
             :key="item.key"
@@ -41,8 +41,8 @@
               <span v-else>{{scope.row[item.key]}}</span>
             </template>
           </vxe-table-column>
-          <VXESettingCol slot="setting" :pageColumns="pageColumns" :userColumns="userColumns"
-                         @on-result-change="_resetColumn" :table-name="tableName"></VXESettingCol>
+          <VXESettingCol slot="setting" :page-columns="pageColumns" :user-columns="userColumns"
+                         :table-name="tableName" @on-result-change="_resetColumn"></VXESettingCol>
         </PTVXETable>
       </Col>
     </Row>
@@ -69,41 +69,14 @@ export default {
       // 用户自己选中的列
       userColumns: [],
       currentComponent: '',
-      optionList: [
-        { key: 'name', name: '检测项目', placeholder: '请输入检测项目' },
-        { key: 'code', name: '委托编号', placeholder: '请输入委托编号' },
-        { key: 'num', name: '样品编号', placeholder: '请输入样品编号' },
-        { key: 'sampleName', name: '样品名称', placeholder: '请输入样品名称' },
-        { key: 'testBasis', name: '检测依据', placeholder: '请输入检测依据' },
-        {
-          key: 'resultDate',
-          name: '数据出具日期',
-          placeholder: '请选择数据出具日期',
-          date: true
-        },
-        {
-          key: 'receiveDate',
-          name: '接样日期',
-          placeholder: '请选择接样日期',
-          date: true
-        },
-        { key: 'tester', name: '主检人', placeholder: '请输入主检人' },
-        { key: 'detectType', name: '样品类别', placeholder: '请输入样品类别' }
-      ],
-      btn: [
-        { type: 'success', id: '', name: '试验项目分配' },
-        { type: '', id: 'food-task-assign-adjust-group', name: '调整分组' },
-        {
-          type: '',
-          id: 'food-task-assign-plan-date',
-          name: '设置计划完成时间'
-        },
-        { type: '', id: 'food-task-assign-maintain-info', name: '信息维护' }
-      ],
+      btn: [{ type: 'success', id: '', name: '调整试验项目检测人' }],
       getPage: {},
       pageColumns: [
         { title: '检测项目', key: 'name', width: 120, fixed: 'left' },
         { title: '试样编号', key: 'sampleCode', width: 180 },
+        { title: '试验人员', key: 'tester', width: 180 },
+        { title: '分配人', key: 'alloter', width: 180 },
+        { title: '分配时间', key: 'allotTime', width: 180 },
         { title: '试样深度', key: 'sampleDepth', width: 180 },
         { title: '试样包装类型', key: 'samplePack', width: 180 },
         { title: '大类', key: 'mainType', width: 140 },