修改了委托登记试样列表

pages/meter-entrust/SoilSampleItemManage.vue

@@ -12,7 +12,7 @@
           <Form id="search-sample-company" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
             <label class="label-sign"></label>
             <Form-item label="试验名称:" class="search-item">
-              <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入检测项目" clearable />
+              <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入试验名称" clearable />
             </Form-item>
             <Form-item label="试验科室:" class="search-item">
               <Input v-model="formObj.groupName" @on-enter="_formSearch" placeholder="请输入试验科室" clearable />

pages/meter-entrust/SoilSampleItemManageHis.vue

@@ -11,11 +11,11 @@
           <Col span="24">
           <Form id="search-sample-company" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
             <label class="label-sign"></label>
-            <Form-item label="检测项目:" class="search-item">
-              <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入检测项目" clearable />
+            <Form-item label="试验名称:" class="search-item">
+              <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入试验名称" clearable />
             </Form-item>
-            <Form-item label="检测依据:" class="search-item">
-              <Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入检测依据" clearable />
+            <Form-item label="试验科室:" class="search-item">
+              <Input v-model="formObj.groupName" @on-enter="_formSearch" placeholder="请输入试验科室" clearable />
             </Form-item>
             <Form-item class="search-btn">
               <Button @click="_formSearch" type="primary">
@@ -141,7 +141,9 @@ export default {
       ],
       pageColumns: [
         { title: '试验名称', key: 'name', width: 160 },
+        { title: '试样编号', key: 'sampleCode', width: 160 },
         { title: '试验项目英文简写', key: 'shortName', width: 140 },
+        { title: '试验科室', key: 'groupName', width: 140 },
         { title: '大类', key: 'mainType', width: 140 },
         { title: '小类', key: 'smallType' },
         { title: '检测依据', key: 'testBasis', width: 180 },

pages/meter-entrust/SoilSampleManage.vue

 <template>
   <div>
-    <Modal v-model="showModal" width="1200" class="modal-footer-none">
+    <Modal v-model="showModal" width="1010" class="modal-footer-none">
       <p slot="header">
         {{ modalTitle }}
       </p>
@@ -12,7 +12,7 @@
           <Form id="search-sample-company" v-show="searchOpen" :label-width="80" inline onsubmit="return false">
             <label class="label-sign"></label>
             <Form-item label="试样编号:" class="search-item">
-              <Input v-model="formObj.sampleCode" @on-enter="_formSearch" placeholder="请输入样品编号" clearable />
+              <Input v-model="formObj.sampleCode" @on-enter="_formSearch" placeholder="请输入试样编号" clearable />
             </Form-item>
             <Form-item label="现场编号:" class="search-item">
               <Input v-model="formObj.siteNo" @on-enter="_formSearch" placeholder="请输入现场编号" clearable />
@@ -37,7 +37,7 @@
                 :key="item.key"
                 :field="item.key"
                 :title="item.title"
-                :min-width="item.width?item.width:200"
+                :width="item.width?item.width:200"
                 :fixed="item.fixed?item.fixed:undefined" sortable>
               <template slot-scope="scope">
                 <div v-if="item.status">
@@ -46,9 +46,9 @@
                 <div v-else-if="item.date">
                   {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):'' }}
                 </div>
-                <div v-else>
+                <span v-else>
                   {{ scope.row[item.key] }}
-                </div>
+                </span>
               </template>
             </vxe-table-column>
           </PTVXETable>
@@ -118,8 +118,8 @@ export default {
         { title: '试样深度', key: 'sampleDepth', width: 100 },
         { title: '现场编号', key: 'siteNo', width: 100 },
         { title: '试验项目', key: 'experimentNames' },
-        { title: '土质描述', key: 'sampleDescribe', width: 100 },
-        { title: '样品包装类型', key: 'samplePack', width: 80 }
+        { title: '土质描述', key: 'sampleDescribe', width: 150 },
+        { title: '样品包装类型', key: 'samplePack', width: 120 }
       ],
       sampleId: '',
       dateList: [],

pages/meter-entrust/SoilSampleManageHis.vue

 <template>
   <div>
-    <Modal v-model="showModal" width="1200" class="modal-footer-none">
+    <Modal v-model="showModal" width="1010" class="modal-footer-none">
       <p slot="header">
         {{ modalTitle }}
       </p>
@@ -11,24 +11,12 @@
           <Col span="24">
           <Form id="search-sample-company" v-show="searchOpen" :label-width="80" inline onsubmit="return false">
             <label class="label-sign"></label>
-            <Form-item label="样品名称:" class="search-item">
-              <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入样品名称" clearable />
-            </Form-item>
-            <Form-item label="样品编号:" class="search-item">
+            <Form-item label="试样编号:" class="search-item">
               <Input v-model="formObj.sampleCode" @on-enter="_formSearch" placeholder="请输入样品编号" clearable />
             </Form-item>
-            <!--            <Form-item label="制单日期:" style="width: 25%">-->
-            <!--              <Date-picker-->
-            <!--                v-model="dateList"-->
-            <!--                type="daterange"-->
-            <!--                placeholder="制单日期"-->
-            <!--                format="yyyy-MM-dd"-->
-            <!--                :editable="false"-->
-            <!--                style="width:100%"-->
-            <!--                placement="bottom-end"-->
-            <!--                @on-change="_dateChange"-->
-            <!--              ></Date-picker>-->
-            <!--            </Form-item>-->
+            <Form-item label="现场编号:" class="search-item">
+              <Input v-model="formObj.siteNo" @on-enter="_formSearch" placeholder="请输入现场编号" clearable />
+            </Form-item>
             <Form-item class="search-btn">
               <Button @click="_page" type="primary">
                 搜索
@@ -49,7 +37,7 @@
                 :key="item.key"
                 :field="item.key"
                 :title="item.title"
-                :min-width="item.width?item.width:200"
+                :width="item.width?item.width:200"
                 :fixed="item.fixed?item.fixed:undefined" sortable>
               <template slot-scope="scope">
                 <div v-if="item.detail">
@@ -61,9 +49,9 @@
                 <div v-else-if="item.date">
                   {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):'' }}
                 </div>
-                <div v-else>
+                <span v-else>
                   {{ scope.row[item.key] }}
-                </div>
+                </span>
               </template>
             </vxe-table-column>
           </PTVXETable>
@@ -119,11 +107,12 @@ export default {
       selectData: {},
       getPage: {},
       pageColumns: [
-        { title: '试样编号', key: 'sampleCode', width: 160, fixed: 'left' },
-        { title: '试样深度', key: 'sampleDepth', width: 160 },
-        { title: '土质描述', key: 'sampleDescribe', width: 160 },
-        { title: '样品包装类型', key: 'samplePack', width: 160 },
-        { title: '现场编号', key: 'siteNo', width: 130 }
+        { title: '试样编号', key: 'sampleCode', width: 100, fixed: 'left' },
+        { title: '试样深度', key: 'sampleDepth', width: 100 },
+        { title: '现场编号', key: 'siteNo', width: 100 },
+        { title: '试验项目', key: 'experimentNames' },
+        { title: '土质描述', key: 'sampleDescribe', width: 150 },
+        { title: '样品包装类型', key: 'samplePack', width: 120 }
       ],
       sampleId: '',
       dateList: [],