Merge remote-tracking branch 'origin/dev' into dev

pages/workbench/sample-progress/SampleProgress.vue

@@ -3,6 +3,17 @@
     <div class="layout-content-padding">
       <div class="layout-content-main">
         <Row style="margin-top: 10px;">
+          <Form id="search-form-sample-progress" :label-width="80" inline onsubmit="return false">
+          <Form-item label="试验名称:" class="search-item">
+            <Input @on-enter="_search" v-model="formObj.name" name="name" placeholder="请输入试验名称" style="width:100%" clearable></Input>
+          </Form-item>
+            <Form-item label="钻孔名称:" class="search-item">
+              <Input @on-enter="_search" v-model="formObj.boreholeName" name="boreholeName" placeholder="请输入钻孔名称" style="width:100%" clearable></Input>
+            </Form-item>
+          <Form-item class="search-item">
+            <Button @click="_search" type="primary" class="width-80">搜索</Button>
+          </Form-item>
+            </Form>
           <!--查询条件-->
           <!--样品进度-->
           <!--<Col span="24">-->
@@ -41,7 +52,7 @@ export default {
       contractId: '',
       //
       page: 0,
-      rows: 50,
+      rows: 30,
       formObj: {},
       processObj: {
         height: document.documentElement.clientHeight - 300 + 'px'
@@ -74,7 +85,9 @@ export default {
         this.sampleInfo = []
       }
       Object.assign(this.formObj, this._searchParams())
-      const result = await soilStatistics.listExperimentProgress(this.formObj)
+      const result = await soilStatistics.listExperimentProgress(
+        this.$serializeForm(this.formObj)
+      )
       if (result) {
         const records = result.records
         const pages = result.pages

pages/workbench/sample-progress/SampleSteps.vue

@@ -101,4 +101,10 @@ export default {
   float: left;
   width: 65%;
 }
+.contract-box {
+  margin: 10px 0;
+}
+.contract-box {
+  border: 1px solid #dcdcdc;
+}
 </style>