Skip to content

P
patzn-cloud-web-back-soil
Commit 2e75f2b5 by lichengming
Options

修改了报告管理

parent 1777868a
Showing with 8 additions and 67 deletions
pages/soil-report-manage/report-make/tabs/ReportInfoMake.vue
...@@ -17,30 +17,6 @@ ...@@ -17,30 +17,6 @@
<Form-item class="search-item" label="样品名称:"> <Form-item class="search-item" label="样品名称:">
<Input @on-enter="_formSearch" v-model="formObj.sampleName" placeholder="请输入样品名称" clearable/> <Input @on-enter="_formSearch" v-model="formObj.sampleName" placeholder="请输入样品名称" clearable/>
</Form-item> </Form-item>
<Form-item class="search-item" label="任务来源:">
<Input @on-enter="_formSearch" v-model="formObj.taskSource" placeholder="请输入任务来源" clearable/>
</Form-item>
<Form-item label="细类:" class="search-item" style="margin-left: 8px">
<Input @on-enter="_formSearch" v-model="formObj.detectType"
placeholder="请输入细类" clearable/>
</Form-item>
<Form-item label="已推国抽:" class="search-item">
<Select v-model="formObj.dataPushed" clearable placeholder="请选择是否已推国抽">
<Option v-for="item in dataPushedList" :value="item.value" :key="item.value">{{item.name}}</Option>
</Select>
</Form-item>
<Form-item label="应出报告日期:" class="search-item">
<Date-picker :editable="false" @on-change="_reportDateChange" v-model="dateList"
type="daterange" placeholder="应出报告日期" format="yyyy-MM-dd"
style="width:100%" placement="bottom-start"></Date-picker>
<input v-model="formObj.reportDueDateBegin" type="hidden">
<input v-model="formObj.reportDueDateEnd" type="hidden">
</Form-item>
<Form-item class="search-item" label="结果判定:">
<Select v-model="formObj.notOkCount" clearable placeholder="请选择结果判定">
<Option v-for="item in notOkCountList" :value="item.value" :key="item.value">{{item.name}}</Option>
</Select>
</Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button> <Button @click="_formSearch" type="primary">搜索</Button>
</Form-item> </Form-item>
......
pages/soil-report-manage/report-make/tabs/ReportMakeByEntrust.vue
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
<Form id="search-form-make-contract" :label-width="90" v-show="searchOpen" inline onsubmit="return false"> <Form id="search-form-make-contract" :label-width="90" v-show="searchOpen" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item class="search-item" label="委托单位:"> <Form-item class="search-item" label="委托单位:">
<Input @on-enter="_formSearch" name="cname" placeholder="请输入委托单位" clearable/> <Input @on-enter="_formSearch" v-model="formObj.client" name="client" placeholder="请输入委托单位" clearable/>
</Form-item> </Form-item>
<Form-item class="search-item" label="委托编号:"> <Form-item class="search-item" label="委托编号:">
<Input @on-enter="_formSearch" name="code" placeholder="请输入委托编号" clearable/> <Input @on-enter="_formSearch" v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托编号" clearable/>
</Form-item> </Form-item>
<Form-item class="search-item" label="样品编号:"> <Form-item class="search-item" label="样品编号:">
<Input @on-enter="_formSearch" name="num" placeholder="请输入样品编号" clearable/> <Input @on-enter="_formSearch" v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入样品编号" clearable/>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button> <Button @click="_formSearch" type="primary">搜索</Button>
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
</div> </div>
<SampleByMakeModal ref="sampleByMakeModal"></SampleByMakeModal> <SampleByMakeModal ref="sampleByMakeModal"></SampleByMakeModal>
<Operation ref="operation"></Operation> <Operation ref="operation"></Operation>
<FileManage ref="FileManage"></FileManage>
</div> </div>
</template> </template>
<script> <script>
...@@ -274,7 +275,7 @@ export default { ...@@ -274,7 +275,7 @@ export default {
}, },
_upload(id) { _upload(id) {
// 上传文件 // 上传文件
this.$refs.refModal._open(id, 'contractId') this.$refs.FileManage._open(id, 'entrustId')
} }
} }
} }
......
pages/soil-report-manage/report-make/tabs/ReportMakeBySample.vue
...@@ -14,52 +14,16 @@ ...@@ -14,52 +14,16 @@
<Form-item class="search-item" label="样品名称:"> <Form-item class="search-item" label="样品名称:">
<Input @on-enter="_formSearch" v-model="formObj.name" placeholder="请输入样品名称" clearable/> <Input @on-enter="_formSearch" v-model="formObj.name" placeholder="请输入样品名称" clearable/>
</Form-item> </Form-item>
<Form-item class="search-item" label="任务来源:">
<Input @on-enter="_formSearch" v-model="formObj.taskSource" placeholder="请输入任务来源" clearable></Input>
</Form-item>
<Form-item label="细类:" class="search-item">
<Input @on-enter="_formSearch" v-model="formObj.detectType"
placeholder="请输入细类" clearable/>
</Form-item>
<Form-item label="已推国抽:" class="search-item margin-left-6">
<Select v-model="formObj.dataPushed" clearable placeholder="请选择是否已推国抽">
<Option v-for="item in dataPushedList" :value="item.value" :key="item.value">{{item.name}}</Option>
</Select>
</Form-item>
<Form-item label="应出报告日期:" class="search-item">
<Date-picker :editable="false" @on-change="_reportDateChange" v-model="dateList"
type="daterange" placeholder="应出报告日期" format="yyyy-MM-dd"
style="width:100%" placement="bottom-start"></Date-picker>
<input v-model="formObj.reportDateBegin" type="hidden">
<input v-model="formObj.reportDateEnd" type="hidden">
</Form-item>
<Form-item label="已生成报告:" class="search-item">
<Select v-model="formObj.reported" clearable>
<Option :value="0">否</Option>
<Option :value="1">是</Option>
</Select>
</Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button> <Button @click="_formSearch" type="primary">搜索</Button>
</Form-item> </Form-item>
</Form> </Form>
</Col> </Col>
<Col span="24"> <Col span="24">
<BtnList :msg="btn" :open="searchOpen" :showSearchBtn="true" @on-result-change="_btnClick" <btn-list :msg="btn" :open="searchOpen" :showSearchBtn="true" @on-result-change="_btnClick"
class="contHide"> class="contHide">
<!--切换待认领任务--> <!--切换待认领任务-->
<template slot="processTask"> </btn-list>
<div class="fr process-task">
<el-checkbox v-model="formObj.personal" @change="_page" :true-label="1" :false-label="0"
size="medium">
个人任务
</el-checkbox>
<el-checkbox v-model="formObj.onlyReportMake" @change="_page" :true-label="1"
:false-label="0" size="medium">只显示待编样品
</el-checkbox>
</div>
</template>
</BtnList>
</Col> </Col>
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
...@@ -127,7 +91,7 @@ export default { ...@@ -127,7 +91,7 @@ export default {
id: 'food-report-make-push-to-gc', id: 'food-report-make-push-to-gc',
name: '推送至国抽平台' name: '推送至国抽平台'
}, },
{ type: 'success', id: '', name: '生成' }, { type: 'success', id: 'ZBC', name: '生成' },
{ {
type: 'success', type: 'success',
id: 'food-report-make-select-template-create', id: 'food-report-make-select-template-create',
......
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