修改了备样管理

pages/soil-sample-manage/backups-manage/tab/SampleBackupsManage.vue

@@ -27,36 +27,24 @@
           <!--样品数量-->
           <!-- 表格 -->
           <Col span="24">
-            <PTVXETableTemp
-              id="samplePreManage"
-              ref="pageTable"
-              :tableHeight="tableHeight"
-              :getPage="getPage"
-              @on-result-change="_tableResultChange"
-              select-data>
+            <PTVXETableHeight ref="pageTable" :table-height="tableHeight" :loading="true"
+                        :get-page="getPage" @on-result-change="_tableResultChange">
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
                 :field="item.key"
                 :title="item.title"
-                :width="item.width"
-                :min-width="200"
-                :fixed="item.fixed?item.fixed:undefined"
-                sortable
-              >
+                :min-width="item.width?item.width:200"
+                :fixed="item.fixed?item.fixed:undefined" sortable>
                 <template slot-scope="scope">
-                  <div v-if="item.key==='status'">
-                    {{scope.row[item.key]===undefined?'':scope.row[item.key].display}}
-                  </div>
-                  <a v-else-if="item.key==='code'" @click.stop="_detailModal(scope.row)">{{scope.row[item.key]}}</a>
-                  <a v-else-if="item.key==='sampleSn'"
-                     @click.stop="_sampleDetailModal(scope.row)">{{scope.row[item.key]}}</a>
-                  <div v-else-if="item.key==='backupPlace'" @click.stop="_handleIndex(scope)">
-                    <div v-if="editIndex!==scope.rowIndex">{{scope.row[item.key]}}</div>
+                  <span v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
+                  <span v-else-if="item.status">{{scope.row[item.key].display}}</span>
+                  <div v-else-if="item.key==='quantity'" @click.stop="_handleIndex(scope)">
+                    <div v-if="editIndex!==scope.rowIndex">
+                      {{scope.row[item.key]}}
+                    </div>
                     <div v-else>
-                      <AutoCompletes :value="scope.row.backupPlace" :downData="locList" @on-result-change="_locChange"
-                                     name="backupPlace" placeholder="请输入或选择存储位置" focus
-                                     show-key="backupPlace"></AutoCompletes>
+                      <el-input v-model="scope.row.quantity" clearable></el-input>
                     </div>
                   </div>
                   <div v-else-if="item.key==='conditions'" @click.stop="_handleIndex(scope)">
@@ -68,30 +56,6 @@
                       </el-select>
                     </div>
                   </div>
-                  <div v-else-if="item.key==='handleQuantity'" @click.stop="_handleIndex(scope)">
-                    <div v-if="editIndex!==scope.rowIndex">
-                    {{scope.row[item.key]}}{{scope.row['sampleUnit'] &&
-                    scope.row['handleQuantity']?scope.row['sampleUnit']:''}}
-                  </div>
-                    <div v-else>
-                      <Row>
-                        <Col span="18">
-                          <el-input v-model="scope.row.handleQuantity" placeholder="处理数量" clearable size="small"/>
-                        </Col>
-                        <Col span="6">
-                          <div style="line-height: 32px">{{scope.row['sampleUnit']?scope.row['sampleUnit']:''}}</div>
-                        </Col>
-                      </Row>
-                    </div>
-                  </div>
-                  <div v-else-if="item.key==='quantity'" @click.stop="_handleIndex(scope)">
-                    <div v-if="editIndex!==scope.rowIndex">
-                      {{scope.row[item.key]}}
-                    </div>
-                    <div v-else>
-                      <el-input v-model="scope.row.quantity" clearable></el-input>
-                    </div>
-                  </div>
                   <div v-else-if="item.key==='backupLocation'" @click.stop="_handleIndex(scope)">
                     <div v-if="editIndex!==scope.rowIndex">
                       {{scope.row[item.key]}}
@@ -100,23 +64,20 @@
                       <el-input v-model="scope.row.backupLocation" clearable></el-input>
                     </div>
                   </div>
-                  <div v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
-                  </div>
-                  <div v-else>{{scope.row[item.key]}}</div>
+                  <span v-else>{{scope.row[item.key]}}</span>
+                </template>
+              </vxe-table-column>
+              <vxe-table-column
+                slot="col"
+                :width="80"
+                title="操作"
+                align="center"
+                fixed="right">
+                <template slot-scope="scope">
+                  <VXEIconList :msg="editIndex===scope.rowIndex?iconMsgSave:iconMsg" @on-result-change="_iconClick" :rowData="scope.row" :rowIndex="scope.rowIndex"></VXEIconList>
                 </template>
               </vxe-table-column>
