From 9b0f733eecba99b33f4e415f9fddd42394f6c0d5 Mon Sep 17 00:00:00 2001
From: wk
Date: 星期三, 09 十月 2024 14:45:07 +0800
Subject: [PATCH] feat:门卫
---
pages/quality-inspection-page/salt-total-sampling/salt-total-sampling-form/salt-total-sampling-form.vue | 111 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 71 insertions(+), 40 deletions(-)
diff --git a/pages/quality-inspection-page/salt-total-sampling/salt-total-sampling-form/salt-total-sampling-form.vue b/pages/quality-inspection-page/salt-total-sampling/salt-total-sampling-form/salt-total-sampling-form.vue
index 7850f7d..c29e91f 100644
--- a/pages/quality-inspection-page/salt-total-sampling/salt-total-sampling-form/salt-total-sampling-form.vue
+++ b/pages/quality-inspection-page/salt-total-sampling/salt-total-sampling-form/salt-total-sampling-form.vue
@@ -27,6 +27,7 @@
>
<jp-select-plus
:isLineFeed="false"
+ isLoading
isSearch
color="#497bfb"
placeholder="璇烽�夋嫨"
@@ -53,18 +54,22 @@
borderBottom
ref="item1"
>
- <u-cell-group>
+ <u--input
+ v-model="modelForm.bunkerName"
+ border="none"
+ ></u--input>
+<!-- <u-cell-group>
<u-cell
value="璇烽�夋嫨"
@click="handleBunkerIdClick">
<view slot="value" class="u-slot-value">
- <u--input
+ <u--input
v-model="modelForm.bunkerName"
border="none"
- ></u--input>
+ ></u--input>
</view>
</u-cell>
- </u-cell-group>
+ </u-cell-group>-->
</u-form-item>
<u-form-item
@@ -97,11 +102,23 @@
borderBottom
ref="item1"
>
- <u--input
- v-model="modelForm.samplingPerson"
- border="none"
- disabled
- ></u--input>
+ <u-cell-group>
+ <u-cell
+ value="璇烽�夋嫨"
+ @click.native="handleBunkerIdClick">
+ <view slot="value" class="u-slot-value">
+ <u--input
+ v-model="modelForm.samplingPerson"
+ border="none"
+ ></u--input>
+ </view>
+ </u-cell>
+ </u-cell-group>
+<!-- <u--input-->
+<!-- v-model="modelForm.samplingPerson"-->
+<!-- border="none"-->
+<!-- disabled-->
+<!-- ></u--input>-->
</u-form-item>
<div class="sumbmit-box">
<u-button @click="handleSubmit" type="primary" v-if="submitShow">纭� 瀹�</u-button>
@@ -109,9 +126,13 @@
</u--form>
<view class="meicang-box">
<u-action-sheet
- @select="selectBunker"
- :show="bunkerShow"
- :actions="bunkerList">
+ title="閫夋嫨閲囨牱鍛�"
+ :closeOnClickOverlay="true"
+ :closeOnClickAction="true"
+ @select="selectsamplingPerson"
+ :show="samplingPersonShow"
+ @close="samplingPersonShow = false"
+ :actions="samplingPersonList">
</u-action-sheet>
</view>
</view>
@@ -121,6 +142,8 @@
import { todayDate } from '@/utils/util.js';
import {getStatesOne} from "../../../../utils/status";
import { BaseUrl } from '@/api/request.js'
+import { mapGetters } from 'vuex';
+const dayjs = require('dayjs')
export default {
name: "yanGaiMei-sampling-form",
components: {
@@ -131,6 +154,7 @@
customerIdList: [],
bunkerShow: false,
bunkerList:[],
+ samplingPersonShow: false,
modelForm: {
id:'',
batchNumber:'',
@@ -138,10 +162,9 @@
customerName:'', //渚涘簲鍟�
samplingTime: '', //閲囬泦鏃ユ湡
tonnage:null,
- bunkerId:'',
bunkerName:'',
samplingPerson: '',
- type: 8, //1 EDC銆�2 PVC銆�3 纭吀銆�4 姘㈡哀鍖栭挔 5 娑叉隘 6銆佸師鐩愰挋闀� 7銆佸師鐩怲OC 8銆佸師鐩愬叏妫�
+ type: 8, //1 EDC銆�2 鑱氭隘涔欑儻鏍戣剛銆�3 纭吀銆�4 姘㈡哀鍖栭挔 5 娑叉隘 6銆佸師鐩愰挋闀� 7銆佸師鐩怲OC 8銆佸師鐩愬叏妫�
},
filedId:'',
customerIdShow: false,
@@ -164,7 +187,7 @@
type: 'string',
required: true,
message: '璇烽�夋嫨閲囨牱鍦扮偣',
- trigger: ['blur', 'change']
+ trigger: ['blur']
}],
tonnage:[{
type: 'number',
@@ -176,9 +199,7 @@
}
},
computed: {
- samplingPerson() {
- return uni.getStorageSync('nameKey');
- }
+ ...mapGetters(['samplingPersonList'])
},
onReady() {
//濡傛灉闇�瑕佸吋瀹瑰井淇″皬绋嬪簭锛屽苟涓旀牎楠岃鍒欎腑鍚湁鏂规硶绛夛紝鍙兘閫氳繃setRules鏂规硶璁剧疆瑙勫垯銆�
@@ -189,21 +210,19 @@
this.submitShow = false
this.$nextTick(() => {
this.modelForm = Object.assign({},JSON.parse(opt.params))
+ console.log(this.modelForm,'鎺ユ敹鍒颁笂涓〉闈紶杩囨潵鐨勫弬鏁�===')
+ if(this.modelForm.samplingTime) {
+ this.modelForm.samplingTime = dayjs(this.modelForm.samplingTime).format('YYYY-MM-DD HH:mm')
+ }
return
})
- console.log(this.modelForm,'鎺ユ敹鍒颁笂涓〉闈紶杩囨潵鐨勫弬鏁�===')
}
- this.modelForm.samplingTime = todayDate(); //褰撳墠鏃堕棿
- this.modelForm.samplingPerson = uni.getStorageSync('name')
+ this.modelForm.samplingTime = todayDate('ymd hm'); //褰撳墠鏃堕棿
this.deptId = uni.getStorageSync('userInfo').deptIds
- console.log(uni.getStorageSync('userInfo'),'userInfo==========')
- console.log(this.deptId,'deptId==========')
this.getClaimCustomerList()
- if(uni.getStorageSync('bunkerList')) { //缂撳瓨鏈夋暟鎹嬁鏁版嵁
- this.bunkerList = uni.getStorageSync('bunkerList')
- }else { //娌℃嬁鍒版暟鎹皟涓�閬嶆帴鍙�
- this.$store.dispatch('getBunkerList')
- }
+ this.$store.dispatch('getSamplingPerson')
+
+
// console.log(getStatus('roleType'),'roleType-----')
// console.log(getStatus('customerId'),'customerId-----')
// console.log(getStatus('userInfo'),'userInfo-----')
@@ -211,8 +230,8 @@
},
methods: {
- getClaimCustomerList() { //渚涘簲鍟嗗垪琛� type 绫诲瀷 0/澶栭儴 1/鍐呴儴(鍖栭獙鍗曠殑灞炰簬澶栭儴瀹㈡埛)
- this.$reqGet('getClaimCustomerList',{type:'0'}).then(res => {
+ getClaimCustomerList() { //渚涘簲鍟嗗垪琛� type 绫诲瀷 0/澶栭儴 1/鍐呴儴(鍖栭獙鍗曠殑灞炰簬澶栭儴瀹㈡埛) personnelType 0/瀹㈡埛 1/渚涘簲鍟�
+ this.$reqGet('getClaimCustomerPageList',{personnelType:1,type:0,deptId:this.deptId}).then(res => {
console.log(res,'渚涘簲鍟嗛偅涓�=====')
if(res.code == 0) {
this.customerIdList = res.data.map(item => {
@@ -225,13 +244,13 @@
})
},
handleBunkerIdClick() { //鎵撳紑鍙栨牱鍦扮偣寮规
- this.bunkerShow = true
+ this.samplingPersonShow = true
},
- selectBunker(v) { //閲囨牱鍦扮偣
+ selectsamplingPerson(v) { //閲囨牱鍦扮偣
console.log(v,'v======')
- this.modelForm.bunkerId = v.id
- this.modelForm.bunkerName = v.name
- this.bunkerShow = false
+ this.modelForm.samplingPerson = v.name
+ this.modelForm.samplingSignAddress = v.imgPath
+ this.samplingPersonShow = false
},
toConfirmHandle(v) { //渚涘簲鍟�
console.log(v,'v====渚涘簲鍟�==')
@@ -247,6 +266,7 @@
title: '鍔犺浇涓�'
})
this.$refs.uForm.validate().then(res => {
+ this.modelForm.samplingTime = dayjs(this.modelForm.samplingTime).format("YYYY-MM-DD HH:mm:ss") //浼犲弬鏃堕棿瑕佸甫鍒� 鍚﹀垯鎶ラ敊
this.$reqPost('rawSaltsSampling',this.modelForm,'json').then(res => {
if(res) {
uni.hideLoading();
@@ -277,6 +297,20 @@
</script>
<style lang="scss" scoped>
+::v-deep{
+ .u-transition{
+ min-height: 10vh;
+ max-height: 85vh;
+ overflow-y: auto;
+ }
+ .u-icon__icon{
+ font-size: 34rpx!important;
+ top: 12rpx;
+ }
+ .inputs{
+ width: 100%;
+ }
+}
@mixin commonBtn($h:62rpx){
background-image: linear-gradient(to right,#497bfb,#2467fd);
height: $h!important;
@@ -292,17 +326,14 @@
transition: all 0.3s;
}
.u-action-sheet__item-wrap__item{
- padding: 0 20rpx;
- align-items: flex-start;
- min-height: 160rpx;
- max-height: 600rpx;
+ //align-items: flex-start;
text{
font-size: 28rpx;
}
}
.u-popup__content{
.u-line{
- border-bottom-width: 0px!important;
+ //border-bottom-width: 0px!important;
}
}
.u-form{
--
Gitblit v1.9.1