From 346314803cee2a7a0a1fbe6dfd9923887679016f Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期二, 03 三月 2026 13:08:25 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/ZLGL/QcenvironmentTestDotCheckBill/QcenvironmentTestDotCheckBill.vue | 1661 ++++++++++++++++++-------------------------------------
pages/ZLGL/QcenvironmentTestDotCheckBill/QCEnvironmentTestDotCheckBillList.vue | 46 +
manifest.json | 4
pages/index/tab2.vue | 30
pages/index/tab4.vue | 29
5 files changed, 611 insertions(+), 1,159 deletions(-)
diff --git a/manifest.json b/manifest.json
index 05904cd..0e98033 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "2.0.77",
- "versionCode" : 277,
+ "versionName" : "2.0.78",
+ "versionCode" : 278,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/ZLGL/QcenvironmentTestDotCheckBill/QCEnvironmentTestDotCheckBillList.vue b/pages/ZLGL/QcenvironmentTestDotCheckBill/QCEnvironmentTestDotCheckBillList.vue
index 2cdc0ad..54532ca 100644
--- a/pages/ZLGL/QcenvironmentTestDotCheckBill/QCEnvironmentTestDotCheckBillList.vue
+++ b/pages/ZLGL/QcenvironmentTestDotCheckBill/QCEnvironmentTestDotCheckBillList.vue
@@ -22,12 +22,12 @@
</view>
<view class="button-zone">
<button type="default" class="btn-a" size="mini" @tap="cmdSearch">鏌ヨ</button>
- <button type="default" class="btn-c" size="mini" @tap="setClearQuery">鏂板</button>
+ <button type="default" class="btn-c" size="mini" @tap="addNew">鏂板</button>
<button type="default" class="btn-d" size="mini" @tap="exit">閫�鍑�</button>
</view>
<view class="info-list-zone" id="scroll-content" :style="{height: scrollContentHeight + 'px'}">
<view class="card-item" v-for="(item, index) in listDataShow" :key="index">
- <uni-card :title="item['鍗曟嵁鍙�'] || '鐜妫�娴嬪崟'" :extra="'鏃ユ湡:' + formatDate(item['鏃ユ湡'])"
+ <uni-card :title="item['鍗曟嵁鍙�'] " :extra="'鏃ユ湡:' + formatDate(item['鏃ユ湡'])"
@tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
<view class="detail" v-if="item['缁勭粐鍚嶇О']">
@@ -35,18 +35,22 @@
</view>
</view>
<view class="card-detail" v-if="showDetail == index">
- <view class="detail" v-if="item['瀹℃牳浜�']">
- <text>瀹℃牳浜猴細</text>{{item['瀹℃牳浜�']}}
+ <view class="detail" v-if="item['鐢熶骇閮ㄩ棬']">
+ <text>鐢熶骇閮ㄩ棬锛�</text>{{item['鐢熶骇閮ㄩ棬']}}
</view>
<view class="detail" v-if="item['澶囨敞']">
<text>澶囨敞锛�</text>{{item['澶囨敞']}}
</view>
- <view class="detail" v-if="item['鍒跺崟鏃ユ湡']">
- <text>鍒跺崟鏃ユ湡锛�</text>{{formatDate(item['鍒跺崟鏃ユ湡'])}}
- </view>
- <view class="detail" v-if="item['瀹℃牳鏃ユ湡']">
- <text>瀹℃牳鏃ユ湡锛�</text>{{formatDate(item['瀹℃牳鏃ユ湡'])}}
- </view>
+ <view class="detail" v-if="item['宸ヤ綔涓績']">
+ <text>宸ヤ綔涓績锛�</text>{{item['宸ヤ綔涓績']}}
+ </view>
+ <view class="detail" v-if="item['宸ュ簭']">
+ <text>宸ュ簭锛�</text>{{item['宸ュ簭']}}
+ </view>
+ <view class="detail" v-if="item['娲佸噣搴︾瓑绾�']">
+ <text>娲佸噣搴︾瓑绾э細</text>{{item['娲佸噣搴︾瓑绾�']}}
+ </view>
+
</view>
<view class="more" v-if="showDetail == index && operations != index">
<view class="part" style="border-right: 1px solid #eee;">
@@ -191,11 +195,23 @@
},
// 閲嶇疆鏌ヨ鏉′欢
- setClearQuery() {
- this.hform.HBeginDate = dayjs().subtract(30, 'd').format('YYYY-MM-DD');
- this.hform.HEndDate = dayjs().format('YYYY-MM-DD');
- this.cmdSearch();
- },
+ addNew() {
+
+ uni.showLoading({
+ title: '鍔犺浇涓�...',
+ mask: true
+ });
+
+ // 寤惰繜涓�鐐瑰啀璺宠浆锛岃鐢ㄦ埛鑳界湅鍒板姞杞芥彁绀�
+ setTimeout(() => {
+ uni.redirectTo({
+ url: "/pages/ZLGL/QcenvironmentTestDotCheckBill/QcenvironmentTestDotCheckBill?operationType=1",
+ complete: () => {
+ uni.hideLoading();
+ }
+ });
+ }, 300);
+ },
async onPaginationChangeHandler({current}) {
this.listDataShow = this.listData.slice(
diff --git a/pages/ZLGL/QcenvironmentTestDotCheckBill/QcenvironmentTestDotCheckBill.vue b/pages/ZLGL/QcenvironmentTestDotCheckBill/QcenvironmentTestDotCheckBill.vue
index d7dcaea..12fdef4 100644
--- a/pages/ZLGL/QcenvironmentTestDotCheckBill/QcenvironmentTestDotCheckBill.vue
+++ b/pages/ZLGL/QcenvironmentTestDotCheckBill/QcenvironmentTestDotCheckBill.vue
@@ -35,19 +35,17 @@
</view>
</view>
<view class="form-item">
- <view class="left">宸ヤ綔涓績</view>
- <view class="right disabled">
- <input type="text" :value="hform.HCenterWorkName" disabled />
- </view>
- <view class="icon-wrapper-big"><uni-icons type="search" size="20":class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
- :disabled="HCenterWorkName"
- @click="showSelectorModule(hform, 6)"></uni-icons></view>
+ <view class="left">宸ヤ綔涓績</view>
+ <view class="right">
+ <uni-combox :candidates="WorkCenterList" placeholder="璇烽�夋嫨宸ヤ綔涓績" v-model="hform.HCenterWorkName"
+ @input="WorkCenterChange"></uni-combox>
+ </view>
</view>
<view class="form-item">
<view class="left">娲佸噣搴�</view>
<view class="right select-border">
<uni-data-select
- v-model="hform.HCleanliness"
+ v-model="hform.HCleanType"
:localdata="cleanlinessList"
:clear="false"
placeholder="璇烽�夋嫨娲佸噣搴�"
@@ -61,17 +59,22 @@
<view class="left">璁板綍浜�</view>
<view class="right">
<uni-combox :candidates="GyFirstCheckEmpNameList" placeholder="璇烽�夋嫨璁板綍浜�"
- v-model="hform.HFirstCheckEmpName"
+ v-model="hform.HEmpName"
@update:modelValue="HFirstCheckEmpChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="left">妫�娴嬫柟妗�</view>
- <view class="right disabled">
- <input type="text" disabled :value="this.hform.HQCSchemeName" />
- </view>
- <view class="icon-wrapper-big"><uni-icons type="search" size="20"
- @click="showSelectorModule(hform, 7)"></uni-icons></view>
+ <view class="left">妫�娴嬫柟妗�</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HQCSchemeName" />
+ </view>
+ <view class="icon-wrapper-big">
+ <uni-icons type="search" size="20" @click="showSelectorModule(hform, 7)"></uni-icons>
+ </view>
+ <!-- 娣诲姞鎵弿鍥炬爣 -->
+ <view class="icon-wrapper-big" style="margin-left: 10rpx;">
+ <uni-icons type="scan" size="20" @click="scanScheme"></uni-icons>
+ </view>
</view>
<view class="form-item">
<view class="left">宸ュ簭</view>
@@ -88,13 +91,13 @@
<view class="form-item">
<view class="left">鏀瑰杽瀵圭瓥</view>
<view class="right">
- <input type="text" v-model="hform.HErrTreatment" value="" />
+ <input type="text" v-model="hform.HNote" value="" />
</view>
</view>
<view class="form-item">
<view class="left">寮傚父鍘熷洜</view>
<view class="right">
- <input type="text" v-model="hform.HBatchNo" />
+ <input type="text" v-model="hform.HErrMsgBack" />
</view>
</view>
<view class="form-item">
@@ -103,6 +106,12 @@
<input type="text" v-model="hform.HRemark" value="" />
</view>
</view>
+ <view class="form-item">
+ <view class="left">缁勭粐</view>
+ <view class="right disabled">
+ <input type="text" v-model="hform.Organization" value="" disabled />
+ </view>
+ </view>
</view>
<!-- 鍒跺崟淇℃伅 -->
<view class="bill-main-content" v-if="mainTabSelected == 3">
@@ -176,37 +185,64 @@
<view v-for="subTab in subTabs" :key="subTab.id" :class="subTab.id == subTabSelected ? 'selected' : ''"
@tap="subTabSelected = subTab.id">{{ subTab.name }}</view>
</view>
- <!-- 瀛愯〃鍐呭 -->
- <view class="bill-main-contents">
- <!-- 妫�楠岄」鐩� 鍛堢幇 -->
- <view v-if="subTabSelected == 1">
- <!-- 闇�閫氳繃鏄惧紡璋冪敤蹇界暐$event鍙傛暟 -->
- <view class="buttons" @tap="addCheckItem()">
- <uni-icons type="plus" style="margin-right: 10rpx" size="22"></uni-icons>鏂板
- </view>
- <view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
- <view class="list" v-else>
- <uni-card v-for="checkItem in checkItems" :key="checkItem.num">
- <view class="card-detail">
- <view class="detail"> <text>搴忓彿锛�</text>{{ checkItem.num }} </view>
- <view class="detail editable">
- <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="showSelectorModule(checkItem, 2)"></uni-icons></view>
- </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"
- size="18"></uni-icons>鍒犻櫎
+ <!-- 瀛愯〃鍐呭 -->
+ <view class="bill-main-contents">
+ <!-- 妫�楠岄」鐩� 鍛堢幇 -->
+ <view v-if="subTabSelected == 1">
+ <view class="buttons" @tap="addCheckItem()">
+ <uni-icons type="plus" style="margin-right: 10rpx" size="22"></uni-icons>鏂板
+ </view>
+ <view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
+ <view class="list" v-else>
+ <uni-card v-for="checkItem in checkItems" :key="checkItem.num">
+ <view class="card-detail">
+ <view class="detail-row">
+ <view class="detail"><text>搴忓彿锛�</text>{{ checkItem.num }}</view>
+ <view class="detail editable">
+ <text>妫�娴嬮」鐩細</text>
+ <input type="text" :value="checkItem.HQCCheckItemName" disabled class="editable-input" />
+ <view class="icon-wrapper">
+ <uni-icons type="search" size="16" @click="showSelectorModule(checkItem, 2)"></uni-icons>
+ </view>
+ </view>
</view>
- </view>
- </uni-card>
- </view>
- </view>
- </view>
+ <view class="values-row">
+ <view class="detail actual-value">
+ <text>瀹為檯鍊硷細</text>
+ <input
+ type="text"
+ v-model="checkItem.HMeasure"
+ placeholder="璇疯緭鍏�"
+ class="actual-input"
+ />
+ </view>
+ <view class="value-item">
+ <text>鐩爣鍊硷細</text>
+ <text class="value">{{ checkItem.HTargetVal || '' }}</text>
+ </view>
+ </view>
+ <view class="values-row">
+ <view class="value-item">
+ <text>涓婇檺鍊硷細</text>
+ <text class="value">{{ checkItem.HUpLimit || '' }}</text>
+ </view>
+ <view class="value-item">
+ <text>涓嬮檺鍊硷細</text>
+ <text class="value">{{ checkItem.HDownLimit || '' }}</text>
+ </view>
+ </view>
+ </view>
+
+ <!-- 鍒犻櫎鎸夐挳 -->
+ <view class="more">
+ <view class="part" style="color: #da0000" @tap.stop="removeCheckItem(checkItem)">
+ <uni-icons type="trash" style="color: #da0000; margin-right: 10rpx" size="18"></uni-icons>鍒犻櫎
+ </view>
+ </view>
+ </uni-card>
+ </view>
+ </view>
+ </view>
</view>
<view style="height: 120rpx"></view>
<view class="bottom-btn">
@@ -215,28 +251,13 @@
<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
</view>
- <SampleSchemePopupVue v-if="enablePopupModule == PopupModuleNameList[1]" ref="listPopup"
- @update="SampleSchemeComplete" :bindKey="currentChechItemIDCache">
- </SampleSchemePopupVue>
- <CheckItemPopupVue v-if="enablePopupModule == PopupModuleNameList[2]" ref="listPopup"
+ <CheckEnvironmentTestItemPopupVue 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>
+ </CheckEnvironmentTestItemPopupVue>
<ProcessPopupVue v-if="enablePopupModule == PopupModuleNameList[8]" ref="listPopup" @update="HProcComplete"
:bindKey="0"></ProcessPopupVue>
- <CheckProjectPopupVue v-if="enablePopupModule == PopupModuleNameList[7]" ref="listPopup"
- @update="HQCSchemeComplete" :bindKey="0"></CheckProjectPopupVue>
- <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HSourceBillType"
- :HStockOrgID="hform.HStockOrgID" @BillSelectComplete="HandleBillSelectComplete"></BillListPopupVue>
+ <CheckSchemePopupVue v-if="enablePopupModule == PopupModuleNameList[7]" ref="listPopup"
+ @update="HQCSchemeComplete" :bindKey="0"></CheckSchemePopupVue>
</view>
</template>
@@ -245,367 +266,107 @@
import {
CommonUtils
} from "../../../utils/common";
- import InspectValueTemplateVue from "@/components/ZLGL/InspectValueTemplate.vue";
- import SampleSchemePopupVue from "@/components/ZLGL/SampleSchemePopup.vue";
- 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 CheckEnvironmentTestItemPopupVue from "../../../components/ZLGL/CheckEnvironmentTestItemPopup.vue";
import ProcessPopupVue from "../../../components/ZLGL/ProcessPopup.vue";
- import CheckProjectPopupVue from "../../../components/ZLGL/CheckProjectPopup.vue";
- import BillListPopupVue from "../../../components/BillListPopup/BillListPopup.vue";
+ import CheckSchemePopupVue from "../../../components/ZLGL/CheckSchemePopup.vue";
import {
getUserInfo
} from "../../../utils/auth";
- import {
- MpaasScan
- } from "../../../utils/mpaasScan";
export default {
components: {
- InspectValueTemplateVue,
- SampleSchemePopupVue,
- CheckItemPopupVue,
- InspectMentPopupVue,
- MaterialPopupVue,
- ICMOBillPopupVue,
- ProcExchBillPopupVue,
+ CheckEnvironmentTestItemPopupVue,
ProcessPopupVue,
- CheckProjectPopupVue,
- BillListPopupVue,
- },
- computed: {
- judgeConclusion: {
- get() {
- return true;
- },
- },
+ CheckSchemePopupVue,
},
data() {
return {
operationType: 1,
-
mainTabSelected: 1,
subTabSelected: 1,
-
- // 婧愬崟鐘舵�佹帶鍒�
hasSourceBill: false,
-
- // 鎺у埗褰撳墠鏄剧ず鐨勫脊绐楁ā鍧�
enablePopupModule: "",
PopupModuleNameList: [
"",
- "SampleScheme",
+ "",
"CheckItem",
- "InspectMent",
- "Material",
- "ICMOBill",
- "ProcExchBill",
+ "",
+ "",
+ "",
+ "",
"QCScheme",
"Process",
],
- // 褰撳墠鎿嶄綔鐨勬楠屽崟ID缂撳瓨
currentChechItemIDCache: -1,
-
- // uni-combox 閫夋嫨鍣ㄤ娇鐢�
-
-
- // 妫�楠屽憳
GyFirstCheckEmpList: [],
GyFirstCheckEmpNameList: [],
-
-
- // 閮ㄩ棬鍒楄〃
DeptNameList: [],
DeptList: [],
-
+ WorkCenter:[],
+ WorkCenterList:[],
cleanlinessList: [
{ value: 'A', text: 'A' },
{ value: 'B', text: 'B' },
{ value: 'C', text: 'C' }
- ],
- hform: {
- HCleanliness: ''
- },
-
-
- ArrayAnalysisMethodValue: [1],
- // 瀛愯〃 椤电淇℃伅
+ ],
subTabs: {
1: {
id: "1",
name: "妫�楠岄」鐩�",
},
},
-
-
- // 涓昏〃灞炴��
hform: {
- HSourceBillType: "3791",
HBillType: '7524',
- HSourceBillNo: "",
- HSourceBillQty: 0,
- HBillNo: "",
+ HBillSubType: '7524',
HInterID: "0",
HDate: dayjs(new Date()).format("YYYY-MM-DD"),
- HSourceName: "",
- HSourceID: "0",
- HShiftsName: "",
- HShiftsID: "0",
- HDeptID:"0",
- HDeptName:"",
- HICMOBillNo: "",
- HICMOInterID: "0",
- HICMOEntryID: "1",
- HICMOQty: "0",
- HProcExchBillNo: "",
- HProcExchInterID: "0",
- HProcExchEntryID: "0",
- HProcExchQty: "0",
- HMaterNumber: "",
- HMaterID: "0",
- HMaterName: "",
- HFirstCheckEmpName: getUserInfo().HEmpName,
- HFirstCheckEmp: getUserInfo().HEmpID,
- HQCSchemeName: "",
- HQCSchemeID: "0",
- HBatchNo: "",
- HCheckerResult: true, // 榛樿鍚堟牸
- HProcName: "",
+ HBillNo: "",
+ HBillStatus: "1",
+ HYear: String(dayjs(new Date()).year()),
+ HPeriod: String(dayjs(new Date()).month() + 1),
+ HDeptID: String(getUserInfo()["HDeptID"] || "0"),
+ HDeptName: getUserInfo()["HDeptName"] || "",
+ Organization: getUserInfo()["Organization"] || "",
+ HCenterWorkID: "",
+ HCenterWorkName: "",
HProcID: "0",
- HTakeSampleCheckBillNo: "", // 鍙栨牱鍗�
- HTakeSampleCheckBillID: "0",
+ HProcName: "",
+ HCleanType: 'A',
+ HEmpID: String(getUserInfo().HEmpID || "0"),
+ HEmpName: getUserInfo().HEmpName || "",
+ HEnvironmentTestSchemeID: "0",
+ HEnvironmentTestSchemeName: "",
+ HErrMsgBack: "",
+ HNote: "",
HRemark: "",
-
- HDeptName: getUserInfo()["HDeptName"],
- HDeptID: getUserInfo()["HDeptID"],
- HMaker: getUserInfo()["Czymc"] || "",
- HChecker: "",
- HCloseMan: "",
- HMakeDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
- HCheckDate: "",
- HCloseDate: "",
- HUpDater: "",
- HDeleteMan: "",
- HUpDateDate: "",
- HDeleteDate: "",
- HResult: 1,
- HAnalysisMethod: "",
-
- HCheckQty: 0,
-
- HResDec: "",
- HStatus: 1,
-
HMainSourceBillType: "",
HMainSourceInterID: "0",
HMainSourceEntryID: "1",
HMainSourceBillNo: "",
- HStockOrgID: uni.getStorageSync('OrganizationID'),
+ HOrgID: uni.getStorageSync('OrganizationID') || "0",
+ HMaker: getUserInfo()["Czymc"] || "",
+ HMakeDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
+ HChecker: "",
+ HCheckDate: "",
+ HCloseMan: "",
+ HCloseDate: "",
+ HUpDater: "",
+ HUpDateDate: "",
+ HDeleteMan: "",
+ HDeleteDate: "",
+ HQCSchemeName: "",
+ HQCSchemeID: "0",
},
- // 妫�椤圭洰
checkItems: {},
- // 妫�娴嬪�兼ā鍧�
- InspectModules: {},
- // 妫�娴嬪��
- InspectValues: {},
};
},
methods: {
- // 婧愬崟绫诲瀷閫夋嫨
- HSourceBillTypeNameChange(e) {
- this.HSourceBillType = this.HSourceBillTypeNameList[e.detail.value];
- this.hform.HSourceBillType = this.HSourceBillTypeValueList[e.detail.value];
- const pages = getCurrentPages()
- // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
- const currentPage = pages[pages.length - 1]
- // 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
- uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
- HSourceBillTypeName: this.HSourceBillType,
- HSourceBillType: this.hform.HSourceBillType
- })
+ async showSelectorModule(item, index) {
+ this.currentChechItemIDCache = item.num || 0;
+ this.enablePopupModule = this.PopupModuleNameList[index];
+ await this.$nextTick();
+ this.$refs.listPopup.showPopup();
},
- // 璇诲彇缂撳瓨
- loadCache() {
- const pages = getCurrentPages()
- // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
- const currentPage = pages[pages.length - 1]
- let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`)
- if (HBillTypeCache) {
- this.HSourceBillType = HBillTypeCache.HSourceBillTypeName
- this.hform.HSourceBillType = HBillTypeCache.HSourceBillType
- this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType
- }
- },
- // 鏍规嵁婧愬崟绫诲瀷閫夋嫨鍗曟嵁
- toBillSelector() {
- this.$refs['billList'].showPopup()
- },
- toScanCode() {
- MpaasScan.scanCode((res) => {
- if (res) {
- this.getSourceBillInfo(HBarCode);
- }
- });
- },
-
- async HandleBillSelectComplete(e) {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
- data: {
- HBillType: this.hform.HBillType,
- HSourceBillType: this.hform.HSourceBillType,
- HBarCode: "",
- HInterID: e?.HInterID,
- HEntryID: e?.HEntryID,
- Mode: 2 ,//閫夊崟妯″紡
- user:getUserInfo()["Czymc"]
- }
- })
-
- let {
- data,
- Message,
- count
- } = res.data
- if (count == 1) {
- console.log('鑾峰彇婧愬崟锛�', data)
- this.hform.HMaterID = data[0]['HMaterID']
- this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
- this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
- this.hform.HMainSourceBillNo = data[0]['HBillNo']
- this.hform.HSourceBillNo = data[0]['HBillNo']
- this.hform.HMainSourceInterID = data[0].HInterID
- this.hform.HMainSourceEntryID = data[0].HEntryID
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
- this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
- this.hform.HSourceBillQty = data[0].HSourceBillQty
- this.hform.HICMOBillNo= data[0].浠诲姟鍗曞彿
- this.hform.HICMOInterID= data[0].HICMOInterID
- this.hform.HICMOEntryID= data[0].HICMOEntryID
- this.hform.HICMOQty= data[0].鐢熶骇鏁伴噺
- this.hform.HProcExchBillNo= data[0].鍗曟嵁鍙�
- this.hform.HProcExchInterID= data[0].HInterID
- this.hform.HProcExchEntryID= data[0].HEntryID
- this.hform.HProcExchQty= data[0].娴佽浆鍗℃暟閲�
- this.hform.HSourceName= data[0].鐢熶骇璧勬簮
- this.hform.HSourceID= data[0].HSourceID
- this.hform.HProcID= data[0].HProcID
- this.hform.HProcName= data[0].褰撳墠宸ュ簭
-
- this.get_CheckItem();
- this.hasSourceBill = true
- this.$refs['billList'].exit()
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: Message
- })
- }
-
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: "婧愬崟涓嬫帹閿欒: " + err
- })
- }
-
- },
- async GetCheckItemID() {
- if (!this.hform.HMaterName && !this.hform.HProcName) {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Web/GetCheckItemID",
- data: {
- HName: this.hform.HMaterName,
- HProName: this.hform.HProcName,
- HSourceID: this.hform.HSourceID,
- },
- });
-
- let {
- count,
- Message,
- data
- } = res.data;
-
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${Message}`,
- });
- return;
- }
-
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
- this.hform.HQCSchemeID = data[0].hmainid;
-
- this.get_CheckItem();
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${err}`,
- });
- }
- }
- },
- async LoadingInformation_ProcExchange(HBarCode) {
- // 宸ュ簭娴佽浆鍗�
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/CheckBill/get_ProcessExchangeBill_ByBillNo",
- data: {
- HBillNo: HBarCode,
- user: getUserInfo()["Czymc"],
- },
- });
-
- let {
- count,
- Message,
- data
- } = res.data;
-
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${Message}`,
- });
- return;
- }
- this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
- this.hform.HProcExchInterID = data[0].HProcExchInterID;
- this.hform.HProcExchEntryID = data[0].HProcExchEntryID || 0;
- this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
- this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
- this.hform.HICMOInterID = data[0].HICMOInterID;
- this.hform.HICMOQty = data[0].HICMOQty || 0;
- this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
- this.hform.HSourceID = data[0].HSourceID || 0;
- this.hform.HMaterID = data[0].HMaterID;
- this.hform.HMaterName = data[0].浜у搧鍚嶇О;
- this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
- this.hform.HMainSourceBillType = data[0].HBillType;
- this.hform.HMainSourceInterID = data[0].HInterID;
- this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
- this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
- this.hform.HProcName = data[0].褰撳墠宸ュ簭;
- this.hform.HBatchNo = data[0].鎵瑰彿;
-
- this.hasSourceBill = true
- this.get_CheckItem();
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${err}`,
- });
- }
- },
-
- // 閮ㄩ棬
- async InitDept() { // 鍒濆鍖栭儴闂�
+ async InitDept() {
try {
let res = await CommonUtils.doRequest2Async({
url: '/PublicPageMethod/DeptList',
@@ -613,12 +374,7 @@
sWhere: 'where 1=1',
}
})
- let {
- count,
- code,
- Message,
- data
- } = res.data
+ let { count, code, Message, data } = res.data
if (count == 1) {
this.DeptList = data
this.DeptNameList = Array.from(data).map(elem => elem['HName'])
@@ -635,19 +391,187 @@
})
}
},
- DeptChange(elem) { // 閮ㄩ棬鏀瑰彉 鍙ユ焺
+ DeptChange(elem) {
let index = this.DeptNameList.findIndex(e => e == elem)
-
if (index == -1) {
this.hform.HDeptName = ''
this.hform.HDeptID = 0
return
}
-
this.hform.HDeptName = this.DeptList[index]['HName']
this.hform.HDeptID = this.DeptList[index]['HItemID']
},
- // 璁板綍浜哄垵濮嬪寲
+ async WorkCenter1() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_WorkCenter/list',
+ data: {
+ sWhere : "",
+ user: getUserInfo()["Czymc"],
+ }
+ })
+ let { count, code, Message, data } = res.data
+ if (count == 1) {
+ this.WorkCenter = data
+ this.WorkCenterList = Array.from(data).map(elem => elem['宸ヤ綔涓績鍚嶇О'])
+ } else {
+ CommonUtils.showTips({
+ title: '閿欒鎻愮ず',
+ message: "鍒濆鍖栫敓浜т腑蹇冮敊璇�: " + Message,
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '閿欒鎻愮ず',
+ message: "鍒濆鐢熶骇涓績閿欒: " + err,
+ })
+ }
+ },
+ // 鎵弿妫�娴嬫柟妗�
+ scanScheme() {
+ // 璋冪敤鎵弿鍔熻兘
+ uni.scanCode({
+ success: (res) => {
+ if (res.result) {
+ this.getSchemeByScan(res.result);
+ }
+ },
+ fail: (err) => {
+ console.error('鎵弿澶辫触:', err);
+ uni.showToast({
+ title: '鎵弿澶辫触',
+ icon: 'none'
+ });
+ }
+ });
+ },
+
+ // 鏍规嵁鎵弿缁撴灉鑾峰彇妫�娴嬫柟妗�
+ async getSchemeByScan(schemeNo) {
+ uni.showLoading({
+ title: '鍔犺浇涓�...',
+ mask: true
+ });
+
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Gy_BaseInformation/get锘縂y_EnvironmentTestSchemeBillMainList",
+ data: {
+ sWhere: ` and 鍗曟嵁鍙� = '${schemeNo}'`,
+ user: getUserInfo()['Czymc']
+ }
+ });
+
+ let { data, count, Message } = res.data;
+
+ if (count == 1 && data && data.length > 0) {
+ // 澶勭悊妫�娴嬫柟妗堟暟鎹�
+ this.processSchemeData(data);
+
+ uni.showToast({
+ title: `宸插姞杞� ${data.length} 鏉℃暟鎹甡,
+ icon: 'success'
+ });
+ } else {
+ uni.showToast({
+ title: '鏈壘鍒版娴嬫柟妗�',
+ icon: 'none'
+ });
+ }
+ } catch (err) {
+ console.error('鍔犺浇妫�娴嬫柟妗堝け璐�:', err);
+ uni.showToast({
+ title: '鍔犺浇澶辫触',
+ icon: 'none'
+ });
+ } finally {
+ uni.hideLoading();
+ }
+ },
+
+ // 澶勭悊妫�娴嬫柟妗堟暟鎹�
+ processSchemeData(data) {
+ // 鑾峰彇涓昏〃鏁版嵁锛堢涓�鏉¤褰曪級
+ let mainData = data[0];
+
+ // 鏇存柊涓昏〃淇℃伅
+ this.hform.HQCSchemeName = mainData.鍗曟嵁鍙� || "";
+ this.hform.HEnvironmentTestSchemeID = mainData.HInterID || 0;
+
+ // 濡傛灉鏈夐儴闂ㄤ俊鎭紝鑷姩濉厖
+ if (mainData.鐢熶骇閮ㄩ棬) {
+ let deptIndex = this.DeptList.findIndex(dept => dept.HName == mainData.鐢熶骇閮ㄩ棬);
+ if (deptIndex != -1) {
+ this.hform.HDeptName = mainData.鐢熶骇閮ㄩ棬;
+ this.hform.HDeptID = this.DeptList[deptIndex].HItemID;
+ }
+ }
+
+ // 濡傛灉鏈夊伐浣滀腑蹇冧俊鎭紝鑷姩濉厖
+ if (mainData.宸ヤ綔涓績) {
+ let workCenterIndex = this.WorkCenter.findIndex(wc => wc.宸ヤ綔涓績鍚嶇О == mainData.宸ヤ綔涓績);
+ if (workCenterIndex != -1) {
+ this.hform.HCenterWorkName = mainData.宸ヤ綔涓績;
+ this.hform.HCenterWorkID = this.WorkCenter[workCenterIndex].HItemID;
+ }
+ }
+
+ // 濡傛灉鏈夊伐搴忎俊鎭紝鑷姩濉厖
+ if (mainData.宸ュ簭) {
+ this.hform.HProcName = mainData.宸ュ簭;
+ if (mainData.HProcID) {
+ this.hform.HProcID = mainData.HProcID;
+ }
+ }
+
+ // 娓呯┖骞堕噸鏂板姞杞芥楠岄」鐩�
+ this.checkItems = {};
+
+ // 鍔犺浇鎵�鏈夋楠岄」鐩紙瀛愯〃鏁版嵁锛�
+ let mainInterID = mainData.HInterID;
+ let details = data.filter(item => item.HInterID === mainInterID);
+
+ if (details.length > 0) {
+ details.forEach((item, index) => {
+ let ordinal = index + 1;
+ let checkItem = {
+ num: ordinal,
+ HInterID: this.hform.HInterID,
+ HBillNo_bak: this.hform.HBillNo || "",
+ HEntryID: ordinal,
+ HCloseMan: "",
+ HEntryCloseDate: item.HEntryCloseDate === "0" ? "2000-01-01" : item.HEntryCloseDate,
+ HCloseType: 0,
+ HRemark: item.澶囨敞 || "",
+ HSourceInterID: 0,
+ HSourceEntryID: 0,
+ HSourceBillNo: "",
+ HSourceBillType: "",
+ HRelationQty: 0,
+ HRelationMoney: 0,
+ HQCCheckItemName: item.妫�娴嬮」鐩�,
+ HEnvironmentItemID: item.HEnvironmentItemID || "",
+ HMeasure: item.瀹為檯鍊� || "",
+ HTargetVal: item.鐩爣鍊� || "",
+ HUpLimit: item.涓婇檺鍊� || "",
+ HDownLimit: item.涓嬮檺鍊� || "",
+ HEnvironmentItemName: item.妫�娴嬮」鐩� || "",
+ };
+ this.$set(this.checkItems, ordinal, checkItem);
+ });
+ }
+
+ this.$forceUpdate();
+ },
+ WorkCenterChange(elem) {
+ let index = this.WorkCenterList.findIndex(e => e == elem)
+ if (index == -1) {
+ this.hform.HCenterWorkName = ''
+ this.hform.HCenterWorkID = 0
+ return
+ }
+ this.hform.HCenterWorkID = this.WorkCenter[index]['HItemID']
+ },
async InitHEmp() {
try {
let res = await CommonUtils.doRequest2Async({
@@ -659,14 +583,9 @@
},
});
- let {
- data,
- Message,
- count
- } = res.data;
+ 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 {
@@ -683,191 +602,50 @@
}
},
async HFirstCheckEmpChange(e) {
- console.log("閫変腑妫�楠屽憳: ", e);
let index = this.GyFirstCheckEmpList.findIndex((elem) => elem["鑱屽憳鍚嶇О"] == e);
if (index == -1) {
- this.hform.HFirstCheckEmp = 0;
- this.hform.HFirstCheckEmpName = "";
+ this.hform.HEmpID = 0;
+ this.hform.HEmpName = "";
return;
}
-
- this.hform.HFirstCheckEmp = this.GyFirstCheckEmpList[index]["HItemID"];
- this.hform.HFirstCheckEmpName = this.GyFirstCheckEmpList[index]["鑱屽憳鍚嶇О"];
+ this.hform.HEmpID = this.GyFirstCheckEmpList[index]["HItemID"];
+ this.hform.HEmpName = 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}`,
- });
- }
+ cleanlinessChange(e) {
+ this.hform.HCleanType = e;
},
- 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 缁勭粐 = '${uni.getStorageSync("Organization")}'`,
- 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]["鐢熶骇璧勬簮鍚嶇О"];
-
- this.get_ICMOBillStatusList();
- this.get_QC_TakeSampleCheckBillList();
- this.GetCheckItemID();
- },
- // 鏄剧ず寮圭獥
- async showSelectorModule(item, index) {
- this.currentChechItemIDCache = item.num || 0; // 0 琛ㄧず娌℃湁浠讳綍瀛愯〃琚�変腑
- this.enablePopupModule = this.PopupModuleNameList[index];
- console.log("this.$refs: ", this.$refs);
- await this.$nextTick();
- if (index == 7) {
- // 妫�楠屾柟妗堥渶瑕侀澶栦紶閫掑伐搴忓拰鐗╂枡鍚嶇О涓や釜鍙傛暟
- this.$refs.listPopup.setRequiredInfo(item.HMaterName, item.HProcName);
- }
-
- this.$refs.listPopup.showPopup();
- },
- getAnalysisMethodDisplay(val) {
- console.log("AnalysisMethodVal: ", val);
- if (val) {
- return this.arrayAnalysisMethod.find((e) => e.value == val).name;
- }
- return "";
- },
- checkResultChange(event) {
- console.log("event: ", event);
- },
- // 妫�楠岄」鐩柊澧炶
addCheckItem(resource) {
let ordinal = this.getObjLength(this.checkItems) + 1;
let checkItem = {
num: ordinal,
HInterID: this.hform.HInterID,
- HQCCheckItemID: "",
- HQCCheckItemNumber: "",
- HQCCheckItemName: "",
- HInspectInstruMentID: "0",
- HInspectInstruMentNumber: "",
- HInspectInstruMentName: "",
- HQCStd: "",
- HUnit: "",
- HQCNote: "",
- HAnalysisMethod: "",
- HResult: 1,
- HMax: "",
- HMin: "",
- HAvg: "",
+ HBillNo_bak: this.hform.HBillNo || "",
+ HEntryID: ordinal,
+ HCloseMan: "",
+ HEntryCloseDate: "",
+ HCloseType: 0,
HRemark: "",
- HKeyInspect: false,
- HStatus: 1,
- HSampleSchemeID: "",
- HUnitID: 0,
- HInspectVal: "",
+ HSourceInterID: 0,
+ HSourceEntryID: 0,
+ HSourceBillNo: "",
+ HSourceBillType: "",
+ HRelationQty: 0,
+ HRelationMoney: 0,
+ HEnvironmentItemID: "",
+ HMeasure: "",
HTargetVal: "",
HUpLimit: "",
HDownLimit: "",
- HUpOffSet: "",
- HDownOffSet: "",
- HSampleDamageQty: 0,
- HSampleSchemeName: "",
- HSampleQty: 0,
- HAcceptQty: 0,
- HInspectionLevel: "",
- HRejectQty: 0,
- HStrictness: "",
- HSampleUnRightQty: 0,
- HAQL: "",
- HSamplingType: "",
- HInspectResultToSee: "",
+ HEnvironmentItemName: "",
+ HQCCheckItemName: "",
};
+
if (resource) {
- // 閫氳繃涓昏〃妫�楠屾柟妗堝甫鍑虹殑妫�楠岄」鐩�
Object.assign(checkItem, resource);
}
+
this.$set(this.checkItems, ordinal, checkItem);
- this.$nextTick(() => {
- // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
- this.setInspectValModule(this.checkItems[ordinal]);
- });
},
- // 妫�楠岄」鐩垹闄よ
removeCheckItem(item) {
uni.showModal({
title: "娓╅Θ鎻愮ず",
@@ -875,7 +653,6 @@
success: (res) => {
if (res.confirm) {
this.$delete(this.checkItems, item.num);
- this.$delete(this.subTabs, `_${item.num}`);
this.$forceUpdate();
this.refreshCheckItemNum();
}
@@ -884,7 +661,6 @@
},
async refreshCheckItemNum() {
await this.$nextTick();
- // 閲嶆帓搴忓彿
let num = 1;
let checkItemsCache = {};
for (let s in this.checkItems) {
@@ -897,129 +673,96 @@
getObjLength(obj) {
return Object.keys(obj).length;
},
- // 缁撹淇敼
- HResultChange(id, e) {
- console.log("e: ", e);
- this.checkItems[id]["HResult"] = e.detail.value ? 1 : 2;
-
- this.HCheckLastResult();
- },
- // 姣忔妫�楠岄」鐩殑缁撹鏇存柊锛岄兘瑕佸垽鏂渶缁堢粨璁�
- HCheckLastResult() {
- let unPassNum = 0;
- for (var key in this.checkItems) {
- if (!(this.checkItems[key]["HResult"] == 1)) {
- unPassNum++;
- }
- }
-
- if (unPassNum > 0) {
- this.hform.HCheckerResult = false;
- return;
- }
- this.hform.HCheckerResult = true;
- },
- // 妫�楠屽�� 璁＄畻鏄惁鍚堟牸
- calcHResult(item) {
- // 闈炴娊妫�鏉′欢涓嬪垽鏂粨璁�
- console.log('item: ', item);
- if (!item.HSampleSchemeID) {
- return
- }
-
- if (item.HInspectValQ >= item.HDownLimit && item.HInspectValQ <= item.HUpLimit) {
- this.checkItems[item.num].HResult = 1
- return
- }
-
- this.checkItems[item.num].HResult = 2
- },
- // 妫�楠屾柟妗堜慨鏀�
- 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["鍚嶇О"],
+ HEnvironmentItemID: data["HItemID"],
+ 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"]) {
- let data = e["retVal"][key];
- Object.assign(this.checkItems[key], {
- HSampleSchemeID: data["hmainid"],
- HSampleSchemeNumber: data["鎶芥牱鏂规浠ｇ爜"],
- HSampleSchemeName: data["鎶芥牱鏂规鍚嶇О"],
- HSampleQty: data["鏍锋湰閲�"] || 0,
- HAcceptQty: data["鍏佽鏁�"] || 0,
- HInspectionLevel: data["妫�楠屾按骞�"],
- HRejectQty: data["鎷掔粷鏁�"] || 0,
- HStrictness: data["涓ユ牸搴�"],
- HSampleUnRightQty: data["鏍锋湰涓嶅悎鏍兼暟"] || 0,
- HAQL: data["AQL"],
- HSamplingType: data["鎶芥牱绫诲瀷"],
- HInspectResultToSee: data["妫�楠岀粨鏋�"],
- HUpLimit: data["涓婇檺鍊�"] || 0,
- HDownLimit: data["涓嬮檺鍊�"] || 0,
- HSampleDamageQty: data["鏍锋湰鐮村潖鏁�"] || 0,
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- this.setInspectValModule(this.checkItems[key]);
-
- 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, {
- HQCSchemeID: data.hmainid,
- HQCSchemeName: data.妫�楠屾柟妗堝悕绉�,
- });
- await this.get_CheckItem();
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- }
+ let allItems = Object.values(e.retVal);
+ if (allItems.length === 0) return;
+
+ let selectedMainData = e.selectedMainData || allItems[0];
+
+ this.hform.HQCSchemeName = selectedMainData.鍗曟嵁鍙� || "";
+ this.hform.HEnvironmentTestSchemeID = selectedMainData.HInterID || 0;
+
+ if (selectedMainData.鐢熶骇閮ㄩ棬) {
+ let deptIndex = this.DeptList.findIndex(dept => dept.HName == selectedMainData.鐢熶骇閮ㄩ棬);
+ if (deptIndex != -1) {
+ this.hform.HDeptName = selectedMainData.鐢熶骇閮ㄩ棬;
+ this.hform.HDeptID = this.DeptList[deptIndex].HItemID;
+ }
+ }
+
+ if (selectedMainData.宸ヤ綔涓績) {
+ let workCenterIndex = this.WorkCenter.findIndex(wc => wc.宸ヤ綔涓績鍚嶇О == selectedMainData.宸ヤ綔涓績);
+ if (workCenterIndex != -1) {
+ this.hform.HCenterWorkName = selectedMainData.宸ヤ綔涓績;
+ this.hform.HCenterWorkID = this.WorkCenter[workCenterIndex].HItemID;
+ }
+ }
+
+ if (selectedMainData.宸ュ簭) {
+ this.hform.HProcName = selectedMainData.宸ュ簭;
+ if (selectedMainData.HProcID) {
+ this.hform.HProcID = selectedMainData.HProcID;
+ }
+ }
+
+ this.checkItems = {};
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ await this.$nextTick();
+
+ let mainInterID = selectedMainData.HInterID;
+ let details = allItems.filter(item => item.HInterID === mainInterID);
+
+ if (details.length > 0) {
+ details.forEach((item, index) => {
+ let ordinal = index + 1;
+ let checkItem = {
+ num: ordinal,
+ HInterID: this.hform.HInterID,
+ HBillNo_bak: this.hform.HBillNo || "",
+ HEntryID: ordinal,
+ HCloseMan: "",
+ HEntryCloseDate: item.HEntryCloseDate === "0" ? "2000-01-01" : item.HEntryCloseDate,
+ HCloseType: 0,
+ HRemark: item.澶囨敞 || "",
+ HSourceInterID: 0,
+ HSourceEntryID: 0,
+ HSourceBillNo: "",
+ HSourceBillType: "",
+ HRelationQty: 0,
+ HRelationMoney: 0,
+ HQCCheckItemName: item.妫�娴嬮」鐩�,
+ HEnvironmentItemID: item.HEnvironmentItemID || "",
+ HMeasure: item.瀹為檯鍊� || "",
+ HTargetVal: item.鐩爣鍊� || "",
+ HUpLimit: item.涓婇檺鍊� || "",
+ HDownLimit: item.涓嬮檺鍊� || "",
+ HEnvironmentItemName: item.妫�娴嬮」鐩� || "",
+ };
+ this.$set(this.checkItems, ordinal, checkItem);
+ });
+
+ uni.showToast({
+ title: `宸叉坊鍔� ${details.length} 鏉℃楠岄」鐩甡,
+ icon: 'success'
+ });
+ }
+
+ this.$forceUpdate();
},
- // 宸ュ簭杩斿洖
async HProcComplete(e) {
- console.log(" HProcRet: ", e);
for (var key in e["retVal"]) {
let data = e["retVal"][key];
Object.assign(this.hform, {
@@ -1028,16 +771,10 @@
});
await this.$nextTick();
this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
await this.$nextTick();
this.enablePopupModule = this.PopupModuleNameList[0];
- await this.GetCheckItemID();
- await this.get_ICMOBillStatusList();
- await this.get_QC_TakeSampleCheckBillList();
}
},
-
-
async getMaxBillNo() {
try {
let res = await CommonUtils.doRequest2Sync({
@@ -1047,15 +784,9 @@
},
});
- if (!res) {
- return;
- }
+ if (!res) return;
- let {
- data,
- Message,
- count
- } = res.data;
+ let { data, count, Message } = res.data;
if (count == 1) {
this.hform.HInterID = data[0].HInterID;
this.hform.HBillNo = data[0].HBillNo;
@@ -1069,355 +800,119 @@
});
}
},
-
checkSubmitValidate() {
- // if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
- // CommonUtils.showTips({
- // message: "浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�",
- // });
- // return false;
- //
-
- if (this.hform.HFirstCheckEmp == 0) {
- CommonUtils.showTips({
- message: "璁板綍浜烘湭閫夋嫨锛�",
- });
+ if (this.hform.HEmpID == 0) {
+ CommonUtils.showTips({ message: "璁板綍浜烘湭閫夋嫨锛�" });
return false;
}
for (let key in this.checkItems) {
- if (!this.checkItems[key].HQCCheckItemID) {
+ if (!this.checkItems[key].HEnvironmentItemID) {
CommonUtils.showTips({
message: `绗�${this.checkItems[key].num}琛屾楠岄」鐩笉鑳戒负绌�!`,
});
return false;
}
-
- if (
- this.checkItems[key].HSampleSchemeID == "" ||
- this.checkItems[key].HSampleSchemeID == null
- ) {
- this.checkItems[key].HSampleSchemeID = 0;
- }
- if (
- this.checkItems[key].HSampleQty == "" ||
- this.checkItems[key].HSampleQty == null
- ) {
- this.checkItems[key].HSampleQty = 0;
- }
- if (
- this.checkItems[key].HSampleDamageQty == "" ||
- this.checkItems[key].HSampleDamageQty == null
- ) {
- this.checkItems[key].HSampleDamageQty = 0;
- }
- if (
- this.checkItems[key].HAcceptQty == "" ||
- this.checkItems[key].HAcceptQty == null
- ) {
- this.checkItems[key].HAcceptQty = 0;
- }
- if (
- this.checkItems[key].HRejectQty == "" ||
- this.checkItems[key].HRejectQty == null
- ) {
- this.checkItems[key].HRejectQty = 0;
- }
- if (
- this.checkItems[key].HSampleUnRightQty == "" ||
- this.checkItems[key].HSampleUnRightQty == 0
- ) {
- this.checkItems[key].HSampleUnRightQty = 0;
- }
- if (this.checkItems[key].HUnitID == "") {
- this.checkItems[key].HUnitID = 0;
- }
}
-
return true;
},
async submit() {
- if (!this.checkSubmitValidate()) {
- return;
- }
- try {
- console.log('this.$refs: ', this.$refs);
- // 妫�鏌ユ槸鍚︽湁鏈垏鎹㈢殑妫�楠屽�兼ā鍧�(鏄惁鍖呭惈set_SaveValue鏂规硶),濡傛灉鏈夛紝鍒欒繍琛屼竴娆′繚瀛樻楠屽�肩殑鏂规硶锛屾牴鎹楠屽�兼槸鍚︿繚瀛樻垚鍔熷啀鎵ц涓嬩竴姝�
- if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules.length >
- 0) {
- // 鍔犺浇鏈夋楠屽�兼ā鍧�
- await this.$refs.InspectValueModules[0].set_SaveValue();
- this.InspectValues[0] = this.$refs.InspectValueModules[0].InSpectValues;
- await this.InspectValueComplete(this.$refs.InspectValueModules[0].checkData)
- }
- let InspectValuesTrans = [];
- let HInterID = this.hform.HInterID;
- for (let key in this.InspectValues) {
- let HEntryID = key;
-
- InspectValuesTrans.push(
- `${JSON.stringify(this.InspectValues[key])}`
- );
- }
- let checkItemsArray = [];
- for (var key in this.checkItems) {
- let checkItem = JSON.parse(JSON.stringify(this.checkItems[key]))
- delete checkItem.data
- checkItemsArray.push(checkItem);
- }
- console.log('checkItemsArray: ', checkItemsArray);
- let sMainSub = `${JSON.stringify(this.hform)};${JSON.stringify(
- checkItemsArray
- )};${this.operationType};${getUserInfo()["Czymc"]};${InspectValuesTrans[0]}`;
- console.log("this.checkItems: ", this.checkItems);
-
- let res = await CommonUtils.doRequest2Sync({
- url: "/QC_ProcessCheckBill/set_SaveBill",
- data: {
- sMainSub: sMainSub,
- },
- method: "POST",
- });
-
- if (!res) {
- return;
- }
-
- let {
- count,
- Message,
- data
- } = res.data;
- if (count == 1) {
- uni.showModal({
- title: "鎻愮ず",
- content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
- success: (res) => {
- if (res.confirm) {
- console.log("鐢ㄦ埛鐐瑰嚮纭畾");
- uni.redirectTo({
- url: "/pages/ZLGL/mojianjianyan/form?operationType=1",
- });
- } else if (res.cancel) {
- console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
- // setTimeout(() => {
- // uni.navigateBack();
- // }, 50)
- }
- },
- });
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鏈欢妫�楠屽崟淇濆瓨閿欒: ${Message}`,
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鏈欢妫�楠屽崟淇濆瓨閿欒: ${err}`,
- });
- }
+ if (!this.checkSubmitValidate()) return;
+
+ try {
+ let checkItemsArray = [];
+ for (var key in this.checkItems) {
+ let checkItem = JSON.parse(JSON.stringify(this.checkItems[key]));
+ delete checkItem.num;
+ delete checkItem.HEnvironmentItemName;
+ delete checkItem.HQCCheckItemName;
+ checkItemsArray.push(checkItem);
+ }
+
+ let operation = this.operationType == 1 ? "Add" : "3";
+
+ let sMainSub = `${JSON.stringify(this.hform)};${JSON.stringify(
+ checkItemsArray
+ )};${operation};${getUserInfo()["Czymc"]};{}`;
+
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/QC_EnvironmentTestDotCheckBill/Save锘縌C_EnvironmentTestDotCheckBillMain",
+ data: { sMainSub: sMainSub },
+ method: "POST",
+ });
+
+ if (!res) return;
+
+ let { count, Message } = res.data;
+ if (count == 1) {
+ uni.showModal({
+ title: "鎻愮ず",
+ content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
+ success: (res) => {
+ if (res.confirm) {
+ uni.redirectTo({
+ url: "/pages/ZLGL/QcenvironmentTestDotCheckBill/QcenvironmentTestDotCheckBill?operationType=1",
+ });
+ }
+ },
+ });
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鐜妫�娴嬪崟淇濆瓨閿欒: ${Message}`,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鐜妫�娴嬪崟淇濆瓨閿欒: ${err}`,
+ });
+ }
},
+
addNew() {
- uni.redirectTo({
- url: "/pages/ZLGL/mojianjianyan/lastPieceCheckBillList?operationType=1",
- });
+
+ uni.showLoading({
+ title: '鍔犺浇涓�...',
+ mask: true
+ });
+
+ // 寤惰繜涓�鐐瑰啀璺宠浆锛岃鐢ㄦ埛鑳界湅鍒板姞杞芥彁绀�
+ setTimeout(() => {
+ uni.redirectTo({
+ url: "/pages/ZLGL/QcenvironmentTestDotCheckBill/QcenvironmentTestDotCheckBill?operationType=1",
+ complete: () => {
+ uni.hideLoading();
+ }
+ });
+ }, 300);
},
goBack() {
uni.navigateBack();
- },
- async RoadBillMain() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/QC_ProcessCheckBill/QC_ProcessCheckBill_Edit",
- data: {
- sWhere: ` and hmainid=${this.hform.HInterID}`,
- user: getUserInfo()["Czymc"],
- },
- });
-
- let {
- data,
- count,
- Message
- } = res.data;
-
- if (count == 1) {
- console.log("RoadBillMain: : ", data);
- Object.assign(this.hform, {
- HInterID: data[0].hmainid,
- HBillNo: data[0].鍗曟嵁鍙�,
- HDate: dayjs(data[0].鏃ユ湡).format("YYYY-MM-DD"),
- HSourceID: data[0].HSourceID,
- HSourceName: data[0].鐢熶骇璧勬簮鍚嶇О,
- HICMOBillNo: data[0].浠诲姟鍗曞彿,
- HICMOQty: data[0].浠诲姟鍗曟暟閲�,
- HICMOInterID: data[0].HICMOInterID,
- HICMOEntryID: data[0].HICMOEntryID || 1,
- HMaterID: data[0].HMaterID,
- HMaterName: data[0].鐗╂枡鍚嶇О,
- HMaterNumber: data[0].鐗╂枡浠ｇ爜,
- HProcID: data[0].HProcID,
- HProcName: data[0].HProcName,
- HProcExchQty: data[0].HProcExchQty || 0,
- HProcExchBillNo: data[0].HProcExchBillNo,
- HProcExchInterID: data[0].HProcExchInterID,
- HProcExchEntryID: data[0].HProcExchEntryID || 0,
- HFirstCheckEmp: data[0].HFirstCheckEmp,
- HFirstCheckEmpName: data[0].璐ㄦ鍛樺悕绉�,
- HQCSchemeID: data[0].妫�楠屾柟妗圛D,
- HQCSchemeName: data[0].妫�楠屾柟妗堝悕绉�,
- HRemark: data[0].琛ㄥご澶囨敞,
- HMaker: data[0].鍒跺崟浜�,
- HMakeDate: data[0].鍒跺崟鏃ユ湡,
- HChecker: data[0].瀹℃牳浜�,
- HCheckDate: data[0].瀹℃牳鏃ユ湡,
- HCloseMan: data[0].鍏抽棴浜�,
- HCloseDate: data[0].鍏抽棴鏃ユ湡,
- HUpDateDate: data[0].淇敼鏃ユ湡,
- HDeleteDate: data[0].浣滃簾鏃ユ湡,
- HSampleSchemeID: data[0].HSampleSchemeID,
- HSampleSchemeName: data[0].鎶芥牱鏂规鍚嶇О,
- HSampleQty: data[0].鏍锋湰閲�,
- HSampleQty2: data[0].鏍锋湰閲�,
- HSampleDamageQty: data[0].鏍锋湰鐮村潖鏁�,
- HSamplingType: data[0].鎶芥牱绫诲瀷,
- HAcceptQty: data[0].鍏佽鏁�,
- HInspectionLevel: data[0].妫�楠屾按骞�,
- HRejectQty: data[0].鎷掔粷鏁�,
- HStrictness: data[0].涓ユ牸搴�,
- HSampleUnRightQty: data[0].鏍锋湰涓嶅悎鏍兼暟 || 0,
- HSampleUnRightQty2: data[0].鏍锋湰涓嶅悎鏍兼暟,
- HAQL: data[0].AQL,
- HUnitID: data[0].HUnitID,
- HUnit: data[0].鍗曚綅,
- HInspectValB: data[0].妫�娴嬪�煎熀纭�璧勬枡,
- HInspectVal: data[0].妫�娴嬪��,
- HTargetValB: data[0].鐩爣鍊煎熀纭�璧勬枡,
- HTargetVal: data[0].鐩爣鍊�,
- HUpLimit: data[0].涓婇檺鍊�,
- HDownLimit: data[0].涓嬮檺鍊�,
- HUpOffSet: data[0].涓婂亸宸�,
- HDownOffSet: data[0].涓嬪亸宸�,
- HEntryID: data[0].hsubid,
- HQCCheckItemName: data[0].妫�楠岄」鐩悕绉�,
- HQCCheckItemID: data[0].HQCCheckItemID,
- HShiftsID: data[0].HShiftsID,
- HShiftsName: data[0].鐝鍚嶇О,
- HErrTreatment: data[0].寮傚父涓存椂澶勭悊鏂规,
- HBatchNo: data[0].鎵瑰彿,
- HCheckerResult: data[0].鍒ゅ畾缁撹 == "鍚堟牸" ? true : false,
- HTakeSampleCheckBillID: data[0].HTakeSampleCheckBillID,
- HTakeSampleCheckBillNo: data[0].HTakeSampleCheckBillNo,
- HAnalysisMethod: function() {
- if (data[0].HAnalysisMethod == 1) {
- return '瀹氭�ф楠�'
- } else if (data[0].HAnalysisMethod == 2) {
- return '瀹氶噺妫�楠�'
- } else {
- return '鍏朵粬妫�楠�'
- }
- }(),
-
-
-
- });
-
- for (let i = 0; i < data.length; i++) {
- this.addCheckItem({
- HQCCheckItemID: data[i].HQCCheckItemID,
- HQCCheckItemNumber: data[i].妫�楠岄」鐩唬鐮�,
- HQCCheckItemName: data[i].妫�楠岄」鐩悕绉�,
- HInspectInstruMentID: data[i].HInspectInstruMentID,
- HInspectInstruMentNumber: data[i].妫�楠屼华鍣ㄤ唬鐮�,
- HInspectInstruMentName: data[i].妫�楠屼华鍣ㄥ悕绉�,
- HQCStd: data[i].妫�楠屾爣鍑�,
- HUnit: data[i].鍗曚綅鍚嶇О,
- HQCNote: data[i].妫�楠岃褰�,
- HResult: data[i].缁撹 == "鍚堟牸" ? 1 : 0,
- HMax: data[i].鏈�澶у��,
- HMin: data[i].鏈�灏忓��,
- HAvg: data[i].骞冲潎鍊�,
- HRemark: data[i].琛ㄤ綋澶囨敞,
- HAnalysisMethod: data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ?
- 1 : data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ?
- 2 : 3,
- HKeyInspect: data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
- HSampleSchemeID: data[i].HSampleSchemeID,
- HUnitID: data[i].HUnitID,
- HInspectVal: data[i].妫�娴嬪��,
- HTargetVal: data[i].鐩爣鍊�,
- HUpLimit: data[i].涓婇檺鍊�,
- HDownLimit: data[i].涓嬮檺鍊�,
- HUpOffSet: data[i].涓婂亸宸�,
- HDownOffSet: data[i].涓嬪亸宸�,
- HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
- HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
- HSampleQty: data[i].鏍锋湰閲�,
- HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
- HAcceptQty: data[i].鍏佽鏁�,
- HInspectionLevel: 0,
- HRejectQty: data[i].鎷掔粷鏁�,
- HStrictness: 0,
- HSampleUnRightQty: data[i].鏍锋湰涓嶅悎鏍兼暟,
- HAQL: data[i].AQL,
- HSamplingType: 0,
- HSamplingType: data[i].鎶芥牱绫诲瀷,
- HStrictness: data[i].涓ユ牸搴�,
- HInspectResultToSee: data[i].妫�楠岀粨鏋�
- });
-
- }
-
-
- this.hasSourceBill = true
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍔犺浇鍗曟嵁澶辫触: ${Message}`,
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍔犺浇鍗曟嵁澶辫触: ${err}`,
- });
- }
},
},
async onLoad(e) {
this.operationType = e.operationType || 1;
this.hform.HInterID = e.linterid || 0;
+ this.hform.HCleanType = 'A';
+ const organization = uni.getStorageSync('Organization');
+ this.hform.Organization = organization || '';
if (this.operationType == 1) {
await this.getMaxBillNo();
- } else if (this.operationType == 2) {
-
- } else if (this.operationType == 3) {
- await this.RoadBillMain();
}
-
- await this.InitHSource();
- await this.InitHWorkShift();
+
await this.InitHEmp();
- await this.loadCache();
await this.InitDept();
+ await this.WorkCenter1();
},
};
</script>
<style lang="scss" scoped>
- input {
- width: inherit;
- font-size: 26rpx;
- }
-
- .uni-input {
- padding: 0;
- }
-
- .bill-main-tabs,
- .bill-sub-tabs {
+ input { width: inherit; font-size: 26rpx; }
+ .uni-input { padding: 0; }
+
+ .bill-main-tabs, .bill-sub-tabs {
box-sizing: border-box;
width: 730rpx;
display: flex;
@@ -1445,8 +940,7 @@
}
}
- .bill-main-content,
- .bill-sub-content {
+ .bill-main-content, .bill-sub-content {
box-sizing: border-box;
padding: 0 30rpx 0 30rpx;
display: flex;
@@ -1459,47 +953,19 @@
font-size: 26rpx;
padding: 6rpx 0;
- .left {
- width: 208rpx;
-
- text {
- color: red;
- font-weight: bold;
- }
- }
-
+ .left { width: 208rpx; }
.right {
- // width: 450rpx;
padding: 8rpx 20rpx;
font-size: 26rpx;
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;
- }
+ .uni-combox { padding: 0; height: auto; }
+ .uni-combox::v-deep input { height: inherit; font-size: 26rpx; }
}
-
- .disabled {
- border: 1px solid #e4e4e4;
- background-color: #e4e4e4;
- }
-
- .none-border {
- border: none;
- }
+ .disabled { border: 1px solid #e4e4e4; background-color: #e4e4e4; }
+ .none-border { border: none; }
}
}
@@ -1511,7 +977,7 @@
bottom: 0;
left: 0;
background-color: #fff;
- box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+ box-shadow: 0 2rpx 10rpx 2rpx rgba(0,0,0,0.4);
padding: 30rpx 40rpx 40rpx 40rpx;
display: flex;
flex-direction: row;
@@ -1524,28 +990,8 @@
line-height: 66rpx;
font-size: 28rpx;
}
-
- .btn-a {
- background-color: #3a78ff;
- color: #fff;
- }
-
- .btn-b {
- background-color: #41a863;
- color: #fff;
- }
-
- .btn-c {
- background-color: #acacac;
- color: #fff;
- // position: absolute;
- // right: 120rpx;
- }
-
- .btn-d {
- background-color: #ff8901;
- color: #fff;
- }
+ .btn-a { background-color: #3a78ff; color: #fff; }
+ .btn-c { background-color: #acacac; color: #fff; }
}
.buttons {
@@ -1554,46 +1000,20 @@
display: flex;
justify-content: center;
padding: 10rpx 0;
-
- button {
- border-radius: 50rpx;
- width: 180rpx;
- height: 66rpx;
- line-height: 66rpx;
- font-size: 26rpx;
- }
-
- .btn-a {
- background-color: #acacac;
- color: #fff;
- }
-
- .btn-b {
- background-color: #41a863;
- color: #fff;
- }
-
- .btn-c {
- background-color: #3a78ff;
- color: #fff;
- }
}
- /* 缁� select 瀹瑰櫒娣诲姞杈规 */
.select-border {
border: 1px solid #acacac !important;
border-radius: 22rpx !important;
padding: 8rpx 20rpx !important;
}
- /* 绉婚櫎 uni-data-select 鑷甫杈规 */
.no-border-select {
::v-deep .uni-select {
border: none !important;
border-radius: 0 !important;
}
}
-
.list {
width: 100%;
@@ -1607,21 +1027,15 @@
line-height: 120%;
gap: 10rpx 0;
- input {
- font-size: 26rpx;
- }
+ input { font-size: 26rpx; }
.detail {
- // width: 50%;
box-sizing: border-box;
font-size: 26rpx;
color: #555;
padding-right: 20rpx;
- text {
- color: #999;
- font-size: 26rpx;
- }
+ text { color: #999; font-size: 26rpx; }
}
.editable {
@@ -1630,15 +1044,7 @@
flex-direction: row;
align-items: center;
- text {
- flex-shrink: 0;
- }
-
- .sampleDestory {
- border: 1px solid #acacac;
- border-radius: 10%;
- padding: 0 12rpx;
- }
+ text { flex-shrink: 0; }
.editable-input {
border: 1px solid #acacac;
border-radius: 5rpx;
@@ -1657,10 +1063,7 @@
justify-content: center;
align-items: center;
flex-shrink: 0;
-
- .uni-icons {
- color: #fff !important;
- }
+ .uni-icons { color: #fff !important; }
}
.icon-wrapper-big {
@@ -1673,10 +1076,7 @@
align-items: center;
flex-shrink: 0;
margin-left: 20rpx;
-
- .uni-icons {
- color: #fff !important;
- }
+ .uni-icons { color: #fff !important; }
}
.more {
@@ -1692,15 +1092,6 @@
}
}
- .pass-background {
- background-color: #cee3f2;
- border: none;
- }
-
- .unpass-background {
- background-color: #f0d6e3;
- border: none;
- }
.enable-icon-button {
background-color: #3a78ff;
padding: 6rpx;
@@ -1716,6 +1107,50 @@
pointer-events: none;
}
+ .card-detail {
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ gap: 16rpx;
+ }
+ .detail-row {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 20rpx;
+ }
+ .values-row {
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ background-color: #f9f9f9;
+ padding: 16rpx 20rpx;
+ border-radius: 12rpx;
+ margin-top: 8rpx;
+ }
+
+ .value-item {
+ font-size: 26rpx;
+ color: #555;
+ display: flex;
+ align-items: center;
+
+ text { color: #999; margin-right: 8rpx; }
+ .value { color: #3a78ff; font-weight: bold; }
+ }
+
+ .actual-input {
+ border: 1px solid #acacac;
+ border-radius: 10rpx;
+ padding: 6rpx 12rpx;
+ font-size: 26rpx;
+ width: 140rpx;
+ background-color: #fff;
+ margin-left: 8rpx;
+ z-index: 10;
+ position: relative;
+ }
</style>
\ No newline at end of file
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index f985e5c..7f0232a 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -524,7 +524,35 @@
url: '/pages/EmployeeRecords/EmployeeRecordsBillList',
id: 65,
hidden: false,
- }
+ },
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "閲囪喘璁㈠崟鍒楄〃",
+ "url": "/pages/caigoudingdan/caigoudingdanList",
+ "id": 66,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "閿�鍞鍗曞垪琛�",
+ "url": "/pages/xiaoshoudingdan/xiaoshoudingdanBillList",
+ "id": 67,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "鐗规壒鍗曞垪琛�",
+ "url": "/pages/tepidan/TePiDanList",
+ "id": 68,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "瀹㈣瘔澶勭悊鍗曞垪琛�",
+ "url": "/pages/CustomerComplaintsBill/CustomerComplaintsBillList",
+ "id": 69,
+ "hidden": false
+ },
]
}
},
diff --git a/pages/index/tab4.vue b/pages/index/tab4.vue
index 7c3c4d4..f77347d 100644
--- a/pages/index/tab4.vue
+++ b/pages/index/tab4.vue
@@ -183,34 +183,7 @@
"id": 19,
"hidden": false
},
- {
- "img": "../../static/icon/icon15.png",
- "text": "閲囪喘璁㈠崟鍒楄〃",
- "url": "/pages/caigoudingdan/caigoudingdanList",
- "id": 20,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon15.png",
- "text": "閿�鍞鍗曞垪琛�",
- "url": "/pages/xiaoshoudingdan/xiaoshoudingdanBillList",
- "id": 21,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon15.png",
- "text": "鐗规壒鍗曞垪琛�",
- "url": "/pages/tepidan/TePiDanList",
- "id": 22,
- "hidden": false
- },
- {
- "img": "../../static/icon/icon15.png",
- "text": "瀹㈣瘔澶勭悊鍗曞垪琛�",
- "url": "/pages/CustomerComplaintsBill/CustomerComplaintsBillList",
- "id": 23,
- "hidden": false
- },
+
{
"img": "../../static/icon/icon8.png",
--
Gitblit v1.9.1