直接添加抽样单

src/page/sampling-list/SamplingList.vue

@@ -39,23 +39,24 @@
             <van-checkbox-group v-model="checkListValue" ref="checkboxGroup">
               <van-swipe-cell v-for="item in resultList" :key="item.id">
                 <div class="result-item" @click="_tapItem(item)" v-touch:longtap="_longtapHandler">
-                                    <div style="width: 100%;display: flex;justify-content: space-between;border-bottom: 1px solid #eeeeee">
+                  <div
+                      style="width: 100%;display: flex;justify-content: space-between;border-bottom: 1px solid #eeeeee">
                     <div style="display: flex">
                       <div style="margin-right: 20px" v-if="showCheck">
                         <van-checkbox :name="item.id" shape="square"></van-checkbox>
                       </div>
-                                            <div>抽样单编号：{{item.samplingNum}}</div>
+                      <div>抽样单编号：{{ item.samplingNum }}</div>
                     </div>
                     <div @click.stop="_goFile(item.id)">
                       <img src="../../assets/file-nav.png" style="width: 20px">
                     </div>
                   </div>
-                                    <div>抽样日期：{{item.samplingDate?$dateformat(item.samplingDate,'yyyy-mm-dd'):''}}</div>
-                                    <div>生产者名称：{{item.proName}}</div>
-                                    <div>样品名称：{{item.sampleName}}</div>
-                                    <div>被抽样单位名称：{{item.testedName}}</div>
-                                    <div>地点：{{item.placeName}}</div>
-                                    <div>货架：{{item.shelfName}}</div>
+                  <div>抽样日期：{{ item.samplingDate ? $dateformat(item.samplingDate, 'yyyy-mm-dd') : '' }}</div>
+                  <div>生产者名称：{{ item.proName }}</div>
+                  <div>样品名称：{{ item.sampleName }}</div>
+                  <div>被抽样单位名称：{{ item.testedName }}</div>
+                  <div>地点：{{ item.placeName }}</div>
+                  <div>货架：{{ item.shelfName }}</div>
                 </div>
                 <template #right>
                   <van-button square type="info" text="编辑" class="swipe-cell-btn"
@@ -71,7 +72,7 @@
         </van-pull-refresh>
       </div>
       <div class="bottom-btn" v-if="showCheck">
-                <van-button square block @click="_checkAll">{{checkAll?'取消全选':'全选'}}</van-button>
+        <van-button square block @click="_checkAll">{{ checkAll ? '取消全选' : '全选' }}</van-button>
         <van-button square block type="danger" @click="_del(checkListValue)">删除</van-button>
       </div>
     </template>
@@ -80,10 +81,10 @@
 </template>
 
 <script>
-    import SelectShelves from './components/SelectShelves'
-    import {samplingSummary} from '../../api'
+import SelectShelves from './components/SelectShelves'
+import {samplingSummary} from '../../api'
 
-    export default {
+export default {
   name: "SamplingList",
   components: {
     SelectShelves
@@ -105,7 +106,7 @@
       refreshing: false,//刷新中...
       loading: false,//加载中...
       finished: false,//没有更多数据
-                planId: this.$route.query.planId
+      planId: this.$route.query.planId ? this.$route.query.planId : ''
     }
   },
   watch: {
@@ -145,12 +146,14 @@
       let data = {
         page: this.page,
         rows: this.rows,
-                    planId: this.planId,
         ...this.formObj
       };
       if (this.key) {
         data.samplingNum = this.key
       }
+      if (this.planId) {
+        data.planId = this.planId
+      }
       return this.$serializeForm(data)
     },
     _getData: async function () {
@@ -174,7 +177,14 @@
       this.$router.go(-1)
     },
     _add() {
+      if (this.planId) {
         this.$refs.shelvesSelect._open(this.planId)
+      } else {
+        this.$router.push({
+          path: '/sampling_list/sampling_list_add',
+          query: {title: '抽样单添加'}
+        })
+      }
     },
     _shelvesResult({testedType, shelfId}) {
       if (testedType === 1) {
@@ -281,7 +291,7 @@
       this.$router.push({path: '/sampling_list/file', query: {summaryId: id}})
     }
   }
-    }
+}
 </script>
 
 <style scoped>

src/page/sampling-list/SamplingListAdd.vue

@@ -875,8 +875,8 @@ export default {
 
 
       id: '',
-      testedType: this.$route.query.testedType,
-      shelfId: this.$route.query.shelfId
+      testedType: this.$route.query.testedType?this.$route.query.testedType:'',
+      shelfId: this.$route.query.shelfId?this.$route.query.shelfId:''
     }
   },
   watch: {
@@ -1054,8 +1054,8 @@ export default {
           }
         }
       }
