土工试验Lims

pages/meter-entrust/SoilSampleManage.vue

@@ -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 label="现场编号:" class="search-item">
+              <Input v-model="formObj.siteNo" @on-enter="_formSearch" placeholder="请输入现场编号" clearable />
             </Form-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 class="search-btn">
               <Button @click="_page" type="primary">
                 搜索
@@ -133,12 +121,13 @@ export default {
         { title: '试样深度', key: 'sampleDepth', width: 160 },
         { title: '土质描述', key: 'sampleDescribe', width: 160 },
         { title: '样品包装类型', key: 'samplePack', width: 160 },
-        { title: '现场编号', key: 'siteNo', width: 130 }
+        { title: '现场编号', key: 'siteNo', width: 130 },
+        { title: '试验项目', key: 'experimentNames', width: 330 }
       ],
       sampleId: '',
       dateList: [],
       formObj: {
-        name: undefined,
+        siteNo: undefined,
         sampleCode: undefined
       }
     }

pages/meter-entrust/entrust-register/EntrustRegister.vue

@@ -135,7 +135,7 @@ export default {
       selectIds: [],
       getPage: {},
       pageColumns: [
-        { title: '委托商', key: 'client', width: 200 },
+        { title: '委托商', key: 'client', width: 230 },
         { title: '委托编号', key: 'entrustCode', width: 120 },
         { title: '委托日期', key: 'entrustDate', width: 120, date: true },
         { title: '钻孔位置', key: 'boreholeLocation', width: 120 },