Skip to content

P
patzn-cloud-web-h5app-drs
Commit b2ebe949 by zhuxiaomei
Options

添加数值绑定

parent 5977ce38
Showing with 658 additions and 308 deletions
public/index.html
...@@ -8,13 +8,13 @@ ...@@ -8,13 +8,13 @@
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover"
/> />
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= htmlWebpackPlugin.options.title %></title> <title>双随机抽样</title>
</head> </head>
<body> <body>
<noscript> <!--<noscript>-->
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. <!--<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.-->
Please enable it to continue.</strong> <!--Please enable it to continue.</strong>-->
</noscript> <!--</noscript>-->
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
</body> </body>
......
src/api/drs/sampling-plan.js
...@@ -5,6 +5,7 @@ import http from '../http' ...@@ -5,6 +5,7 @@ import http from '../http'
export default { export default {
page: data => http.post('/drs/v1/sampling_plan/page', data).then(res => res), page: data => http.post('/drs/v1/sampling_plan/page', data).then(res => res),
pageApp: data => http.post('/drs/v1/sampling_plan/page_app', data).then(res => res),
getById: id => http.get('/drs/v1/sampling_plan/' + id).then(res => res), getById: id => http.get('/drs/v1/sampling_plan/' + id).then(res => res),
} }
src/components/DatetimeField.vue
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<!--https://youzan.github.io/vant/#/zh-CN/form#biao-dan-xiang-lei-xing---shi-jian-xuan-ze-qi--> <!--https://youzan.github.io/vant/#/zh-CN/form#biao-dan-xiang-lei-xing---shi-jian-xuan-ze-qi-->
<van-field <van-field
readonly readonly
clickable
v-model="dateValue" v-model="dateValue"
:label="label" :label="label"
:placeholder="'点击选择'+label" :placeholder="'点击选择'+label"
...@@ -29,12 +28,14 @@ ...@@ -29,12 +28,14 @@
label: String, label: String,
value: {type: String, default: ''}, //默认值 value: {type: String, default: ''}, //默认值
type: {type: String, default: 'date'}, type: {type: String, default: 'date'},
format: {type: String, default: 'yyyy-mm-dd'} format: {type: String, default: 'yyyy-mm-dd'},
// startDate: String
}, },
data() { data() {
return { return {
showPicker: false, showPicker: false,
currentDate: new Date() currentDate: new Date(),
// minDate:this.startDate?new Date(this.startDate):new Date()
} }
}, },
computed: { computed: {
...@@ -45,8 +46,7 @@ ...@@ -45,8 +46,7 @@
set(val) { set(val) {
this.$emit('input', val) this.$emit('input', val)
} }
} },
}, },
watch: { watch: {
showPicker: function (newVal) { showPicker: function (newVal) {
......
src/components/SearchBar.vue
...@@ -45,10 +45,12 @@ ...@@ -45,10 +45,12 @@
this.$emit('search', this.searchValue) this.$emit('search', this.searchValue)
}, },
onHighSearch() { onHighSearch() {
this.showHighSearch = false
this.searchValue = '' this.searchValue = ''
this.$emit('high-search') this.$emit('high-search')
}, },
_hideHighSearch(){
this.showHighSearch = false
},
onReset() { onReset() {
this.$emit('clear-high') this.$emit('clear-high')
} }
......
src/page/sampling-list/SamplingListAdd.vue
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" name="samplingNum"
v-model="formObj.samplingNum"
label="抽样单编号" label="抽样单编号"
:rules="[{ required: true, message: '请填写抽样单编号' }]" :rules="[{ required: true, message: '请填写抽样单编号' }]"
></van-field> ></van-field>
...@@ -17,9 +18,8 @@ ...@@ -17,9 +18,8 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="formObj.taskNum"
label="No." label="No."
:rules="[{ required: true, message: '请填写' }]"
></van-field> ></van-field>
</table-col> </table-col>
</table-row> </table-row>
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="formObj.source"
label="任务来源" label="任务来源"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -38,14 +38,13 @@ ...@@ -38,14 +38,13 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="checkboxGroup"
label="任务类别"> label="任务类别">
<template #input> <template #input>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="formObj.taskType" direction="horizontal">
<van-checkbox name="1" shape="square">监督抽检</van-checkbox> <van-radio :name="item" :key="item" shape="square" v-for="item in taskTypeList">
<van-checkbox name="2" shape="square">风险监测</van-checkbox> {{item}}
<van-checkbox name="3" shape="square">评价性抽检</van-checkbox> </van-radio>
</van-checkbox-group> </van-radio-group>
</template> </template>
</van-field> </van-field>
</table-col> </table-col>
...@@ -61,7 +60,7 @@ ...@@ -61,7 +60,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="nonNetTested.name"
label="单位名称" label="单位名称"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -72,7 +71,7 @@ ...@@ -72,7 +71,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="nonNetTested.address"
label="单位地址" label="单位地址"
placeholder="如证照与许可证不一致，以许可证为准" placeholder="如证照与许可证不一致，以许可证为准"
></van-field> ></van-field>
...@@ -84,34 +83,47 @@ ...@@ -84,34 +83,47 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="checkboxGroup"
label="区域类型"> label="区域类型">
<template #input> <template #input>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="nonNetTested.areaType" direction="horizontal">
<van-checkbox name="1" shape="square">景点</van-checkbox> <van-radio v-for="item in areaTypeList" :key="item" :name="item" shape="square">
<van-checkbox name="2" shape="square">城市</van-checkbox> {{item}}
<van-checkbox name="3" shape="square">乡镇</van-checkbox> </van-radio>
<van-checkbox name="3" shape="square">学校周边</van-checkbox> </van-radio-group>
<van-checkbox name="3" shape="square">其他</van-checkbox> <div style="border-bottom: 1px solid #000">
</van-checkbox-group> <van-field
<div>（____）</div> label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="nonNetTested.areaTypeRemark"
></van-field>
</div>
</template> </template>
</van-field> </van-field>
</table-col> </table-col>
</table-row> </table-row>
<table-row> <table-row>
<table-col> <table-col>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="nonNetTested.permitType" direction="horizontal">
<van-checkbox name="1" shape="square">经营许可证号</van-checkbox> <van-radio v-for="item in permitTypeList" :key="item" :name="item" shape="square">
<van-checkbox name="2" shape="square">生产许可证号</van-checkbox> {{item}}
</van-checkbox-group> </van-radio>
</van-radio-group>
</table-col>
<table-col>
<van-field
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="nonNetTested.permitNum"
></van-field>
</table-col> </table-col>
<table-col> <table-col>
<van-field <van-field
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="nonNetTested.legalPerson"
label="法人代表" label="法人代表"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -120,7 +132,7 @@ ...@@ -120,7 +132,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="nonNetTested.linkman"
label="联系人" label="联系人"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -131,7 +143,7 @@ ...@@ -131,7 +143,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="nonNetTested.license"
label="营业执照号/社会信用代码" label="营业执照号/社会信用代码"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -140,7 +152,7 @@ ...@@ -140,7 +152,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="nonNetTested.tel"
label="联系电话" label="联系电话"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -152,53 +164,66 @@ ...@@ -152,53 +164,66 @@
抽样地点 抽样地点
</table-col> </table-col>
<table-col> <table-col>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="place" direction="horizontal">
<div> <div>
<div style="display: flex;padding: 5px 10px;flex-wrap: wrap"> <div style="display: flex;padding: 5px 10px;flex-wrap: wrap">
<div style="align-self: center">生产环节：</div> <div style="align-self: center">生产环节：</div>
<van-checkbox name="1" shape="square">原辅料库</van-checkbox> <van-radio v-for="item in proLinkList" :key="item" :name="1+','+item" shape="square">
<van-checkbox name="1" shape="square">生产线</van-checkbox> {{item}}
<van-checkbox name="1" shape="square">半成品库</van-checkbox> </van-radio>
<van-checkbox name="1" shape="square">成品库待检区</van-checkbox> <div style="border-bottom: 1px solid #000">
<van-checkbox name="2" shape="square">成品库已检区</van-checkbox> <van-field
<van-checkbox name="2" shape="square">其他</van-checkbox> label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="placeRemark1"
></van-field>
</div>
</div> </div>
<div style="display: flex;padding: 5px 10px;flex-wrap: wrap"> <div style="display: flex;padding: 5px 10px;flex-wrap: wrap">
<div style="align-self: center">流通环节：</div> <div style="align-self: center">流通环节：</div>
<van-checkbox name="1" shape="square">农贸市场</van-checkbox> <van-radio v-for="item in flowLinkList" :key="item" :name="2+','+item" shape="square">
<van-checkbox name="1" shape="square">菜市场</van-checkbox> {{item}}
<van-checkbox name="1" shape="square">批发市场</van-checkbox> </van-radio>
<van-checkbox name="1" shape="square">商场</van-checkbox> <div style="border-bottom: 1px solid #000">
<van-checkbox name="2" shape="square">超市</van-checkbox> <van-field
<van-checkbox name="2" shape="square">小食杂店</van-checkbox> label-class="cus-field-class"
<van-checkbox name="2" shape="square">其他</van-checkbox> label-width="50%"
label-align="center"
v-model="placeRemark2"
></van-field>
</div>
</div> </div>
<div style="display: flex;padding: 5px 10px;flex-wrap: wrap"> <div style="display: flex;padding: 5px 10px;flex-wrap: wrap">
<div style="align-self: center;">餐饮环节：</div> <div style="align-self: center;">餐饮环节：</div>
<van-checkbox name="1" shape="square">餐馆</van-checkbox> <van-radio v-for="item in restLinkList1" :key="item.value" :name="3+','+item.value"
<van-checkbox name="1" shape="square">特大型餐馆</van-checkbox> shape="square">
<van-checkbox name="1" shape="square">大型餐馆</van-checkbox> {{item.label}}
<van-checkbox name="1" shape="square">中型餐馆</van-checkbox> </van-radio>
<van-checkbox name="2" shape="square">小型餐馆</van-checkbox>
</div> </div>
<div style="display: flex;padding: 5px 10px;flex-wrap: wrap"> <div style="display: flex;padding: 5px 10px;flex-wrap: wrap">
<div style="align-self: center;width:72px"></div> <div style="align-self: center;width:72px"></div>
<van-checkbox name="2" shape="square">食堂</van-checkbox> <van-radio v-for="item in restLinkList2" :key="item.value" :name="3+','+item.value"
<van-checkbox name="2" shape="square">机关食堂</van-checkbox> shape="square">
<van-checkbox name="2" shape="square">学校/托幼食堂</van-checkbox> {{item.label}}
<van-checkbox name="2" shape="square">企事业单位食堂</van-checkbox> </van-radio>
<van-checkbox name="2" shape="square">建筑工地食堂</van-checkbox>
</div> </div>
<div style="display: flex;padding: 5px 10px;flex-wrap: wrap"> <div style="display: flex;padding: 5px 10px;flex-wrap: wrap">
<div style="align-self: center;width:72px"></div> <div style="align-self: center;width:72px"></div>
<van-checkbox name="2" shape="square">小吃店</van-checkbox> <van-radio v-for="item in restLinkList3" :key="item.value" :name="3+','+item"
<van-checkbox name="2" shape="square">快餐店</van-checkbox> shape="square">{{item}}
<van-checkbox name="2" shape="square">饮品店集体用餐配送单位</van-checkbox> </van-radio>
<van-checkbox name="2" shape="square">中央厨房</van-checkbox> <div style="border-bottom: 1px solid #000">
<van-checkbox name="2" shape="square">其他</van-checkbox> <van-field
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="placeRemark3"
></van-field>
</div>
</div> </div>
</div> </div>
</van-checkbox-group> </van-radio-group>
</table-col> </table-col>
</table-row> </table-row>
...@@ -213,7 +238,8 @@ ...@@ -213,7 +238,8 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" name="sampleName"
v-model="formObj.sampleName"
label="样品名称" label="样品名称"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -222,7 +248,7 @@ ...@@ -222,7 +248,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.trademark"
label="商标" label="商标"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -231,7 +257,7 @@ ...@@ -231,7 +257,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.qrcode"
label="条形码" label="条形码"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -241,17 +267,21 @@ ...@@ -241,17 +267,21 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="checkboxGroup"
label="样品类型"> label="样品类型">
<template #input> <template #input>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="sample.type" direction="horizontal">
<van-checkbox name="1" shape="square">食用农产品</van-checkbox> <van-radio :name="item" :key="item" shape="square" v-for="item in sampleTypeList">
<van-checkbox name="2" shape="square">工业加工食品</van-checkbox> {{item}}
<van-checkbox name="3" shape="square">餐饮加工食品</van-checkbox> </van-radio>
<van-checkbox name="3" shape="square">食品添加剂</van-checkbox> <div style="border-bottom: 1px solid #000">
<van-checkbox name="3" shape="square">食品相关产品</van-checkbox> <van-field
<van-checkbox name="3" shape="square">其他</van-checkbox> label-class="cus-field-class"
</van-checkbox-group> label-width="50%"
label-align="center"
v-model="sample.typeRemark"
></van-field>
</div>
</van-radio-group>
</template> </template>
</van-field> </van-field>
</table-row> </table-row>
...@@ -261,15 +291,21 @@ ...@@ -261,15 +291,21 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="checkboxGroup"
label="样品来源"> label="样品来源">
<template #input> <template #input>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="sample.source" direction="horizontal">
<van-checkbox name="1" shape="square">加工/自制</van-checkbox> <van-radio :name="item" :key="item" shape="square" v-for="item in sourceList">
<van-checkbox name="2" shape="square">委托生产</van-checkbox> {{item}}
<van-checkbox name="3" shape="square">外购</van-checkbox> </van-radio>
<van-checkbox name="3" shape="square">其他</van-checkbox> </van-radio-group>
</van-checkbox-group> <div style="border-bottom: 1px solid #000">
<van-field
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.sourceRemark"
></van-field>
</div>
</template> </template>
</van-field> </van-field>
</table-col> </table-col>
...@@ -278,28 +314,32 @@ ...@@ -278,28 +314,32 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="checkboxGroup"
label="样品属性"> label="样品属性">
<template #input> <template #input>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="sample.properties" direction="horizontal">
<van-checkbox name="1" shape="square">普通食品</van-checkbox> <van-radio :name="item" :key="item" shape="square"
<van-checkbox name="2" shape="square">特殊食品</van-checkbox> v-for="item in propertiesList">{{item}}
<van-checkbox name="3" shape="square">节令食品</van-checkbox> </van-radio>
<van-checkbox name="3" shape="square">重大活动保障食品</van-checkbox> </van-radio-group>
<van-checkbox name="3" shape="square">其他</van-checkbox> <div style="border-bottom: 1px solid #000">
</van-checkbox-group> <van-field
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.propertiesRemark"
></van-field>
</div>
</template> </template>
</van-field> </van-field>
</table-col> </table-col>
</table-row> </table-row>
<table-row> <table-row>
<table-col> <table-col>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="sample.dateType" direction="horizontal">
<van-checkbox name="1" shape="square">生产日期</van-checkbox> <van-radio v-for="item in dateTypeList" :key="item" :name="item" shape="square">
<van-checkbox name="1" shape="square">购进日期</van-checkbox> {{item}}
<van-checkbox name="2" shape="square">加工日期</van-checkbox> </van-radio>
<van-checkbox name="1" shape="square">检疫日期</van-checkbox> </van-radio-group>
</van-checkbox-group>
</table-col> </table-col>
</table-row> </table-row>
<table-row> <table-row>
...@@ -308,7 +348,7 @@ ...@@ -308,7 +348,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.standard"
label="执行标准/技术文档" label="执行标准/技术文档"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -317,7 +357,7 @@ ...@@ -317,7 +357,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.batchNo"
label="样品批号" label="样品批号"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -326,7 +366,7 @@ ...@@ -326,7 +366,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.specification"
label="规格型号" label="规格型号"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -337,7 +377,7 @@ ...@@ -337,7 +377,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.qualityGrade"
label="质量等级" label="质量等级"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -346,7 +386,7 @@ ...@@ -346,7 +386,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.shelfLife"
label="保质期" label="保质期"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -355,7 +395,7 @@ ...@@ -355,7 +395,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.price"
label="单价" label="单价"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -366,7 +406,7 @@ ...@@ -366,7 +406,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.samplingBase"
label="抽样基数" label="抽样基数"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -375,7 +415,7 @@ ...@@ -375,7 +415,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.quantity"
label="抽样数量" label="抽样数量"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -384,7 +424,7 @@ ...@@ -384,7 +424,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.backupQuanity"
label="备样数量" label="备样数量"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -395,13 +435,13 @@ ...@@ -395,13 +435,13 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="checkboxGroup"
label="抽样方式"> label="抽样方式">
<template #input> <template #input>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="sample.samplingMethod" direction="horizontal">
<van-checkbox name="1" shape="square">无菌抽样</van-checkbox> <van-radio :name="item" v-for="item in samplingMethodList" :key="item"
<van-checkbox name="2" shape="square">非无菌抽样</van-checkbox> shape="square">{{item}}
</van-checkbox-group> </van-radio>
</van-radio-group>
</template> </template>
</van-field> </van-field>
</table-col> </table-col>
...@@ -410,13 +450,13 @@ ...@@ -410,13 +450,13 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="checkboxGroup"
label="是否进口"> label="是否进口">
<template #input> <template #input>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="sample.inward" direction="horizontal">
<van-checkbox name="1" shape="square">是</van-checkbox> <van-radio v-for="item in trueOrFalseList" :key="item.value" :name="item.value"
<van-checkbox name="2" shape="square">否</van-checkbox> shape="square">{{item.label}}
</van-checkbox-group> </van-radio>
</van-radio-group>
</template> </template>
</van-field> </van-field>
</table-col> </table-col>
...@@ -425,7 +465,7 @@ ...@@ -425,7 +465,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.originPlace"
label="原产地" label="原产地"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -436,14 +476,13 @@ ...@@ -436,14 +476,13 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="checkboxGroup"
label="包装分类"> label="包装分类">
<template #input> <template #input>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="sample.packClass" direction="horizontal">
<van-checkbox name="1" shape="square">预包装</van-checkbox> <van-radio v-for="item in packClassList" :name="item" :key="item"
<van-checkbox name="2" shape="square">非定量包装</van-checkbox> shape="square">{{item}}
<van-checkbox name="2" shape="square">无包装</van-checkbox> </van-radio>
</van-checkbox-group> </van-radio-group>
</template> </template>
</van-field> </van-field>
</table-col> </table-col>
...@@ -452,20 +491,21 @@ ...@@ -452,20 +491,21 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="checkboxGroup"
label="储存条件"> label="储存条件">
<template #input> <template #input>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-checkbox-group v-model="storageCondition" direction="horizontal">
<van-checkbox name="1" shape="square">常温</van-checkbox> <van-checkbox v-for="item in storageConditionList" :name="item" :key="item"
<van-checkbox name="2" shape="square">冷藏</van-checkbox> shape="square">{{item}}
<van-checkbox name="2" shape="square">冷冻</van-checkbox> </van-checkbox>
<van-checkbox name="2" shape="square">避光</van-checkbox>
<van-checkbox name="2" shape="square">密闭</van-checkbox>
<van-checkbox name="2" shape="square">阴凉</van-checkbox>
<van-checkbox name="2" shape="square">通风</van-checkbox>
<van-checkbox name="2" shape="square">干燥</van-checkbox>
<van-checkbox name="2" shape="square">其他</van-checkbox>
</van-checkbox-group> </van-checkbox-group>
<div style="border-bottom: 1px solid #000">
<van-field
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.storageConditionRemark"
></van-field>
</div>
</template> </template>
</van-field> </van-field>
</table-col> </table-col>
...@@ -481,7 +521,7 @@ ...@@ -481,7 +521,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.proName"
label="生产者名称" label="生产者名称"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -492,7 +532,7 @@ ...@@ -492,7 +532,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.proAddress"
label="生产者地址" label="生产者地址"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -503,7 +543,7 @@ ...@@ -503,7 +543,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.prolicense"
label="生产许可证号" label="生产许可证号"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -512,7 +552,7 @@ ...@@ -512,7 +552,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.proTel"
label="联系电话" label="联系电话"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -528,7 +568,7 @@ ...@@ -528,7 +568,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.thirdPartyName"
label="企业名称" label="企业名称"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -539,7 +579,7 @@ ...@@ -539,7 +579,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.thirdPartyAddress"
label="企业地址" label="企业地址"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -550,16 +590,21 @@ ...@@ -550,16 +590,21 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="checkboxGroup"
label="企业性质"> label="企业性质">
<template #input> <template #input>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="formObj.thirdPartyNature" direction="horizontal">
<van-checkbox name="1" shape="square">委托</van-checkbox> <van-radio v-for="item in thirdPartyNatureList" :key="item" :name="item"
<van-checkbox name="2" shape="square">代理</van-checkbox> shape="square">{{item}}
<van-checkbox name="3" shape="square">经销</van-checkbox> </van-radio>
<van-checkbox name="3" shape="square">进口</van-checkbox> </van-radio-group>
<van-checkbox name="3" shape="square">其他</van-checkbox> <div style="border-bottom: 1px solid #000">
</van-checkbox-group> <van-field
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="formObj.thirdPartyNatureRemark"
></van-field>
</div>
</template> </template>
</van-field> </van-field>
</table-col> </table-col>
...@@ -568,7 +613,7 @@ ...@@ -568,7 +613,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.thirdPartyLicense"
label="企业许可证号" label="企业许可证号"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -577,7 +622,7 @@ ...@@ -577,7 +622,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.thirdPartyTel"
label="联系电话" label="联系电话"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -593,7 +638,7 @@ ...@@ -593,7 +638,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="formObj.testName"
label="单位名称" label="单位名称"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -602,7 +647,7 @@ ...@@ -602,7 +647,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="formObj.testAddress"
label="地址" label="地址"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -613,7 +658,7 @@ ...@@ -613,7 +658,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.testLinkman"
label="联系人" label="联系人"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -622,7 +667,7 @@ ...@@ -622,7 +667,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.testTel"
label="电话" label="电话"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -631,7 +676,7 @@ ...@@ -631,7 +676,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.testFax"
label="传真" label="传真"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -644,14 +689,13 @@ ...@@ -644,14 +689,13 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="100px" label-width="100px"
label-align="center" label-align="center"
name="num" v-model="formObj.remark"
label="备注" label="备注"
></van-field> ></van-field>
</table-col> </table-col>
</table-row> </table-row>
</add-table> </add-table>
<div class="bottom-btn"> <div class="bottom-btn">
<!--<van-button square type="default" color="#7232dd" @click="_cancel">取消</van-button>-->
<van-button block type="info" @click="_ok">保存</van-button> <van-button block type="info" @click="_ok">保存</van-button>
</div> </div>
</div> </div>
...@@ -669,9 +713,133 @@ ...@@ -669,9 +713,133 @@
"table-row": TableRow, "table-row": TableRow,
"table-col": TableCol "table-col": TableCol
}, },
data() {
return {
formObj: {
samplingNum: '',
taskNum: '',
sampleName: '',
source: '',
taskType: '',
proName: '',
proAddress: '',
prolicense: '',
proTel: '',
thirdPartyName: '',
thirdPartyAddress: '',
thirdPartyNature: '',
thirdPartyNatureRemark: '',
thirdPartyLicense: '',
thirdPartyTel: '',
testName: '',
testAddress: '',
testLinkman: '',
testTel: '',
testFax: '',
remark: ''
},
nonNetTested: {
name: '',
address: '',
areaType: '',
areaTypeRemark: '',
permitType: '',
permitNum: '',
legalPerson: '',
linkman: '',
license: '',
tel: '',
placeLink: '',//保存时单独赋值 从place字段分离出
place: '', //保存时单独赋值 从place字段分离出
placeRemark: '' //保存时单独赋值 根据环节取对应的placeRemarkN
},
sample: {
trademark: '',
qrcode: '',
type: '',
typeRemark: '',
source: '',
sourceRemark: '',
properties: '',
propertiesRemark: '',
dateType: '',
standard: '',
batchNo: '',
specification: '',
qualityGrade: '',
shelfLife: '',
price: '',
samplingBase: '',
quantity: '',
backupQuanity: '',
samplingMethod: '',
inward: '',
originPlace: '',
packClass: '',
storageCondition: [],
storageConditionRemark: ''
},
taskTypeList: ['监督抽检', '风险监测', '评价性抽检'],
areaTypeList: ['景点', '城市', '乡镇', '学校周边', '其他'],
permitTypeList: ['经营许可证号', '生产许可证号'],
sampleTypeList: ['食用农产品', '工业加工食品', '餐饮加工食品', '食品添加剂', '食品相关产品', '其他',],
sourceList: ['加工/自制', '委托生产', '外购', '其他'],
propertiesList: ['普通食品', '特殊食品', '节令食品', '重大活动保障食品', '其他',],
dateTypeList: ['生产日期', '购进日期', '加工日期', '检疫日期'],
samplingMethodList: ['无菌抽样', '非无菌抽样'],
trueOrFalseList: [{label: '是', value: 1}, {label: '否', value: 0}],
packClassList: ['预包装', '非定量包装', '无包装'],
storageConditionList: ['常温', '冷藏', '冷冻', '避光', '密闭', '阴凉', '通风', '干燥', '其他'],
thirdPartyNatureList: ['委托', '代理', '经销', '进口', '其他'],
storageCondition:'',
place: '', //1生产环节2流通环节3餐饮环节 值为“环节,地点”
placeRemark1: '',
placeRemark2: '',
placeRemark3: '',
proLinkList: ['原辅料库', '生产线', '半成品库', '成品库待检区', '成品库已检区', '其他'],
flowLinkList: ['农贸市场', '菜市场', '批发市场', '商场', '超市', '小食杂店', '其他'],
restLinkList1: [
{label: '特大型餐馆', value: '餐馆（特大型餐馆）'},
{label: '大型餐馆', value: '餐馆（大型餐馆）'},
{label: '中型餐馆', value: '餐馆（中型餐馆）'},
{label: '小型餐馆', value: '餐馆（小型餐馆）'},
],
restLinkList2: [
{label: '机关食堂', value: '食堂（机关食堂）'},
{label: '学校/托幼食堂', value: '食堂（学校/托幼食堂）'},
{label: '企事业单位食堂', value: '食堂（企事业单位食堂）'},
{label: '建筑工地食堂', value: '食堂（建筑工地食堂）'},
],
restLinkList3: ['小吃店', '快餐店', '饮品店集体用餐配送单位', '中央厨房', '其他'],
}
},
methods: { methods: {
_ok() { _ok() {
let data = Object.assign({}, this.formObj, {nonNetTested: this.nonNetTested}, {sample: this.sample})
data.sample.storageCondition = this.storageCondition.join(',')
if (this.place) {
data.nonNetTested.placeLink = this.place.split(',')[0]
data.nonNetTested.place = this.place.split(',')[1]
switch (data.nonNetTested.placeLink) {
case 1:
data.nonNetTested.placeRemark = this.placeRemark1
break
case 2:
data.nonNetTested.placeRemark = this.placeRemark2
break
case 3:
data.nonNetTested.placeRemark = this.placeRemark3
break
}
}
console.log(data, 'data')
}, },
} }
} }
......
src/page/sampling-list/SamplingListAddNet.vue
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="formObj.samplingNum"
label="抽样单编号" label="抽样单编号"
:rules="[{ required: true, message: '请填写抽样单编号' }]" :rules="[{ required: true, message: '请填写抽样单编号' }]"
></van-field> ></van-field>
...@@ -17,9 +17,8 @@ ...@@ -17,9 +17,8 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="formObj.taskNum"
label="No." label="No."
:rules="[{ required: true, message: '请填写' }]"
></van-field> ></van-field>
</table-col> </table-col>
</table-row> </table-row>
...@@ -29,7 +28,7 @@ ...@@ -29,7 +28,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="formObj.source"
label="任务来源" label="任务来源"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -38,14 +37,13 @@ ...@@ -38,14 +37,13 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="checkboxGroup"
label="任务类别"> label="任务类别">
<template #input> <template #input>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="formObj.taskType" direction="horizontal">
<van-checkbox name="1" shape="square">监督抽检</van-checkbox> <van-radio :name="item" :key="item" shape="square" v-for="item in taskTypeList">
<van-checkbox name="2" shape="square">风险监测</van-checkbox> {{item}}
<van-checkbox name="3" shape="square">评价性抽检</van-checkbox> </van-radio>
</van-checkbox-group> </van-radio-group>
</template> </template>
</van-field> </van-field>
</table-col> </table-col>
...@@ -61,7 +59,7 @@ ...@@ -61,7 +59,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="netTested.plantformName"
label="平台名称" label="平台名称"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -70,7 +68,7 @@ ...@@ -70,7 +68,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="netTested.plantformLicense"
label="营业执照号/社会信用代码" label="营业执照号/社会信用代码"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -81,7 +79,7 @@ ...@@ -81,7 +79,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="netTested.plantformSite"
label="平台网址" label="平台网址"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -90,7 +88,7 @@ ...@@ -90,7 +88,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="netTested.plantformPermit"
label="电信业务经营许可证" label="电信业务经营许可证"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -101,7 +99,7 @@ ...@@ -101,7 +99,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="netTested.plantformAddress"
label="平台地址" label="平台地址"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -110,7 +108,7 @@ ...@@ -110,7 +108,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="netTested.legalPerson"
label="法人代表" label="法人代表"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -128,7 +126,7 @@ ...@@ -128,7 +126,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="netTested.name"
label="单位名称" label="单位名称"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -139,7 +137,7 @@ ...@@ -139,7 +137,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="netTested.samplingPlace"
label="单位地址" label="单位地址"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -150,7 +148,7 @@ ...@@ -150,7 +148,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="netTested.estore"
label="网店商铺名称" label="网店商铺名称"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -161,24 +159,33 @@ ...@@ -161,24 +159,33 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="netTested.sampleSite"
label="样品网址" label="样品网址"
></van-field> ></van-field>
</table-col> </table-col>
</table-row> </table-row>
<table-row> <table-row>
<table-col> <table-col>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="netTested.permitType" direction="horizontal">
<van-checkbox name="1" shape="square">经营许可证号</van-checkbox> <van-radio v-for="item in permitTypeList" :key="item" :name="item" shape="square">
<van-checkbox name="2" shape="square">生产许可证号</van-checkbox> {{item}}
</van-checkbox-group> </van-radio>
</van-radio-group>
</table-col> </table-col>
<table-col> <table-col>
<van-field <van-field
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="netTested.permitNum"
></van-field>
</table-col>
<table-col>
<van-field
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="netTested.linkman"
label="联系人" label="联系人"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -189,7 +196,7 @@ ...@@ -189,7 +196,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="netTested.license"
label="营业执照号/社会信用代码" label="营业执照号/社会信用代码"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -198,7 +205,7 @@ ...@@ -198,7 +205,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="netTested.tel"
label="联系电话" label="联系电话"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -210,10 +217,10 @@ ...@@ -210,10 +217,10 @@
抽样地点 抽样地点
</table-col> </table-col>
<table-col> <table-col>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="place" direction="horizontal">
<van-checkbox name="1" shape="square">流通环节：网购</van-checkbox> <van-radio :name="1+',网购'" shape="square">流通环节：网购</van-radio>
<van-checkbox name="2" shape="square">餐饮环节：外卖餐饮</van-checkbox> <van-radio :name="2+',外卖餐饮'" shape="square">餐饮环节：外卖餐饮</van-radio>
</van-checkbox-group> </van-radio-group>
</table-col> </table-col>
</table-row> </table-row>
<table-row flex-none> <table-row flex-none>
...@@ -227,7 +234,7 @@ ...@@ -227,7 +234,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="formObj.sampleName"
label="样品名称" label="样品名称"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -236,7 +243,7 @@ ...@@ -236,7 +243,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.trademark"
label="商标" label="商标"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -245,7 +252,7 @@ ...@@ -245,7 +252,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.num"
label="订单编号" label="订单编号"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -255,17 +262,21 @@ ...@@ -255,17 +262,21 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="checkboxGroup"
label="样品类型"> label="样品类型">
<template #input> <template #input>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="sample.type" direction="horizontal">
<van-checkbox name="1" shape="square">食用农产品</van-checkbox> <van-radio :name="item" :key="item" shape="square" v-for="item in sampleTypeList">
<van-checkbox name="2" shape="square">工业加工食品</van-checkbox> {{item}}
<van-checkbox name="3" shape="square">餐饮加工食品</van-checkbox> </van-radio>
<van-checkbox name="3" shape="square">食品添加剂</van-checkbox> </van-radio-group>
<van-checkbox name="3" shape="square">食品相关产品</van-checkbox> <div style="border-bottom: 1px solid #000">
<van-checkbox name="3" shape="square">其他</van-checkbox> <van-field
</van-checkbox-group> label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.typeRemak"
></van-field>
</div>
</template> </template>
</van-field> </van-field>
</table-row> </table-row>
...@@ -275,15 +286,21 @@ ...@@ -275,15 +286,21 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="checkboxGroup"
label="样品来源"> label="样品来源">
<template #input> <template #input>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="sample.source" direction="horizontal">
<van-checkbox name="1" shape="square">加工/自制</van-checkbox> <van-radio :name="item" :key="item" shape="square" v-for="item in sourceList">
<van-checkbox name="2" shape="square">委托生产</van-checkbox> {{item}}
<van-checkbox name="3" shape="square">外购</van-checkbox> </van-radio>
<van-checkbox name="3" shape="square">其他</van-checkbox> </van-radio-group>
</van-checkbox-group> <div style="border-bottom: 1px solid #000">
<van-field
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.sourceRemark"
></van-field>
</div>
</template> </template>
</van-field> </van-field>
</table-col> </table-col>
...@@ -292,33 +309,38 @@ ...@@ -292,33 +309,38 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="checkboxGroup"
label="样品属性"> label="样品属性">
<template #input> <template #input>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="sample.properties" direction="horizontal">
<van-checkbox name="1" shape="square">普通食品</van-checkbox> <van-radio :name="item" :key="item" shape="square"
<van-checkbox name="2" shape="square">特殊食品</van-checkbox> v-for="item in propertiesList">{{item}}
<van-checkbox name="3" shape="square">节令食品</van-checkbox> </van-radio>
<van-checkbox name="3" shape="square">重大活动保障食品</van-checkbox> </van-radio-group>
<van-checkbox name="3" shape="square">其他</van-checkbox> <div style="border-bottom: 1px solid #000">
</van-checkbox-group> <van-field
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.propertiesRemark"
></van-field>
</div>
</template> </template>
</van-field> </van-field>
</table-col> </table-col>
</table-row> </table-row>
<table-row> <table-row>
<table-col> <table-col>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="sample.dateType" direction="horizontal">
<van-checkbox name="1" shape="square">生产日期</van-checkbox> <van-radio name="生产日期" shape="square">生产日期</van-radio>
<van-checkbox name="2" shape="square">加工日期</van-checkbox> <van-radio name="加工日期" shape="square">加工日期</van-radio>
</van-checkbox-group> </van-radio-group>
</table-col> </table-col>
<table-col> <table-col>
<van-field <van-field
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.shelfLife"
label="保质期" label="保质期"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -327,7 +349,7 @@ ...@@ -327,7 +349,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="formObj.dateBatch"
label="生产批号" label="生产批号"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -338,7 +360,7 @@ ...@@ -338,7 +360,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.standard"
label="执行标准/技术文件" label="执行标准/技术文件"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -347,7 +369,7 @@ ...@@ -347,7 +369,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.qualityGrade"
label="质量等级" label="质量等级"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -356,7 +378,7 @@ ...@@ -356,7 +378,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.specification"
label="规格型号" label="规格型号"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -367,7 +389,7 @@ ...@@ -367,7 +389,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.quantity"
label="抽样数量" label="抽样数量"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -376,7 +398,7 @@ ...@@ -376,7 +398,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.backupQuanity"
label="备样数量" label="备样数量"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -387,13 +409,13 @@ ...@@ -387,13 +409,13 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="checkboxGroup"
label="抽样方式"> label="抽样方式">
<template #input> <template #input>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="sample.samplingMethod" direction="horizontal">
<van-checkbox name="1" shape="square">无菌抽样</van-checkbox> <van-radio :name="item" v-for="item in samplingMethodList" :key="item"
<van-checkbox name="2" shape="square">非无菌抽样</van-checkbox> shape="square">{{item}}
</van-checkbox-group> </van-radio>
</van-radio-group>
</template> </template>
</van-field> </van-field>
</table-col> </table-col>
...@@ -402,7 +424,7 @@ ...@@ -402,7 +424,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.qrcode"
label="条形码" label="条形码"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -411,7 +433,7 @@ ...@@ -411,7 +433,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.price"
label="单价" label="单价"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -422,13 +444,13 @@ ...@@ -422,13 +444,13 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="checkboxGroup"
label="是否进口"> label="是否进口">
<template #input> <template #input>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="sample.inward" direction="horizontal">
<van-checkbox name="1" shape="square">是</van-checkbox> <van-radio v-for="item in trueOrFalseList" :key="item.value" :name="item.value"
<van-checkbox name="2" shape="square">否</van-checkbox> shape="square">{{item.label}}
</van-checkbox-group> </van-radio>
</van-radio-group>
</template> </template>
</van-field> </van-field>
</table-col> </table-col>
...@@ -437,7 +459,7 @@ ...@@ -437,7 +459,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="sample.originPlace"
label="原产地" label="原产地"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -448,14 +470,13 @@ ...@@ -448,14 +470,13 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="checkboxGroup"
label="包装分类"> label="包装分类">
<template #input> <template #input>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="sample.packClass" direction="horizontal">
<van-checkbox name="1" shape="square">预包装</van-checkbox> <van-radio v-for="item in packClassList" :name="item" :key="item"
<van-checkbox name="2" shape="square">非定量包装</van-checkbox> shape="square">{{item}}
<van-checkbox name="2" shape="square">无包装</van-checkbox> </van-radio>
</van-checkbox-group> </van-radio-group>
</template> </template>
</van-field> </van-field>
</table-col> </table-col>
...@@ -464,20 +485,21 @@ ...@@ -464,20 +485,21 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="checkboxGroup"
label="储存条件"> label="储存条件">
<template #input> <template #input>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-checkbox-group v-model="storageCondition" direction="horizontal">
<van-checkbox name="1" shape="square">常温</van-checkbox> <van-checkbox v-for="item in storageConditionList" :name="item" :key="item"
<van-checkbox name="2" shape="square">冷藏</van-checkbox> shape="square">{{item}}
<van-checkbox name="2" shape="square">冷冻</van-checkbox> </van-checkbox>
<van-checkbox name="2" shape="square">避光</van-checkbox>
<van-checkbox name="2" shape="square">密闭</van-checkbox>
<van-checkbox name="2" shape="square">阴凉</van-checkbox>
<van-checkbox name="2" shape="square">通风</van-checkbox>
<van-checkbox name="2" shape="square">干燥</van-checkbox>
<van-checkbox name="2" shape="square">其他</van-checkbox>
</van-checkbox-group> </van-checkbox-group>
<div style="border-bottom: 1px solid #000">
<van-field
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.storageConditionRemark"
></van-field>
</div>
</template> </template>
</van-field> </van-field>
</table-col> </table-col>
...@@ -493,7 +515,7 @@ ...@@ -493,7 +515,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.proName"
label="生产者名称" label="生产者名称"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -504,7 +526,7 @@ ...@@ -504,7 +526,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.proAddress"
label="生产者地址" label="生产者地址"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -515,7 +537,7 @@ ...@@ -515,7 +537,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.prolicense"
label="生产许可证号" label="生产许可证号"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -524,7 +546,7 @@ ...@@ -524,7 +546,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.proTel"
label="联系电话" label="联系电话"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -540,7 +562,7 @@ ...@@ -540,7 +562,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.thirdPartyName"
label="企业名称" label="企业名称"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -551,7 +573,7 @@ ...@@ -551,7 +573,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.thirdPartyAddress"
label="企业地址" label="企业地址"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -562,16 +584,21 @@ ...@@ -562,16 +584,21 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="checkboxGroup"
label="企业性质"> label="企业性质">
<template #input> <template #input>
<van-checkbox-group v-model="checkboxGroup" direction="horizontal"> <van-radio-group v-model="formObj.thirdPartyNature" direction="horizontal">
<van-checkbox name="1" shape="square">委托</van-checkbox> <van-radio v-for="item in thirdPartyNatureList" :key="item" :name="item"
<van-checkbox name="2" shape="square">代理</van-checkbox> shape="square">{{item}}
<van-checkbox name="3" shape="square">经销</van-checkbox> </van-radio>
<van-checkbox name="3" shape="square">进口</van-checkbox> </van-radio-group>
<van-checkbox name="3" shape="square">其他</van-checkbox> <div style="border-bottom: 1px solid #000">
</van-checkbox-group> <van-field
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="formObj.thirdPartyNatureRemark"
></van-field>
</div>
</template> </template>
</van-field> </van-field>
</table-col> </table-col>
...@@ -580,7 +607,7 @@ ...@@ -580,7 +607,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.thirdPartyLicense"
label="企业许可证号" label="企业许可证号"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -589,7 +616,7 @@ ...@@ -589,7 +616,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.thirdPartyTel"
label="联系电话" label="联系电话"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -605,7 +632,7 @@ ...@@ -605,7 +632,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="formObj.testName"
label="单位名称" label="单位名称"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -614,7 +641,7 @@ ...@@ -614,7 +641,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="50%" label-width="50%"
label-align="center" label-align="center"
name="num" v-model="formObj.testAddress"
label="地址" label="地址"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -625,7 +652,7 @@ ...@@ -625,7 +652,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.testLinkman"
label="联系人" label="联系人"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -634,7 +661,7 @@ ...@@ -634,7 +661,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.testTel"
label="电话" label="电话"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -643,7 +670,7 @@ ...@@ -643,7 +670,7 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
label-align="center" label-align="center"
name="num" v-model="formObj.testFax"
label="传真" label="传真"
></van-field> ></van-field>
</table-col> </table-col>
...@@ -656,14 +683,13 @@ ...@@ -656,14 +683,13 @@
label-class="cus-field-class" label-class="cus-field-class"
label-width="100px" label-width="100px"
label-align="center" label-align="center"
name="num" v-model="formObj.remark"
label="备注" label="备注"
></van-field> ></van-field>
</table-col> </table-col>
</table-row> </table-row>
</add-table> </add-table>
<div class="bottom-btn"> <div class="bottom-btn">
<!--<van-button square type="default" color="#7232dd" @click="_cancel">取消</van-button>-->
<van-button block type="info" @click="_ok">保存</van-button> <van-button block type="info" @click="_ok">保存</van-button>
</div> </div>
</div> </div>
...@@ -680,6 +706,109 @@ ...@@ -680,6 +706,109 @@
"add-table": SamplingListAddTable, "add-table": SamplingListAddTable,
"table-row": TableRow, "table-row": TableRow,
"table-col": TableCol "table-col": TableCol
},
data() {
return {
formObj: {
samplingNum: '',
taskNum: '',
source: '',
taskType: '',
sampleName: '',
dateBatch: '',
proName: '',
proAddress: '',
prolicense: '',
proTel: '',
thirdPartyName: '',
thirdPartyAddress: '',
thirdPartyNature: '',
thirdPartyNatureRemark:'',
thirdPartyLicense: '',
thirdPartyTel: '',
testName: '',
testAddress: '',
testLinkman: '',
testTel: '',
testFax: '',
remark: ''
},
netTested: {
plantformName: '',
plantformLicense: '',
plantformSite: '',
plantformPermit: '',
plantformAddress: '',
legalPerson: '',
name: '',
samplingPlace: '',
estore: '',
sampleSite: '',
permitType: '',
permitNum: '',
linkman: '',
license: '',
tel: '',
placeLink: '',//保存时单独赋值 从place字段分离出
place: '', //保存时单独赋值 从place字段分离出
},
sample: {
trademark: '',
num: '',
type: '',
typeRemak: '',
source: '',
sourceRemark: '',
properties: '',
propertiesRemark: '',
dateType:'',
shelfLife: '',
standard: '',
qualityGrade: '',
specification: '',
quantity:'',
backupQuanity:'',
samplingMethod: '',
qrcode: '',
price: '',
inward:'',
originPlace:'',
packClass: '',
storageCondition: '',
storageConditionRemark: '',
},
taskTypeList: ['监督抽检', '风险监测', '评价性抽检'],
permitTypeList: ['经营许可证号', '生产许可证号'],
sampleTypeList: ['食用农产品', '工业加工食品', '餐饮加工食品', '食品添加剂', '食品相关产品', '其他',],
sourceList: ['加工/自制', '委托生产', '外购', '其他'],
propertiesList: ['普通食品', '特殊食品', '节令食品', '重大活动保障食品', '其他',],
samplingMethodList: ['无菌抽样', '非无菌抽样'],
trueOrFalseList: [{label: '是', value: 1}, {label: '否', value: 0}],
packClassList: ['预包装', '非定量包装', '无包装'],
storageConditionList: ['常温', '冷藏', '冷冻', '避光', '密闭', '阴凉', '通风', '干燥', '其他'],
thirdPartyNatureList: ['委托', '代理', '经销', '进口', '其他'],
place:'',
storageCondition:[],
}
},
methods:{
_open(){
},
_ok() {
let data = Object.assign({}, this.formObj, {netTested: this.netTested}, {sample: this.sample})
data.sample.storageCondition = this.storageCondition.join(',')
if (this.place) {
data.netTested.placeLink = this.place.split(',')[0]
data.netTested.place = this.place.split(',')[1]
}
console.log(data, 'data')
},
} }
} }
</script> </script>
......
src/page/sampling-list/SamplingTask.vue
<template> <template>
<div> <div>
<search-bar label="计划名称" <search-bar label="计划名称"
ref="searchBar"
highSearch highSearch
@search="_search" @search="_search"
@high-search="_highSearch" @high-search="_highSearch"
@clear-high="_clearHigh"> @clear-high="_clearHigh">
<template #highSearch> <template #highSearch>
<van-field v-model="formObj.name" label="计划名称" placeholder="请输入计划名称"></van-field> <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> <datetime-field label="计划结束日期" v-model="formObj.planDateEnd"></datetime-field>
<van-field v-model="formObj.uname" label="登记人" placeholder="请输入登记人"></van-field> <van-field v-model="formObj.uname" label="登记人" placeholder="请输入登记人" clearable></van-field>
<datetime-field label="登记开始日期" v-model="formObj.ctimeBegin"></datetime-field> <datetime-field label="登记开始日期" v-model="formObj.ctimeBegin"></datetime-field>
<datetime-field label="登记结束日期" v-model="formObj.ctimeEnd"></datetime-field> <datetime-field label="登记结束日期" v-model="formObj.ctimeEnd"></datetime-field>
</template> </template>
...@@ -23,11 +24,11 @@ ...@@ -23,11 +24,11 @@
:finished="finished" :finished="finished"
finished-text="没有更多了" finished-text="没有更多了"
@load="_load"> @load="_load">
<div class="result-item" v-for="item in resultList" :key="item.name" @click="_goto(item)"> <div class="result-item" v-for="item in resultList" :key="item.name" @click="_goto(item)">
<div>计划名称：{{item.name}}</div> <div>计划名称：{{item.name}}</div>
<div>抽样进度：{{item.completionRatio}}</div> <div>抽样进度：{{item.completionRatio}}</div>
<div>状态：{{item.progress}}</div> <div>状态：{{item.progress}}</div>
</div> </div>
</van-list> </van-list>
</van-pull-refresh> </van-pull-refresh>
</div> </div>
...@@ -48,7 +49,7 @@ ...@@ -48,7 +49,7 @@
uname: '', uname: '',
ctimeBegin: '', ctimeBegin: '',
ctimeEnd: '', ctimeEnd: '',
flag: 0 flag: 1
}, },
key: '', key: '',
resultList: [], resultList: [],
...@@ -59,25 +60,48 @@ ...@@ -59,25 +60,48 @@
finished: false,//没有更多数据 finished: false,//没有更多数据
} }
}, },
mounted() {
this._getData()
},
methods: { methods: {
//简单查询 清空高级查询条件 赋值简单查询数据 //简单查询 清空高级查询条件 赋值简单查询数据
_search(value) { _search(value) {
this.key = value this.key = value
this.formObj = this.$resetFields(this.formObj) this.formObj = this.$resetFields(this.formObj)
this.formObj.flag = 0 this.formObj.flag = 1
this._refresh() this._refresh()
}, },
//高级搜索 清空key 查询 //高级搜索 清空key 查询
_highSearch() { _highSearch() {
this.key = '' this.key = ''
this._refresh() if (this._valParams()) {
this.$refs.searchBar._hideHighSearch()
this._refresh()
}
},
_valParams() {
if (this.formObj.planDateBegin === '' && this.formObj.planDateEnd !== '') {
this.$toast('请选择计划开始日期！')
return false
} 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))){
this.$toast('计划开始日期不能大于计划结束日期！')
return false
}
if (this.formObj.ctimeBegin === '' && this.formObj.ctimeEnd !== '') {
this.$toast('请选择登记开始日期！')
return false
} 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))){
this.$toast('登记开始日期不能大于登记结束日期！')
return false
}
return true
}, },
_clearHigh() { _clearHigh() {
this.formObj = this.$resetFields(this.formObj) this.formObj = this.$resetFields(this.formObj)
this.formObj.flag = 0 this.formObj.flag = 1
}, },
_searchParams() { _searchParams() {
let data = { let data = {
...@@ -91,7 +115,7 @@ ...@@ -91,7 +115,7 @@
return this.$serializeForm(data) return this.$serializeForm(data)
}, },
_getData: async function () { _getData: async function () {
let result = await samplingPlan.page(this._searchParams()) let result = await samplingPlan.pageApp(this._searchParams())
this.resultList = [...(this.page === 1 ? [] : this.resultList), ...result.records] this.resultList = [...(this.page === 1 ? [] : this.resultList), ...result.records]
this.refreshing = false this.refreshing = false
this.loading = false this.loading = false
...@@ -101,7 +125,7 @@ ...@@ -101,7 +125,7 @@
}, },
_refresh() { _refresh() {
this.page = 1; this.page = 1;
this._getData() // this._getData()
}, },
_load() { _load() {
this.page = this.page + 1; this.page = this.page + 1;
......
src/page/sampling-task/SamplingTask.vue
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
@high-search="_highSearch" @high-search="_highSearch"
@clear-high="_clearHigh"> @clear-high="_clearHigh">
<template #highSearch> <template #highSearch>
<van-field v-model="formObj.name" label="计划名称" placeholder="请输入计划名称"></van-field> <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> <datetime-field label="计划结束日期" v-model="formObj.planDateEnd"></datetime-field>
<van-field v-model="formObj.uname" label="登记人" placeholder="请输入登记人"></van-field> <van-field v-model="formObj.uname" label="登记人" placeholder="请输入登记人" clearable></van-field>
<datetime-field label="登记开始日期" v-model="formObj.ctimeBegin"></datetime-field> <datetime-field label="登记开始日期" v-model="formObj.ctimeBegin"></datetime-field>
<datetime-field label="登记结束日期" v-model="formObj.ctimeEnd"></datetime-field> <datetime-field label="登记结束日期" v-model="formObj.ctimeEnd"></datetime-field>
</template> </template>
...@@ -81,7 +81,33 @@ ...@@ -81,7 +81,33 @@
//高级搜索 清空key 查询 //高级搜索 清空key 查询
_highSearch() { _highSearch() {
this.key = '' this.key = ''
this._refresh() if (this._valParams()) {
this.$refs.searchBar._hideHighSearch()
this._refresh()
}
},
_valParams() {
if (this.formObj.planDateBegin === '' && this.formObj.planDateEnd !== '') {
this.$toast('请选择计划开始日期！')
return false
} 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))) {
this.$toast('计划开始日期不能大于计划结束日期！')
return false
}
if (this.formObj.ctimeBegin === '' && this.formObj.ctimeEnd !== '') {
this.$toast('请选择登记开始日期！')
return false
} 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))) {
this.$toast('登记开始日期不能大于登记结束日期！')
return false
}
return true
}, },
_clearHigh() { _clearHigh() {
this.formObj = this.$resetFields(this.formObj) this.formObj = this.$resetFields(this.formObj)
...@@ -99,7 +125,7 @@ ...@@ -99,7 +125,7 @@
return this.$serializeForm(data) return this.$serializeForm(data)
}, },
_getData: async function () { _getData: async function () {
let result = await samplingPlan.page(this._searchParams()) let result = await samplingPlan.pageApp(this._searchParams())
this.resultList = [...(this.page === 1 ? [] : this.resultList), ...result.records] this.resultList = [...(this.page === 1 ? [] : this.resultList), ...result.records]
this.refreshing = false this.refreshing = false
this.loading = false this.loading = false
......
src/styles/sampling-list-add.less
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
} }
.list-table-box { .list-table-box {
.van-checkbox { .van-checkbox ,.van-radio{
padding: 5px; padding: 5px;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment