Skip to content

P
patzn-cloud-web-back-soil
Commit b5829495 by lichengming
Options

修改了样品留存标注

parent f1ba18d8
Showing with 27 additions and 24 deletions
pages/meter-entrust/entrust-register/EntrustRegisterEdit.vue
......@@ -6,21 +6,21 @@
<Form id="MeterSendTestEdit" ref="formObj" :model="formObj" :label-width="90" inline>
<Form-item label="委托商" prop="client" class="width-48">
<AutoComplete ref="autoInput" v-model="formObj.client" :down-data="customerData"
name="client" placeholder="请输入或选择委托单位" @on-result-change="_cusNameChange"
@on-result-change="_cusNameChange" name="client" placeholder="请输入或选择委托单位"
></AutoComplete>
</Form-item>
<Form-item label="委托日期：" prop="entrustDate" class="width-48">
<Date-picker v-model="formObj.entrustDate" type="date" split-panels style="width:100%;" placeholder="请选择委托日期"
name="entrustDate" @on-change="_ctimeChange"></Date-picker>
<Date-picker v-model="formObj.entrustDate" @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
placeholder="请选择委托日期" name="entrustDate"></Date-picker>
</Form-item>
<Form-item label="项目名称" prop="projectName" class="width-48">
<AutoComplete ref="autoInput" v-model="formObj.projectName" :down-data="projectData"
name="projectName" placeholder="请输入或选择项目名称" @on-result-change="_projectChange"
@on-result-change="_projectChange" name="projectName" placeholder="请输入或选择项目名称"
></AutoComplete>
</Form-item>
<Form-item label="项目负责人" prop="projectLeader" class="width-48">
<AutoComplete ref="autoInput" v-model="formObj.projectLeader" :down-data="projectLeaderData"
show-key="realname" name="projectLeader" placeholder="请输入或选择项目负责人" @on-result-change="_projectLeaderChange"
@on-result-change="_projectLeaderChange" show-key="realname" name="projectLeader" placeholder="请输入或选择项目负责人"
></AutoComplete>
</Form-item>
<Form-item label="钻孔位置" prop="boreholeLocation" class="width-48">
......@@ -36,23 +36,23 @@
<Input v-model="formObj.latitude" name="latitude" placeholder="请输入纬度"/>
</Form-item>
<Form-item label="水深（米）" prop="waterDepth" class="width-48">
<Input v-model="formObj.waterDepth" type="number" name="waterDepth" placeholder="请输入深度" @keydown.native="channelInputLimit"/>
<Input v-model="formObj.waterDepth" @keydown.native="channelInputLimit" type="number" name="waterDepth" placeholder="请输入深度"/>
</Form-item>
<Form-item label="平均容重" prop="projectNo" class="width-48">
<Input v-model="formObj.projectNo" name="projectNo" placeholder="请输入平均容重"/>
</Form-item>
<Form-item label="制表人" prop="tabulater" class="width-48" @click.native="_selectPerson">
<Form-item @click.native="_selectPerson" label="制表人" prop="tabulater" class="width-48">
<Input v-model="formObj.tabulater" name="tabulater" placeholder="请输入名称"/>
</Form-item>
<Form-item label="制单日期：" prop="tabulateDate" class="width-48">
<Date-picker v-model="formObj.tabulateDate" name="tabulateDate" type="date" split-panels style="width:100%;" placeholder="请选择委托日期"
@on-change="_tabulateChange"></Date-picker>
<Date-picker v-model="formObj.tabulateDate" @on-change="_tabulateChange" name="tabulateDate" type="date" split-panels style="width:100%;"
placeholder="请选择委托日期"></Date-picker>
</Form-item>
<Form-item label="检验类别：" prop="testType" class="width-48">
<el-select v-model="formObj.testType" name="testType" placeholder="请选择" size="small"
<el-select v-model="formObj.testType" @change="typeChange" name="testType" placeholder="请选择"
size="small"
style="width:100%"
clearable
@change="typeChange">
clearable>
<el-option
v-for="item in typeoptions"
:key="item.name"
......@@ -64,8 +64,8 @@
</Form>
</div>
<div style="margin-bottom: 10px;">
<btn-list :msg="edit?btnEdit:btn" :open="searchOpen" class="contHide"
@on-result-change="_btnClick"></btn-list>
<btn-list :msg="edit?btnEdit:btn" :open="searchOpen" @on-result-change="_btnClick"
class="contHide"></btn-list>
</div>
<div>
<PTVXETable
......@@ -97,12 +97,12 @@
</div>
<div v-if="item.key==='samplePack'" @click.stop="_handleRow(scope)">
<AutoComplete v-model="scope.row.samplePack" :down-data="packList"
name="samplePack" placeholder="请输入或选择包装类型" @on-result-change="_packChange"
@on-result-change="_packChange" name="samplePack" placeholder="请输入或选择包装类型"
></AutoComplete>
</div>
<div v-if="item.key==='sampleDescribe'" @click.stop="_handleRow(scope)">
<AutoComplete v-model="scope.row.sampleDescribe" :down-data="soilList"
name="sampleDescribe" placeholder="请输入或选择土质描述" @on-result-change="_soilChange"
@on-result-change="_soilChange" name="sampleDescribe" placeholder="请输入或选择土质描述"
></AutoComplete>
</div>
<div v-else-if="item.key==='experiments'" @click.stop="_handleRow(scope)">
......@@ -117,8 +117,8 @@
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
</div>
</Modal>
<importModal ref="importModal" aptitude-item @on-result-change="_inputBack"></importModal>
<SampleItemSelect ref="sampleItemSelectModal" is-change @on-result-change="_itemImportBack" />
<importModal ref="importModal" @on-result-change="_inputBack" aptitude-item></importModal>
<SampleItemSelect ref="sampleItemSelectModal" @on-result-change="_itemImportBack" is-change />
<assignPerson ref="userModal" @on-result-change="_userResult"></assignPerson>
<SampleItemRemove ref="sampleItemRemove" @on-result-change = '_removeItemBack'></SampleItemRemove>
<SampleItemEdit ref="sampleItemEdit" @on-result-change = '_removeItemBack'></SampleItemEdit>
......
pages/soil-alone-sample-instock/EntrustRegisterHis.vue
......@@ -6,21 +6,21 @@
<Row>
<!--查询-->
<Col span="24" style="margin-top: 10px">
<Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
<Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="项目名称:">
<Input v-model="formObj.projectName" name="projectName" placeholder="请输入项目名称" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.projectName" @on-enter="_formSearch" name="projectName" placeholder="请输入项目名称" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button type="primary" @click="_formSearch">搜索</Button>
<Button @click="_formSearch" type="primary">搜索</Button>
</Form-item>
</Form>
</Col>
<!--操作-->
<Col span="24">
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
@on-result-change="_btnClick"></btn-list>
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
class="contHide"></btn-list>
</Col>
<!--表格-->
<Col span="24">
......@@ -45,7 +45,8 @@
</div>
</div>
<keep-alive>
<component :is="currentComponent" ref="refModal" @on-result-change="_componentResult"></component>
<!-- eslint-disable-next-line vue/require-component-is -->
<component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
</keep-alive>
</div>
</template>
......@@ -55,6 +56,7 @@ import MeterEntrustRecord from '../../components/operation/Operation'
import ViewDetail from './ViewDetail'
import CreateReport from './CreateReport'
export default {
// eslint-disable-next-line vue/no-unused-components
components: { MeterEntrustRecord, ViewDetail, CreateReport },
data() {
return {
......
pages/soil-report-manage/report-manage/tab/ReportByReport.vue
......@@ -54,6 +54,7 @@
</Col>
</Row>
<keep-alive>
<!-- eslint-disable-next-line vue/require-component-is -->
<component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
</keep-alive>
</div>
......
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