-      this.testedType = result.testedType
-      this.shelfId = result.shelfId
+      this.testedType = result.testedType?result.testedType:''
+      this.shelfId = result.shelfId?result.shelfId:''
     },
     _valParams() {
       if (this.formObj.samplingNum === '') {

src/page/sampling-list/SamplingTask.vue

 <template>
-    <div>
+  <customer-navBar-layout>
+    <template #navBar>
+      <van-nav-bar
+          :title="$route.meta.title"
+          right-text="查看所有抽样单"
+          left-arrow
+          @click-left="_back"
+          @click-right="_viewListAll"
+      ></van-nav-bar>
+    </template>
+    <template #content>
       <search-bar label="计划名称"
                   ref="searchBar"
                   highSearch
@@ -8,7 +18,7 @@
                   @clear-high="_clearHigh">
         <template #highSearch>
           <van-field v-model="formObj.name" label="计划名称" placeholder="请输入计划名称" clearable></van-field>
-                <datetime-field label="计划开始日期" v-model="formObj.planDateBegin" ></datetime-field>
+          <datetime-field label="计划开始日期" v-model="formObj.planDateBegin"></datetime-field>
           <datetime-field label="计划结束日期" v-model="formObj.planDateEnd"></datetime-field>
           <van-field v-model="formObj.uname" label="登记人" placeholder="请输入登记人" clearable></van-field>
           <datetime-field label="登记开始日期" v-model="formObj.ctimeBegin"></datetime-field>
@@ -25,20 +35,21 @@
               finished-text="没有更多了"
               @load="_load">
             <div class="result-item" v-for="item in resultList" :key="item.name" @click="_goto(item.id)">
-                        <div>计划名称：{{item.name}}</div>
-                        <div>抽样进度：{{item.summaryCount+'/'+item.samplingQuantity}}</div>
-                        <div>状态：{{item.progress}}</div>
+              <div>计划名称：{{ item.name }}</div>
+              <div>抽样进度：{{ item.summaryCount + '/' + item.samplingQuantity }}</div>
+              <div>状态：{{ item.progress }}</div>
             </div>
           </van-list>
         </van-pull-refresh>
       </div>
-    </div>
+    </template>
+  </customer-navBar-layout>
 </template>
 
 <script>
-    import {samplingPlan} from '../../api'
+import {samplingPlan} from '../../api'
 
-    export default {
+export default {
   components: {},
   data() {
     return {
@@ -86,7 +97,7 @@
       } else if (this.formObj.planDateBegin !== '' && this.formObj.planDateEnd === '') {
         this.$toast('请选择计划结束日期！')
         return false
-                } else if (this.formObj.planDateBegin !== '' && this.formObj.planDateEnd !== '' && (new Date(this.formObj.planDateBegin) > new Date(this.formObj.planDateEnd))){
+      } else if (this.formObj.planDateBegin !== '' && this.formObj.planDateEnd !== '' && (new Date(this.formObj.planDateBegin) > new Date(this.formObj.planDateEnd))) {
         this.$toast('计划开始日期不能大于计划结束日期！')
         return false
       }
@@ -96,7 +107,7 @@
       } else if (this.formObj.ctimeBegin !== '' && this.formObj.ctimeEnd === '') {
         this.$toast('请选择登记结束日期！')
         return false
-                } else if (this.formObj.ctimeBegin !== '' && this.formObj.ctimeEnd !== '' && (new Date(this.formObj.ctimeBegin) > new Date(this.formObj.ctimeEnd))){
+      } else if (this.formObj.ctimeBegin !== '' && this.formObj.ctimeEnd !== '' && (new Date(this.formObj.ctimeBegin) > new Date(this.formObj.ctimeEnd))) {
         this.$toast('登记开始日期不能大于登记结束日期！')
         return false
       }
@@ -135,10 +146,17 @@
       this._getData()
     },
     _goto(id) {
-                this.$router.push({path:'/sampling_list/sampling_list',query:{planId:id}})
+      this.$router.push({path: '/sampling_list/sampling_list', query: {planId: id}})
+    },
+
+    _back() {
+      this.$router.go(-1)
+    },
+    _viewListAll() {
+      this.$router.push({path: '/sampling_list/sampling_list'})
     },
   }
-    }
+}
 </script>
 
 <style scoped>

src/router/sampling-list-routes.js

@@ -12,7 +12,7 @@ import SamplingListAddAgriculture from '@/page/sampling-list/SamplingListAddAgri
 import SamplingListDetailAgriculture from '@/page/sampling-list/SamplingListDetailAgriculture.vue'
 
 export default [
-    {path: 'sampling_task', component: SamplingTask, meta: {title: '抽样任务'}},
+    {path: 'sampling_task', component: SamplingTask, meta: {title: '抽样任务', hideNavBar: true}},
     {path: 'sampling_list', component: SamplingList, meta: {title: '抽样单', hideNavBar: true}},
     {path: 'sampling_list_add', component: SamplingListAdd, meta: {customerNavBarTitle: true}},
     {path: 'sampling_list_add_agriculture', component: SamplingListAddAgriculture, meta: {customerNavBarTitle: true}},