From f414b2494547116c058a135c4e37ab402cecaf2b Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 30 十月 2025 17:02:21 +0800
Subject: [PATCH] 完善首件检验单 逻辑 添加 检验项目 任务单 流转卡 工序 产品 检验仪器选单弹出窗口
---
pages/ZLGL/shoujianjianyan/form.vue | 463 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 420 insertions(+), 43 deletions(-)
diff --git a/pages/ZLGL/shoujianjianyan/form.vue b/pages/ZLGL/shoujianjianyan/form.vue
index 8da4f9e..a22e945 100644
--- a/pages/ZLGL/shoujianjianyan/form.vue
+++ b/pages/ZLGL/shoujianjianyan/form.vue
@@ -29,62 +29,75 @@
<view class="form-item">
<view class="left">鐢熶骇璧勬簮</view>
<view class="right">
- <input type="text" value="" />
+ <uni-combox :candidates="GySourceNameList" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
+ @update:modelValue="HSourceChange"></uni-combox>
</view>
</view>
<view class="form-item">
<view class="left">鐢熶骇鐝</view>
<view class="right">
- <input type="text" value="" />
- </view>
- </view>
- <view class="form-item">
- <view class="left">鐢熶骇璧勬簮</view>
- <view class="right">
- <input type="text" value="" />
+ <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
+ v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
</view>
</view>
<view class="form-item">
<view class="left">浠诲姟鍗曞彿</view>
- <view class="right">
- <input type="text" value="" />
+ <view class="right disabled">
+ <input type="text" :value="hform.HICMOBillNo" disabled />
</view>
+ <view class="icon-wrapper-big"><uni-icons type="search" size="20"
+ @click="showSelectorModule(hform, 5)"></uni-icons></view>
</view>
<view class="form-item">
<view class="left">浠诲姟鍗曟暟閲�</view>
<view class="right">
- <input type="number" value="" />
+ <input type="number" v-model="hform.HICMOQty" />
</view>
</view>
<view class="form-item">
<view class="left">娴佽浆鍗″彿</view>
- <view class="right">
- <input type="text" value="" />
+ <view class="right disabled">
+ <input type="text" :value="hform.HProcExchBillNo" disabled />
</view>
+ <view class="icon-wrapper-big"><uni-icons type="search" size="20"
+ @click="showSelectorModule(hform, 6)"></uni-icons></view>
</view>
<view class="form-item">
<view class="left">娴佽浆鍗℃暟閲�</view>
<view class="right">
- <input type="number" value="" />
+ <input type="number" v-model="hform.HProcExchQty" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">浜у搧浠ｇ爜</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HMaterNumber" />
+ </view>
+ <view class="icon-wrapper-big">
+ <uni-icons type="search" size="20" @click="showSelectorModule(hform, 4)"></uni-icons>
</view>
</view>
<view class="form-item">
<view class="left">浜у搧鍚嶇О</view>
- <view class="right">
- <input type="text" value="" />
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HMaterName" />
</view>
</view>
<view class="form-item">
<view class="left">妫�楠屽憳</view>
<view class="right">
- <input type="text" value="" />
+ <uni-combox :candidates="GyFirstCheckEmpNameList" placeholder="璇烽�夋嫨妫�楠屽憳"
+ :v-model="hform.HFirstCheckEmpName"
+ @update:modelValue="HFirstCheckEmpChange"></uni-combox>
</view>
</view>
<view class="form-item">
<view class="left">妫�楠屾柟妗�</view>
- <view class="right">
- <input type="text" value="" />
+ <view class="right disabled">
+ <input type="text" disabled value="" />
</view>
+ <view class="icon-wrapper-big"><uni-icons type="search" size="20"
+ @click="showSelectorModule(hform, 7)"></uni-icons></view>
</view>
<view class="form-item">
<view class="left">鎵瑰彿</view>
@@ -110,9 +123,11 @@
</view>
<view class="form-item">
<view class="left">宸ュ簭</view>
- <view class="right">
- <input type="text" value="" />
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HProcName" />
</view>
+ <view class="icon-wrapper-big"><uni-icons type="search" size="20"
+ @click="showSelectorModule(hform, 8)"></uni-icons></view>
</view>
<view class="form-item">
<view class="left">澶囨敞</view>
@@ -217,13 +232,13 @@
<view style="flex-shrink: 0;"><text>妫�楠岄」鐩細</text></view>
<input type="text" :value="checkItem.HQCCheckItemName" disabled="" />
<view class="icon-wrapper"><uni-icons type="search" size="16"
- @click="showHQCCheckItemSelector"></uni-icons></view>
+ @click="showSelectorModule(checkItem, 2)"></uni-icons></view>
</view>
<view class="detail editable">
<view style="flex-shrink: 0;"><text>妫�楠屼华鍣細</text></view>
<input type="text" :value="checkItem.HInspectInstruMentName" disabled="" />
<view class="icon-wrapper"><uni-icons type="search" size="16"
- @click="showInspectInstruMentSelector"></uni-icons></view>
+ @click="showSelectorModule(checkItem, 3)"></uni-icons></view>
</view>
<view class="detail editable">
<view><text>缁撹锛�</text></view>
@@ -236,7 +251,7 @@
@change="HResultChange(checkItem.num, $event)" />
</view>
</view>
- <view class="detail editable">
+ <view class="detail editable" style="position: relative;">
<view style="flex-shrink: 0;"><text>鍒嗘瀽鏂规硶锛�</text></view>
<picker :range="arrayAnalysisMethod" range-key="name"
@change="HAnalysisMethodChange(checkItem.num, $event)">
@@ -250,7 +265,7 @@
<view>
<switch type="checkbox" style="transform:scale(0.7);"
:checked="checkItem.HKeyInspect"
- @change="HKeyInspectChange(checkItem.num, $event)" />
+ @change="HKeyInspectChange(checkItem, $event)" />
</view>
</view>
<view class="detail" v-if="checkItem.HQCStd">
@@ -284,6 +299,7 @@
<text>骞冲潎鍊硷細</text>{{checkItem.HAvg}}
</view>
</view>
+ <view style="height: 20rpx;"></view>
<view class="more">
<view class="part" style="color: #da0000;" @tap.stop="removeCheckItem(checkItem)">
<uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;"
@@ -310,7 +326,7 @@
<view style="flex-shrink: 0;"><text>鎶芥牱鏂规锛�</text></view>
<input type="text" :value="SamplingItem.HSampleSchemeName" disabled />
<view class="icon-wrapper"><uni-icons type="search" size="16"
- @click="showHSampleSchemeNameSelector(SamplingItem)"></uni-icons></view>
+ @click="showSelectorModule(SamplingItem, 1)"></uni-icons></view>
</view>
<view class="detail editable">
<text>鎶芥牱绫诲瀷锛�</text>{{SamplingItem.HSamplingType}}
@@ -365,23 +381,53 @@
<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
</view>
- <SampleSchemePopupVue ref="sampleSchemePopup" @update="SampleSchemeComplete" :bindKey="currentChechItemIDCache">
+ <SampleSchemePopupVue v-if="enablePopupModule == PopupModuleNameList[1]" ref="listPopup"
+ @update="SampleSchemeComplete" :bindKey="currentChechItemIDCache">
</SampleSchemePopupVue>
+ <CheckItemPopupVue v-if="enablePopupModule == PopupModuleNameList[2]" ref="listPopup"
+ @update="CheckItemComplete" :bindKey="currentChechItemIDCache">
+ </CheckItemPopupVue>
+ <InspectMentPopupVue v-if="enablePopupModule == PopupModuleNameList[3]" ref="listPopup"
+ @update="InspectMentComplete" :bindKey="currentChechItemIDCache">
+ </InspectMentPopupVue>
+ <MaterialPopupVue v-if="enablePopupModule == PopupModuleNameList[4]" ref="listPopup" @update="MaterComplete"
+ :bindKey="0">
+ </MaterialPopupVue>
+ <ICMOBillPopupVue v-if="enablePopupModule == PopupModuleNameList[5]" ref="listPopup" @update="ICMOBillComplete"
+ :bindKey="0"></ICMOBillPopupVue>
+ <ProcExchBillPopupVue v-if="enablePopupModule == PopupModuleNameList[6]" ref="listPopup" @update="ProcExchBillComplete"
+ :bindKey="0"></ProcExchBillPopupVue>
+ <ProcessPopupVue v-if="enablePopupModule == PopupModuleNameList[8]" ref="listPopup" @update="HProcComplete"
+ :bindKey="0"></ProcessPopupVue>
</view>
</template>
<script>
import dayjs from 'dayjs'
-import {
+ import {
CommonUtils
} from '../../../utils/common'
import InspectValueTemplateVue from '@/components/ZLGL/InspectValueTemplate.vue'
import SampleSchemePopupVue from '@/components/ZLGL/SampleSchemePopup.vue'
-import { getUserInfo } from '../../../utils/auth'
+ import CheckItemPopupVue from '@/components/ZLGL/CheckItemPopup.vue'
+ import InspectMentPopupVue from '../../../components/ZLGL/InspectMentPopup.vue'
+ import MaterialPopupVue from '../../../components/ZLGL/MaterialPopup.vue'
+ import ICMOBillPopupVue from '../../../components/ZLGL/ICMOBillPopup.vue'
+ import ProcExchBillPopupVue from '../../../components/ZLGL/ProcExchBillPopup.vue'
+ import ProcessPopupVue from '../../../components/ZLGL/ProcessPopup.vue'
+ import {
+ getUserInfo
+ } from '../../../utils/auth'
export default {
components: {
InspectValueTemplateVue,
- SampleSchemePopupVue
+ SampleSchemePopupVue,
+ CheckItemPopupVue,
+ InspectMentPopupVue,
+ MaterialPopupVue,
+ ICMOBillPopupVue,
+ ProcExchBillPopupVue,
+ ProcessPopupVue
},
computed: {
judgeConclusion: {
@@ -398,8 +444,24 @@
mainTabSelected: 1,
subTabSelected: 1,
+ // 鎺у埗褰撳墠鏄剧ず鐨勫脊绐楁ā鍧�
+ enablePopupModule: '',
+ PopupModuleNameList: ["", "SampleScheme", "CheckItem",
+ "InspectMent", "Material", "ICMOBill", "ProcExchBill", "QCScheme", "Process"
+ ],
// 褰撳墠鎿嶄綔鐨勬楠屽崟ID缂撳瓨
currentChechItemIDCache: -1,
+
+ // uni-combox 閫夋嫨鍣ㄤ娇鐢�
+ // 鐢熶骇璧勬簮
+ GySourceList: [],
+ GySourceNameList: [],
+ // 鐝
+ GyWorkShiftList: [],
+ GyWorkShiftNameList: [],
+ // 妫�楠屽憳
+ GyFirstCheckEmpList: [],
+ GyFirstCheckEmpNameList: [],
// 妫�楠屾柟妗�
arrayAnalysisMethod: [{
@@ -436,7 +498,7 @@
"HICMOBillNo": "",
"HICMOInterID": "0",
"HICMOEntryID": "1",
- "HICMOQty": "",
+ "HICMOQty": "0",
"HProcExchBillNo": "",
"HProcExchInterID": "0",
"HProcExchEntryID": "0",
@@ -444,8 +506,8 @@
"HMaterNumber": "",
"HMaterID": "0",
"HMaterName": "",
- "HFirstCheckEmpName": "",
- "HFirstCheckEmp":0,
+ "HFirstCheckEmpName": "",
+ "HFirstCheckEmp": 0,
"HQCSchemeName": "",
"HQCSchemeID": "0",
"HBatchNo": "",
@@ -521,11 +583,156 @@
}
},
methods: {
- async showHSampleSchemeNameSelector(item) {
- this.currentChechItemIDCache = item.num
+ // 妫�楠屽憳鍒濆鍖�
+ async InitHEmp() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_Employee/list',
+ data: {
+ sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' order by 閮ㄩ棬浠ｇ爜`,
+ user: getUserInfo()['Czymc'],
+ Organization: uni.getStorageSync("Organization")
+ }
+ })
+
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+
+ if (count == 1) {
+ console.log('data: ', data);
+ this.GyFirstCheckEmpList = data
+ this.GyFirstCheckEmpNameList = Array.from(data).map(e => e["鑱屽憳鍚嶇О"])
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鍒濆鍖栨楠屽憳澶辫触: ${Message}`
+ })
+ }
+
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鍒濆鍖栨楠屽憳澶辫触: ${err}`
+ })
+ }
+ },
+ async HFirstCheckEmpChange(e) {
+ console.log('閫変腑妫�楠屽憳: ', e);
+ let index = this.GyFirstCheckEmpList.findIndex(elem => elem["鑱屽憳鍚嶇О"] == e)
+ if (index == -1) {
+ this.hform.HFirstCheckEmp = 0
+ this.hform.HFirstCheckEmpName = ''
+ return
+ }
+
+ this.hform.HFirstCheckEmp = this.GyFirstCheckEmpList[index]["HItemID"]
+ this.hform.HFirstCheckEmpName = this.GyFirstCheckEmpList[index]["鑱屽憳鍚嶇О"]
+ },
+ // 鐢熶骇鐝鍒濆鍖�
+ async InitHWorkShift() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_ShiftsController/Get_Gy_WorkShiftList',
+ data: {
+ sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}'`,
+ HMaker: getUserInfo()['Czymc']
+ }
+ })
+
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+
+ if (count == 1) {
+ console.log('data: ', data);
+ this.GyWorkShiftList = data
+ this.GyWorkShiftNameList = Array.from(data).map(e => e["鐝鍚嶇О"])
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鍒濆鍖栫彮娆″け璐�: ${Message}`
+ })
+ }
+
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鍒濆鍖栫彮娆″け璐�: ${err}`
+ })
+ }
+ },
+ async HWorkShiftChange(e) {
+ console.log('閫変腑鐝: ', e);
+ let index = this.GyWorkShiftList.findIndex(elem => elem["鐝鍚嶇О"] == e)
+ if (index == -1) {
+ this.hform.HWorkShiftID = 0
+ this.hform.HWorkShiftName = ''
+ return
+ }
+
+ this.hform.HWorkShiftID = this.GySourceList[index]["HInterID"]
+ this.hform.HWorkShiftName = this.GySourceList[index]["鐝鍚嶇О"]
+ },
+ // 鐢熶骇璧勬簮鏇存柊
+ // 鐢熶骇璧勬簮鍒濆鍖�
+ async InitHSource() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_Source/list',
+ data: {
+ sWhere: `and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'') != '' and HUSEORGID = '100038'`,
+ user: getUserInfo()['Czymc']
+ }
+ })
+
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+
+ if (count == 1) {
+ this.GySourceList = data
+ this.GySourceNameList = Array.from(data).map(e => e["鐢熶骇璧勬簮鍚嶇О"])
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${Message}`
+ })
+ }
+
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${err}`
+ })
+ }
+ },
+ // 鐢熶骇璧勬簮鏇存柊
+ async HSourceChange(e) {
+ console.log('閫変腑鐢熶骇璧勬簮: ', e);
+ let index = this.GySourceList.findIndex(elem => elem["鐢熶骇璧勬簮鍚嶇О"] == e)
+ if (index == -1) {
+ this.hform.HSourceID = 0
+ this.hform.HSourceName = ''
+ return
+ }
+
+ this.hform.HSourceID = this.GySourceList[index]["HItemID"]
+ this.hform.HSourceName = this.GySourceList[index]["鐢熶骇璧勬簮鍚嶇О"]
+ },
+ // 鏄剧ず寮圭獥
+ async showSelectorModule(item, index) {
+ this.currentChechItemIDCache = item.num || 0 // 0 琛ㄧず娌℃湁浠讳綍瀛愯〃琚�変腑
+ this.enablePopupModule = this.PopupModuleNameList[index]
console.log('this.$refs: ', this.$refs);
await this.$nextTick()
- this.$refs.sampleSchemePopup.showPopup()
+ this.$refs.listPopup.showPopup()
},
getAnalysisMethodDisplay(val) {
console.log('AnalysisMethodVal: ', val);
@@ -613,19 +820,39 @@
// 缁撹淇敼
HResultChange(id, e) {
console.log('e: ', e);
- this.checkItems[id]["HResult"] = e.detail.value ? 1 : 2
+ this.checkItems[id]["HResult"] = e.detail.value
},
// 妫�楠屾柟妗堜慨鏀�
HAnalysisMethodChange(id, e) {
console.log('e: ', e);
this.checkItems[id]["HAnalysisMethod"] = this.arrayAnalysisMethod[e.detail.value]["value"]
+
+ // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
+ this.setInspectValModule(this.checkItems[id])
},
// 閲嶇偣妫�鏌ヤ慨鏀�
HKeyInspectChange(id, e) {
console.log('e: ', e);
this.checkItems[id]["HKeyInspect"] = e.detail.value
},
- // 妫�楠屾柟妗堥�夋嫨缁撴潫
+ // 妫�楠岄」鐩繑鍥�
+ async CheckItemComplete(e) {
+ console.log('CheckItemRet: ', e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key]
+ Object.assign(this.checkItems[key], {
+ "HQCCheckItemID": data["HItemID"],
+ "HQCCheckItemNumber": data["浠ｇ爜"],
+ "HQCCheckItemName": data["鍚嶇О"],
+ })
+ await this.$nextTick()
+ this.$refs.listPopup.exit()
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick()
+ this.enablePopupModule = this.PopupModuleNameList[0]
+ }
+ },
+ // 妫�楠屾柟妗堣繑鍥�
async SampleSchemeComplete(e) {
console.log('SampleSchemeRet: ', e);
for (var key in e["retVal"]) {
@@ -648,18 +875,131 @@
"HSampleDamageQty": data["鏍锋湰鐮村潖鏁�"] || 0
})
await this.$nextTick()
- this.$refs.sampleSchemePopup.exit()
+ this.$refs.listPopup.exit()
this.setInspectValModule(this.checkItems[key])
+
+ await this.$nextTick()
+ this.enablePopupModule = this.PopupModuleNameList[0]
+ }
+ },
+ // 妫�楠屼华鍣ㄨ繑鍥�
+ async InspectMentComplete(e) {
+ console.log('InspectInstruMentRet: ', e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key]
+ Object.assign(this.checkItems[key], {
+ "HInspectInstruMentID": data["HItemID"],
+ "HInspectInstruMentNumber": data["妫�楠屼华鍣ㄤ唬鐮�"],
+ "HInspectInstruMentName": data["妫�楠屼华鍣ㄥ悕绉�"],
+ })
+ await this.$nextTick()
+ this.$refs.listPopup.exit()
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick()
+ this.enablePopupModule = this.PopupModuleNameList[0]
+ }
+ },
+ // 浜у搧浠ｇ爜杩斿洖
+ async MaterComplete(e) {
+ console.log('MaterRet: ', e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key]
+ Object.assign(this.hform, {
+ "HMaterNumber": data["鐗╂枡浠ｇ爜"],
+ "HMaterName": data["鐗╂枡鍚嶇О"],
+ "HMaterID": data["HItemID"],
+ })
+ await this.$nextTick()
+ this.$refs.listPopup.exit()
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick()
+ this.enablePopupModule = this.PopupModuleNameList[0]
+ }
+ },
+ // 浠诲姟鍗曡繑鍥�
+ async ICMOBillComplete(e) {
+ console.log('ICMOBillRet: ', e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key]
+ Object.assign(this.hform, {
+ "HICMOInterID": data.hmainid,
+ "HICMOEntryID": data.HEntryID,
+ "HICMOBillNo": data.鍗曟嵁鍙�,
+ "HMaterNumber": data.浜у搧浠ｇ爜,
+ "HMaterName": data.浜у搧鍚嶇О,
+ "HMaterID": data.HMaterID,
+ "HICMOQty": data.鐢熶骇浠诲姟鍗曟暟閲�,
+ })
+ await this.$nextTick()
+ this.$refs.listPopup.exit()
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick()
+ this.enablePopupModule = this.PopupModuleNameList[0]
+ }
+ },
+ // 娴佽浆鍗¤繑鍥�
+ async ProcExchBillComplete(e) {
+ console.log('ProcExchBillRet: ', e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key]
+ Object.assign(this.hform, {
+ "HProcExchInterID": data.hmainid,
+ "HProcExchEntryID": data.hsubid,
+ "HProcExchBillNo": data.鍗曟嵁鍙�,
+ })
+ await this.$nextTick()
+ this.$refs.listPopup.exit()
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick()
+ this.enablePopupModule = this.PopupModuleNameList[0]
+ }
+ },
+ // 妫�楠屾柟妗堣繑鍥�
+ async HQCSchemeComplete(e) {
+ console.log('HQCSchemeRet: ', e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key]
+ Object.assign(this.hform, {
+ // "HMaterNumber": data["鐗╂枡浠ｇ爜"],
+ // "HMaterName": data["鐗╂枡鍚嶇О"],
+ // "HMaterID": data["HItemID"],
+ })
+ await this.$nextTick()
+ this.$refs.listPopup.exit()
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick()
+ this.enablePopupModule = this.PopupModuleNameList[0]
+ }
+ },
+ // 宸ュ簭杩斿洖
+ async HProcComplete(e) {
+ console.log(' HProcRet: ', e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key]
+ Object.assign(this.hform, {
+ "HProcName": data["宸ュ簭鍚嶇О"],
+ "HProcID": data["HItemID"],
+ })
+ await this.$nextTick()
+ this.$refs.listPopup.exit()
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick()
+ this.enablePopupModule = this.PopupModuleNameList[0]
}
},
setInspectValModule(checkItem) {
+ console.log('checkItem: ', checkItem);
+ if (!checkItem.HAnalysisMethod || !checkItem.HSampleSchemeID) {
+ return
+ }
// 鍖哄垎妫�楠屽�奸〉绛惧拰闈欐�侀〉绛撅紝妫�楠屽�奸〉绛剧殑id浠寮�澶�
this.$set(this.InspectModules, `_${checkItem.num}`, {
id: `_${checkItem.num}`,
checkItemId: checkItem.num
})
console.log(' this.arrayAnalysisMethod: ', checkItem.HAnalysisMethod);
- let analysisMethodName = this.arrayAnalysisMethod.find(e => e.value == checkItem.HAnalysisMethod).name
+ let analysisMethodName = this.arrayAnalysisMethod.find(e => e.value == checkItem.HAnalysisMethod)
+ .name
this.$set(this.subTabs, `_${checkItem.num}`, {
id: `_${checkItem.num}`,
name: `${analysisMethodName}-${checkItem.HSampleSchemeName}`
@@ -712,11 +1052,15 @@
this.linterid = e.linterid || 0
if (this.operationType == 1) {
await this.getMaxBillNo()
- } else if (this.operationType == 2) {
+ } else if (this.operationType == 2) {
- } else if (this.operationType == 3) {
+ } else if (this.operationType == 3) {
}
+
+ await this.InitHSource()
+ await this.InitHWorkShift()
+ await this.InitHEmp()
}
}
</script>
@@ -730,6 +1074,7 @@
.uni-input {
padding: 0
}
+
.bill-main-tabs,
.bill-sub-tabs {
@@ -763,7 +1108,7 @@
.bill-main-content,
.bill-sub-content {
box-sizing: border-box;
- padding: 0 10rpx;
+ padding: 0 30rpx 0 30rpx;
display: flex;
flex-direction: column;
@@ -790,6 +1135,22 @@
flex: 1;
border-radius: 22rpx;
border: 1px solid #acacac;
+
+ .uni-combox {
+ padding: 0;
+ height: auto;
+
+ .uni-input-placeholder,
+ .uni-input-input {
+ font-size: 26rpx;
+ }
+ }
+
+ .uni-combox::v-deep input {
+ height: inherit;
+ font-size: 26rpx;
+ }
+
}
.disabled {
@@ -932,6 +1293,22 @@
}
}
+ .icon-wrapper-big {
+ background-color: #3A78FF;
+ border-radius: 100%;
+ width: 50rpx;
+ height: 50rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-shrink: 0;
+ margin-left: 20rpx;
+
+ .uni-icons {
+ color: #fff !important;
+ }
+ }
+
.more {
color: #888;
font-size: 22rpx;
--
Gitblit v1.9.1