-                <vxe-table-column
-                  slot="col"
-                  :width="80"
-                  title="操作"
-                  align="center"
-                  fixed="right">
-                  <template slot-scope="scope">
-                    <VXEIconList :msg="editIndex===scope.rowIndex?iconMsgSave:iconMsg" @on-result-change="_iconClick"
-                                 :rowData="scope.row" :rowIndex="scope.rowIndex"></VXEIconList>
-                  </template>
-                </vxe-table-column>
-            </PTVXETableTemp>
+            </PTVXETableHeight>
           </Col>
         </Row>
       </div>
@@ -126,7 +87,7 @@
   </div>
 </template>
 <script>
-import AutoCompletes from '../../../../components/base/AutoCompletes'
+// import AutoCompletes from '../../../../components/base/AutoCompletes'
 import SampleParpareApply from '../SampleParpareApply'
 // eslint-disable-next-line no-unused-vars
 import http from '../../../../api/http'
@@ -134,7 +95,7 @@ import { soilEntrust, soilSample } from '../../../../api'
 import Operation from '../../../../components/operation/Operation'
 export default {
   components: {
-    AutoCompletes,
+    // AutoCompletes,
     SampleParpareApply,
     Operation
   },
@@ -194,7 +155,7 @@ export default {
         { title: '委托商', key: 'client', width: 180 },
         { title: '委托编号', key: 'entrustCode', width: 180 },
         { title: '试样编号', key: 'sampleCode', width: 180 },
-        { title: '状态', key: 'status', width: 160 },
+        { title: '状态', key: 'status', width: 160, status: true },
         { title: '试样深度', key: 'sampleDepth', width: 180 },
         { title: '样品包装类型', key: 'samplePack', width: 180 },
         { title: '现场编号', key: 'siteNo', width: 180 },

pages/soil-sample-manage/backups-manage/tab/SampleBackupsQuery.vue

@@ -28,26 +28,19 @@
           </Col>
           <!-- 表格 -->
           <Col span="24">
-            <PTVXETable id="perSampleQuery" ref="pageTable"
-                        :tableHeight="tableHeight" :icon-msg="iconMsg" @on-result-change="_tableResultChange" :getPage="getPage" select-data>
+            <PTVXETable ref="pageTable" :table-height="tableHeight" :loading="true"
+                        :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange">
               <vxe-table-column
+                v-for="item in pageColumns"
+                :key="item.key"
                 :field="item.key"
                 :title="item.title"
                 :min-width="item.width?item.width:200"
-                :fixed="item.fixed?item.fixed:undefined"
-                v-for="item in pageColumns"
-                :key="item.key" sortable>
+                :fixed="item.fixed?item.fixed:undefined" sortable>
                 <template slot-scope="scope">
-                  <div v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</div>
-                  <a v-else-if="item.key==='sampleSn'"
-                     @click.stop="_sampleDetailModal(scope.row)">{{scope.row[item.key]}}</a>
-                  <div v-else-if="item.key==='status'">
-                    {{scope.row[item.key]===undefined?'':scope.row[item.key].display}}
-                  </div>
-                  <div v-else-if="item.key==='progress'">
-                    {{scope.row[item.key]===undefined?'':scope.row[item.key].display}}
-                  </div>
-                  <div v-else>{{scope.row[item.key]}}</div>
+                  <span v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
+                  <span v-else-if="item.status">{{scope.row[item.key].display}}</span>
+                  <span v-else>{{scope.row[item.key]}}</span>
                 </template>
               </vxe-table-column>
             </PTVXETable>
@@ -91,7 +84,7 @@ export default {
         { title: '委托商', key: 'client', width: 180 },
         { title: '委托编号', key: 'entrustCode', width: 180 },
         { title: '试样编号', key: 'sampleCode', width: 180 },
-        { title: '状态', key: 'status', width: 160 },
+        { title: '状态', key: 'status', width: 160, status: true },
         { title: '试样深度', key: 'sampleDepth', width: 180 },
         { title: '样品包装类型', key: 'samplePack', width: 180 },
         { title: '现场编号', key: 'siteNo', width: 180 },