From 6b01a589c507c8af0857d5f9eadb2422bea99187 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 14 一月 2026 13:38:07 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue | 30
pages/baogong/OA_ErrMsgBackBill.vue | 1159 +++++++++++++
pages/ZLGL/QualityReportStep/QualityReportStepBill.vue | 257 --
pages/index/tab2.vue | 27
pages/index/tab4.vue | 2
.hbuilderx/launch.json | 4
pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue | 14
pages/baogong/AddLineBind.vue | 435 +++++
pages/index/tab1.vue | 103 -
/dev/null | 724 --------
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue | 18
pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport.vue | 627 +++++++
pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue | 3
pages/baogong/IpadIndex.vue | 538 ++---
pages/ZLGL/mojianjianyan/ProcessCheckBillList.vue | 2
manifest.json | 17
pages/index/tab3.vue | 14
pages/jishikucunchaxun/table.vue | 3
pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue | 630 +++++++
pages/index/login.vue | 7
pages/baogong/DayPlanBillList.vue | 380 ++-
21 files changed, 3,492 insertions(+), 1,502 deletions(-)
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index a7d9080..4dd14cd 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -21,11 +21,11 @@
"type" : "uni-app:app-ios"
},
{
- "customPlaygroundType" : "local",
+ "customPlaygroundType" : "device",
"localRepoPath" : "D:/WorkBench/ZY_APP_Dev/STUWMS/unpackage/debug",
"openVueDevtools" : true,
"packageName" : "com.shebeiguanli.www",
- "playground" : "custom",
+ "playground" : "standard",
"type" : "uni-app:app-android"
}
]
diff --git a/manifest.json b/manifest.json
index 10b5c50..620f08f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -16,6 +16,10 @@
"autoclose" : true,
"delay" : 0
},
+ "screenOrientation": [ //鍙�夛紝瀛楃涓叉暟缁勭被鍨嬶紝搴旂敤鏀寔鐨勬í绔栧睆
+ "portrait-primary", //鍙�夛紝瀛楃涓茬被鍨嬶紝鏀寔绔栧睆
+ "portrait-secondary" //鍙�夛紝瀛楃涓茬被鍨嬶紝鏀寔鍙嶅悜绔栧睆
+ ],
/* 妯″潡閰嶇疆 */
"modules" : {
"Camera" : {},
@@ -153,18 +157,7 @@
"enable" : false
},
"vueVersion" : "2",
- "orientation" : [
- //绔栧睆姝ｆ柟鍚�
- "portrait-primary",
- //绔栧睆鍙嶆柟鍚�
- "portrait-secondary",
- //妯睆姝ｆ柟鍚�
- "landscape-primary",
- //妯睆鍙嶆柟鍚�
- "landscape-secondary",
- //鑷劧鏂瑰悜
- "default"
- ],
+
"locale" : "zh-Hans",
"fallbackLocale" : "zh-Hans"
}
diff --git a/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue b/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue
new file mode 100644
index 0000000..4da4cad
--- /dev/null
+++ b/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue
@@ -0,0 +1,630 @@
+<template>
+ <view>
+ <view class="page-header">
+ <view class="search-item">
+ <view class="left">鏃ユ湡闂撮殧</view>
+ <view class="right">
+ <picker mode="selector" :value="curDateGap" :range="dateRangePicker"
+ @change="onDateRangePickerChangeHandler">
+ <input disabled v-model="curDateGap" placeholder="璇烽�夋嫨鏃ユ湡闂撮殧" />
+ <view class="picker-overlay"></view>
+ </picker>
+
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">寮�濮嬫棩鏈�</view>
+ <view class="right">
+ <uni-datetime-picker :clear-icon="false" type="date" v-model="startDate"
+ :disabled="!enableCustomDateRange">
+ <view class="datetime-picker-inner"
+ :class="enableCustomDateRange?'font__enable':'font__disable'">
+ <text>{{ startDate }}</text>
+ </view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">缁撴潫鏃ユ湡</view>
+ <view class="right">
+ <uni-datetime-picker :clear-icon="false" type="date" v-model="endDate"
+ :disabled="!enableCustomDateRange">
+ <view class="datetime-picker-inner"
+ :class="enableCustomDateRange?'font__enable':'font__disable'">{{ endDate }}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+
+ <view class="button-groups">
+ <button type="default" size="mini" class="btn-c" @tap.stop="onSearchClickHandler">鏌ヨ</button>
+ <button type="default" size="mini" class="btn-a" @tap.stop="onResetClickHandler">閲嶇疆</button>
+ </view>
+ </view>
+
+ <!-- 椤电鍖哄煙 -->
+ <view class="tab-container">
+ <view class="tab-list">
+ <view v-for="(tab, index) in tabs" :key="index" :class="['tab-item', { 'active': activeTab === index }]"
+ @tap="switchTab(index)">
+ <text>{{ tab.label }}</text>
+ <text v-if="tab.count > 0" class="tab-count">{{ tab.count }}</text>
+ </view>
+ </view>
+ </view>
+
+ <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+ <!-- 椤电鍐呭鍖哄煙 -->
+ <scroll-view v-for="(tab, tabIndex) in tabs" :key="tabIndex" v-show="activeTab === tabIndex" id="pageContent"
+ scroll-y class="page-content" :style="{height: pageContentHeight + 'px'}">
+ <view class="list" v-for="(item,index) in tab.listData" :key="index">
+ <uni-card :title="item.璁惧浠ｇ爜" :extra="item.璁惧淇濆吇璁″垝鍗曞彿" style="margin: 10px;"
+ @tap="showDetail = showDetail==item.hmainid?-1:item.hmainid">
+ <view class="card-detail">
+ <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 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 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.璁″垝寮�濮嬫椂闂寸偣.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.璁″垝缁撴潫鏃堕棿鐐�">
+ <text>璁″垝缁撴潫鏃堕棿鐐癸細</text>{{item.璁″垝缁撴潫鏃堕棿鐐�.substr(0,10)}}
+ </view>
+ </view>
+ <view class="card-detail" v-if="showDetail == item.hmainid">
+ <view class="detail" v-if="item.鍒跺崟浜�">
+ <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ </view>
+ <view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+ <text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.瀹℃牳浜�">
+ <text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
+ </view>
+ <view class="detail" v-if="item.瀹℃牳鏃ユ湡">
+ <text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.淇敼浜�">
+ <text>淇敼浜猴細</text>{{item.淇敼浜簘}
+ </view>
+ <view class="detail" v-if="item.淇敼鏃ユ湡">
+ <text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.鍏抽棴浜�">
+ <text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
+ </view>
+ <view class="detail" v-if="item.鍏抽棴鏃ユ湡">
+ <text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.浣滃簾浜�">
+ <text>浣滃簾浜猴細</text>{{item.浣滃簾浜簘}
+ </view>
+ <view class="detail" v-if="item.浣滃簾鏃ユ湡">
+ <text>浣滃簾鏃ユ湡锛�</text>{{item.浣滃簾鏃ユ湡.substr(0,10)}}
+ </view>
+ </view>
+
+ <view class="more" v-if="showDetail == item.hmainid && operations != item.hmainid">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+ </view>
+ <view class="part" @tap.stop="operations = operations==item.hmainid?-1:item.hmainid">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="more" v-if="showDetail != item.hmainid && operations != item.hmainid">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+ </view>
+ <view class="part" @tap.stop="operations = operations==item.hmainid?-1:item.hmainid">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+
+ <view class="op" v-if="operations == item.hmainid">
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="tabs[activeTab].listData.length == 0">鏆傛棤鏁版嵁</view>
+ </scroll-view>
+
+ <!-- 鍒嗛〉鍣� -->
+ <view class="page-footer">
+ <uni-pagination id="pagination" title="鏍囬鏂囧瓧" v-model="tabs[activeTab].pageMeta.curPage"
+ :pageSize="tabs[activeTab].pageMeta.size" :total="tabs[activeTab].pageMeta.total"
+ @change="onPageChangeHandler"></uni-pagination>
+ </view>
+ </view>
+</template>
+
+<script>
+ import dayjs from 'dayjs'
+ import {
+ CommonUtils
+ } from '@/utils/common.js'
+ import {
+ getUserInfo
+ } from '../../../utils/auth'
+ export default {
+ data() {
+ return {
+ // 璁＄畻鍗＄墖鍒楄〃楂樺害
+ pagination_top: 0,
+ pageContent_top: 0,
+
+ // 褰撳墠婵�娲荤殑椤电
+ activeTab: 0,
+
+ tabs: [{
+ label: '浠婃棩寰呬繚鍏�',
+ type: 0,
+ count: 0,
+ listData: [], // 娣诲姞杩欎釜
+ pageMeta: { // 娣诲姞杩欎釜
+ curPage: 1,
+ size: 50,
+ total: 0,
+ }
+ },
+ {
+ label: '浠婃棩宸蹭繚鍏�',
+ type: 1,
+ count: 0,
+ listData: [], // 娣诲姞杩欎釜
+ pageMeta: { // 娣诲姞杩欎釜
+ curPage: 1,
+ size: 50,
+ total: 0,
+ }
+ },
+ {
+ label: '浠婃棩鍏ㄩ儴浠诲姟',
+ type: 2,
+ count: 0,
+ listData: [], // 娣诲姞杩欎釜
+ pageMeta: { // 娣诲姞杩欎釜
+ curPage: 1,
+ size: 50,
+ total: 0,
+ }
+ }
+ ],
+
+ // 婊氬姩鎺у埗
+ scrollTop: 0,
+ old: {
+ scrollTop: 0
+ },
+
+ dateRangePicker: ["浠绘剰闂撮殧", "浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"],
+ curDateGap: "浠婂ぉ",
+ enableCustomDateRange: false,
+ startDate: dayjs(new Date()).format('YYYY-MM-DD'),
+ endDate: dayjs(new Date()).format('YYYY-MM-DD'),
+ HBillNo: '',
+
+ showDetail: -1,
+ operations: -1,
+ }
+ },
+ computed: {
+ pageContentHeight: {
+ get() {
+ return (this.pagination_top - this.pageContent_top)
+ }
+ },
+ },
+ onLoad() {
+ this.onSearchClickHandler()
+ },
+ onPullDownRefresh() {
+ this.onSearchClickHandler()
+ },
+ async onReady() {
+ // #ifndef MP-WEIXIN
+ let query = uni.createSelectorQuery().in(this)
+ query.select("#pagination")
+ .boundingClientRect((data) => {
+ if (data) {
+ this.pagination_top = data.top
+ } else {
+ console.log("鏈壘鍒�#pagination鑺傜偣");
+ }
+ })
+ .exec();
+ query.select("#pageContent")
+ .boundingClientRect((data) => {
+ if (data) {
+ this.pageContent_top = data.top
+ } else {
+ console.log("鏈壘鍒�#pageContent鑺傜偣");
+ }
+ })
+ .exec();
+ // #endif
+ },
+ methods: {
+ goTop: function(e) {
+ // 瑙ｅ喅view灞備笉鍚屾鐨勯棶棰�
+ this.scrollTop = this.old.scrollTop
+ this.$nextTick(function() {
+ this.scrollTop = 0
+ });
+ },
+
+ // 鍒囨崲椤电
+ switchTab(index) {
+ this.activeTab = index
+ this.showDetail = -1
+ this.operations = -1
+ },
+
+ onDateRangePickerChangeHandler({
+ detail
+ }) {
+ this.enableCustomDateRange = false
+ this.curDateGap = this.dateRangePicker[detail.value]
+ let date = new Date()
+ switch (this.curDateGap) {
+ case "浠婂ぉ":
+ this.startDate = dayjs(date).format("YYYY-MM-DD")
+ break;
+ case "杩戜竴澶�":
+ this.startDate = dayjs(date).subtract(1, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜袱澶�":
+ this.startDate = dayjs(date).subtract(2, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜笁澶�":
+ this.startDate = dayjs(date).subtract(3, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戝洓澶�":
+ this.startDate = dayjs(date).subtract(4, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜簲澶�":
+ this.startDate = dayjs(date).subtract(5, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戝叚澶�":
+ this.startDate = dayjs(date).subtract(6, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜竷澶�":
+ this.startDate = dayjs(date).subtract(7, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩�30澶�":
+ this.startDate = dayjs(date).subtract(30, 'day').format("YYYY-MM-DD")
+ break;
+ }
+ if (this.curDateGap == '浠绘剰闂撮殧') {
+ this.enableCustomDateRange = true
+ }
+ },
+
+ onSearchClickHandler() {
+ let sWhere = ""
+ // 鑾峰彇褰撳墠婵�娲荤殑椤电
+ const currentTab = this.tabs[this.activeTab]
+ sWhere = {
+ HBeginDate: this.startDate,
+ HEndDate: this.endDate
+ }
+ this.get_DisplayPage(JSON.stringify(sWhere), currentTab.type)
+ },
+
+ clear() {
+ this.curDateGap = "浠婂ぉ"
+ this.enableCustomDateRange = false
+ this.startDate = dayjs(new Date()).format('YYYY-MM-DD')
+ this.endDate = dayjs(new Date()).format('YYYY-MM-DD')
+ this.HBillNo = ''
+ },
+
+ async onResetClickHandler() {
+ this.clear()
+ await this.$nextTick()
+ this.onSearchClickHandler()
+ },
+
+ get_DisplayPage(sWhere, tabType) {
+ CommonUtils.doRequest2({
+ url: '/Sb_EquipMaintainTaskReport/MaintainList_APP',
+ data: {
+ "sWhere": sWhere,
+ "user": getUserInfo()["Czymc"],
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ console.log('res.data: ', res.data)
+
+ if (data && data.h_p_Sb_EquipMaintainTaskReport_APP) {
+ // 鏇存柊寰呯鍒伴〉绛�
+ this.tabs[0].listData = data.h_p_Sb_EquipMaintainTaskReport_APP
+ this.tabs[0].pageMeta.total = data.h_p_Sb_EquipMaintainTaskReport_APP.length
+ this.tabs[0].count = data.h_p_Sb_EquipMaintainTaskReport_APP.length
+ }
+
+ if (data && data.h_p_Sb_EquipMaintainTaskReport_APP1) {
+ // 鏇存柊寰呭鐞嗛〉绛�
+ this.tabs[1].listData = data.h_p_Sb_EquipMaintainTaskReport_APP1
+ this.tabs[1].pageMeta.total = data.h_p_Sb_EquipMaintainTaskReport_APP1.length
+ this.tabs[1].count = data.h_p_Sb_EquipMaintainTaskReport_APP1.length
+ }
+
+ if (data && data.h_p_Sb_EquipMaintainTaskReport_APP2) {
+ // 鏇存柊寰呴獙鏀堕〉绛�
+ this.tabs[2].listData = data.h_p_Sb_EquipMaintainTaskReport_APP2
+ this.tabs[2].pageMeta.total = data.h_p_Sb_EquipMaintainTaskReport_APP2.length
+ this.tabs[2].count = data.h_p_Sb_EquipMaintainTaskReport_APP2.length
+ }
+
+
+ uni.stopPullDownRefresh()
+ }
+ })
+ },
+
+ onPageChangeHandler() {
+ this.onSearchClickHandler()
+ this.goTop()
+ },
+ },
+ }
+</script>
+
+<style lang="scss">
+ .page-header {
+ display: flex;
+ box-sizing: border-box;
+ padding: 20rpx;
+ flex-direction: column;
+ gap: 10rpx;
+ font-size: 32rpx;
+
+ .search-item {
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: center;
+ align-items: center;
+
+ .left {
+ width: 4em;
+ }
+
+ .right {
+ flex: 1;
+ position: relative;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ display: flex;
+ padding: 4rpx 10rpx;
+
+ picker {
+ width: 100%;
+ }
+ }
+ }
+
+ input {
+ width: inherit;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+
+ .datetime-picker-inner {
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ display: flex;
+ align-items: center;
+ }
+
+ .font__enable {
+ color: #000;
+ }
+
+ .font__disable {
+ color: #cccccc;
+ }
+ }
+
+ .button-groups {
+ box-sizing: border-box;
+ padding: 10rpx 0 0 0;
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: space-between;
+
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+
+ .btn-a {
+ background-color: #acacac;
+ color: #fff;
+ }
+
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+ }
+
+ /* 椤电鏍峰紡 */
+ .tab-container {
+ background-color: #fff;
+ }
+
+ .tab-list {
+ display: flex;
+ flex-direction: row;
+ border-bottom: 1px solid #e5e5e5;
+ }
+
+ .tab-item {
+ flex: 1;
+ padding: 20rpx 0;
+ text-align: center;
+ font-size: 28rpx;
+ color: #666;
+ position: relative;
+
+ &.active {
+ color: #3a78ff;
+ font-weight: bold;
+
+ &::after {
+ content: '';
+ position: absolute;
+ bottom: 0;
+ left: 50%;
+ transform: translateX(-50%);
+ width: 80rpx;
+ height: 4rpx;
+ background-color: #3a78ff;
+ }
+ }
+
+ .tab-count {
+ display: inline-block;
+ margin-left: 10rpx;
+ padding: 0 12rpx;
+ background-color: #ff6b6b;
+ color: #fff;
+ border-radius: 20rpx;
+ font-size: 20rpx;
+ min-width: 30rpx;
+ text-align: center;
+ }
+ }
+
+ .page-content {
+ box-sizing: border-box;
+ padding: 10rpx 0;
+
+ .card-detail {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ line-height: 120%;
+
+ .detail {
+ font-size: 26rpx;
+ margin-bottom: 12rpx;
+ color: #555;
+ margin-right: 20rpx;
+
+ text {
+ color: #999;
+ font-size: 26rpx;
+ }
+ }
+ }
+
+ .more {
+ color: #888;
+ font-size: 24rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ text-align: center;
+ }
+ }
+
+ .op {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 20rpx;
+
+ button {
+ padding: 0;
+ width: 150rpx;
+ font-size: 25rpx;
+
+ &:disabled {
+ opacity: 0.5;
+ }
+ }
+
+ .op1 {
+ border: 1px solid #41a863;
+ color: #41a863;
+ }
+
+ .op2 {
+ border: 1px solid #d98d00;
+ color: #d98d00;
+ }
+
+ .op3 {
+ border: 1px solid #3a78ff;
+ color: #3a78ff;
+ }
+
+ .op4 {
+ border: 1px solid #da0000;
+ color: #da0000;
+ }
+
+ .op5 {
+ border: 1px solid #888;
+ color: #888;
+ }
+ }
+ }
+
+ .over {
+ text-align: center;
+ padding: 40rpx;
+ color: #999;
+ font-size: 28rpx;
+ }
+
+ .page-footer {
+ position: fixed;
+ bottom: 0;
+ width: 100%;
+ box-sizing: border-box;
+ padding: 32rpx 40rpx;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport.vue b/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport.vue
new file mode 100644
index 0000000..87bc93b
--- /dev/null
+++ b/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport.vue
@@ -0,0 +1,627 @@
+<template>
+ <view>
+ <view class="page-header">
+ <view class="search-item">
+ <view class="left">鏃ユ湡闂撮殧</view>
+ <view class="right">
+ <picker mode="selector" :value="curDateGap" :range="dateRangePicker"
+ @change="onDateRangePickerChangeHandler">
+ <input disabled v-model="curDateGap" placeholder="璇烽�夋嫨鏃ユ湡闂撮殧" />
+ <view class="picker-overlay"></view>
+ </picker>
+
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">寮�濮嬫棩鏈�</view>
+ <view class="right">
+ <uni-datetime-picker :clear-icon="false" type="date" v-model="startDate"
+ :disabled="!enableCustomDateRange">
+ <view class="datetime-picker-inner"
+ :class="enableCustomDateRange?'font__enable':'font__disable'">
+ <text>{{ startDate }}</text>
+ </view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">缁撴潫鏃ユ湡</view>
+ <view class="right">
+ <uni-datetime-picker :clear-icon="false" type="date" v-model="endDate"
+ :disabled="!enableCustomDateRange">
+ <view class="datetime-picker-inner"
+ :class="enableCustomDateRange?'font__enable':'font__disable'">{{ endDate }}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+
+ <view class="button-groups">
+ <button type="default" size="mini" class="btn-c" @tap.stop="onSearchClickHandler">鏌ヨ</button>
+ <button type="default" size="mini" class="btn-a" @tap.stop="onResetClickHandler">閲嶇疆</button>
+ </view>
+ </view>
+
+ <!-- 椤电鍖哄煙 -->
+ <view class="tab-container">
+ <view class="tab-list">
+ <view v-for="(tab, index) in tabs" :key="index" :class="['tab-item', { 'active': activeTab === index }]"
+ @tap="switchTab(index)">
+ <text>{{ tab.label }}</text>
+ <text v-if="tab.count > 0" class="tab-count">{{ tab.count }}</text>
+ </view>
+ </view>
+ </view>
+
+ <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+ <!-- 椤电鍐呭鍖哄煙 -->
+ <scroll-view v-for="(tab, tabIndex) in tabs" :key="tabIndex" v-show="activeTab === tabIndex" id="pageContent"
+ scroll-y class="page-content" :style="{height: pageContentHeight + 'px'}">
+ <view class="list" v-for="(item,index) in tab.listData" :key="index">
+ <uni-card :title="item.鍣ㄥ叿鍙�" :extra="item.鍣ㄥ叿淇濆吇璁″垝鍗曞彿" style="margin: 10px;"
+ @tap="showDetail = showDetail==item.hmainid?-1:item.hmainid">
+ <view class="card-detail">
+ <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 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 class="detail" v-if="item.鏄惁淇濆吇">
+ <text>鏄惁淇濆吇锛�</text>{{item.鏄惁淇濆吇}}
+ </view>
+ <view class="detail" v-if="item.璁″垝寮�濮嬫椂闂寸偣">
+ <text>璁″垝寮�濮嬫椂闂寸偣锛�</text>{{item.璁″垝寮�濮嬫椂闂寸偣.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.璁″垝缁撴潫鏃堕棿鐐�">
+ <text>璁″垝缁撴潫鏃堕棿鐐癸細</text>{{item.璁″垝缁撴潫鏃堕棿鐐�.substr(0,10)}}
+ </view>
+ </view>
+ <view class="card-detail" v-if="showDetail == item.hmainid">
+ <view class="detail" v-if="item.鍒跺崟浜�">
+ <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ </view>
+ <view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+ <text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.瀹℃牳浜�">
+ <text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
+ </view>
+ <view class="detail" v-if="item.瀹℃牳鏃ユ湡">
+ <text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.淇敼浜�">
+ <text>淇敼浜猴細</text>{{item.淇敼浜簘}
+ </view>
+ <view class="detail" v-if="item.淇敼鏃ユ湡">
+ <text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.鍏抽棴浜�">
+ <text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
+ </view>
+ <view class="detail" v-if="item.鍏抽棴鏃ユ湡">
+ <text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.浣滃簾浜�">
+ <text>浣滃簾浜猴細</text>{{item.浣滃簾浜簘}
+ </view>
+ <view class="detail" v-if="item.浣滃簾鏃ユ湡">
+ <text>浣滃簾鏃ユ湡锛�</text>{{item.浣滃簾鏃ユ湡.substr(0,10)}}
+ </view>
+ </view>
+
+ <view class="more" v-if="showDetail == item.hmainid && operations != item.hmainid">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+ </view>
+ <view class="part" @tap.stop="operations = operations==item.hmainid?-1:item.hmainid">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="more" v-if="showDetail != item.hmainid && operations != item.hmainid">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+ </view>
+ <view class="part" @tap.stop="operations = operations==item.hmainid?-1:item.hmainid">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+
+ <view class="op" v-if="operations == item.hmainid">
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="tabs[activeTab].listData.length == 0">鏆傛棤鏁版嵁</view>
+ </scroll-view>
+
+ <!-- 鍒嗛〉鍣� -->
+ <view class="page-footer">
+ <uni-pagination id="pagination" title="鏍囬鏂囧瓧" v-model="tabs[activeTab].pageMeta.curPage"
+ :pageSize="tabs[activeTab].pageMeta.size" :total="tabs[activeTab].pageMeta.total"
+ @change="onPageChangeHandler"></uni-pagination>
+ </view>
+ </view>
+</template>
+
+<script>
+ import dayjs from 'dayjs'
+ import {
+ CommonUtils
+ } from '@/utils/common.js'
+ import {
+ getUserInfo
+ } from '../../../utils/auth'
+ export default {
+ data() {
+ return {
+ // 璁＄畻鍗＄墖鍒楄〃楂樺害
+ pagination_top: 0,
+ pageContent_top: 0,
+
+ // 褰撳墠婵�娲荤殑椤电
+ activeTab: 0,
+
+ tabs: [{
+ label: '浠婃棩寰呬繚鍏�',
+ type: 0,
+ count: 0,
+ listData: [], // 娣诲姞杩欎釜
+ pageMeta: { // 娣诲姞杩欎釜
+ curPage: 1,
+ size: 50,
+ total: 0,
+ }
+ },
+ {
+ label: '浠婃棩宸蹭繚鍏�',
+ type: 1,
+ count: 0,
+ listData: [], // 娣诲姞杩欎釜
+ pageMeta: { // 娣诲姞杩欎釜
+ curPage: 1,
+ size: 50,
+ total: 0,
+ }
+ },
+ {
+ label: '浠婃棩鍏ㄩ儴浠诲姟',
+ type: 2,
+ count: 0,
+ listData: [], // 娣诲姞杩欎釜
+ pageMeta: { // 娣诲姞杩欎釜
+ curPage: 1,
+ size: 50,
+ total: 0,
+ }
+ }
+ ],
+
+ // 婊氬姩鎺у埗
+ scrollTop: 0,
+ old: {
+ scrollTop: 0
+ },
+
+ dateRangePicker: ["浠绘剰闂撮殧", "浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"],
+ curDateGap: "浠婂ぉ",
+ enableCustomDateRange: false,
+ startDate: dayjs(new Date()).format('YYYY-MM-DD'),
+ endDate: dayjs(new Date()).format('YYYY-MM-DD'),
+ HBillNo: '',
+
+ showDetail: -1,
+ operations: -1,
+ }
+ },
+ computed: {
+ pageContentHeight: {
+ get() {
+ return (this.pagination_top - this.pageContent_top)
+ }
+ },
+ },
+ onLoad() {
+ this.onSearchClickHandler()
+ },
+ onPullDownRefresh() {
+ this.onSearchClickHandler()
+ },
+ async onReady() {
+ // #ifndef MP-WEIXIN
+ let query = uni.createSelectorQuery().in(this)
+ query.select("#pagination")
+ .boundingClientRect((data) => {
+ if (data) {
+ this.pagination_top = data.top
+ } else {
+ console.log("鏈壘鍒�#pagination鑺傜偣");
+ }
+ })
+ .exec();
+ query.select("#pageContent")
+ .boundingClientRect((data) => {
+ if (data) {
+ this.pageContent_top = data.top
+ } else {
+ console.log("鏈壘鍒�#pageContent鑺傜偣");
+ }
+ })
+ .exec();
+ // #endif
+ },
+ methods: {
+ goTop: function(e) {
+ // 瑙ｅ喅view灞備笉鍚屾鐨勯棶棰�
+ this.scrollTop = this.old.scrollTop
+ this.$nextTick(function() {
+ this.scrollTop = 0
+ });
+ },
+
+ // 鍒囨崲椤电
+ switchTab(index) {
+ this.activeTab = index
+ this.showDetail = -1
+ this.operations = -1
+ },
+
+ onDateRangePickerChangeHandler({
+ detail
+ }) {
+ this.enableCustomDateRange = false
+ this.curDateGap = this.dateRangePicker[detail.value]
+ let date = new Date()
+ switch (this.curDateGap) {
+ case "浠婂ぉ":
+ this.startDate = dayjs(date).format("YYYY-MM-DD")
+ break;
+ case "杩戜竴澶�":
+ this.startDate = dayjs(date).subtract(1, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜袱澶�":
+ this.startDate = dayjs(date).subtract(2, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜笁澶�":
+ this.startDate = dayjs(date).subtract(3, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戝洓澶�":
+ this.startDate = dayjs(date).subtract(4, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜簲澶�":
+ this.startDate = dayjs(date).subtract(5, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戝叚澶�":
+ this.startDate = dayjs(date).subtract(6, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜竷澶�":
+ this.startDate = dayjs(date).subtract(7, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩�30澶�":
+ this.startDate = dayjs(date).subtract(30, 'day').format("YYYY-MM-DD")
+ break;
+ }
+ if (this.curDateGap == '浠绘剰闂撮殧') {
+ this.enableCustomDateRange = true
+ }
+ },
+
+ onSearchClickHandler() {
+ let sWhere = ""
+ // 鑾峰彇褰撳墠婵�娲荤殑椤电
+ const currentTab = this.tabs[this.activeTab]
+ sWhere = {
+ HBeginDate: this.startDate,
+ HEndDate: this.endDate
+ }
+ this.get_DisplayPage(JSON.stringify(sWhere), currentTab.type)
+ },
+
+ clear() {
+ this.curDateGap = "浠婂ぉ"
+ this.enableCustomDateRange = false
+ this.startDate = dayjs(new Date()).format('YYYY-MM-DD')
+ this.endDate = dayjs(new Date()).format('YYYY-MM-DD')
+ this.HBillNo = ''
+ },
+
+ async onResetClickHandler() {
+ this.clear()
+ await this.$nextTick()
+ this.onSearchClickHandler()
+ },
+
+ get_DisplayPage(sWhere, tabType) {
+ CommonUtils.doRequest2({
+ url: '/Sb_EquipMaintainTaskReport/MaintainList_APP',
+ data: {
+ "sWhere": sWhere,
+ "user": getUserInfo()["Czymc"],
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ console.log('res.data: ', res.data)
+
+ if (data && data.h_p_Sb_EquipMaintainTaskReport_APP) {
+ // 鏇存柊寰呯鍒伴〉绛�
+ this.tabs[0].listData = data.h_p_Sb_EquipMaintainTaskReport_APP
+ this.tabs[0].pageMeta.total = data.h_p_Sb_EquipMaintainTaskReport_APP.length
+ this.tabs[0].count = data.h_p_Sb_EquipMaintainTaskReport_APP.length
+ }
+
+ if (data && data.h_p_Sb_EquipMaintainTaskReport_APP1) {
+ // 鏇存柊寰呭鐞嗛〉绛�
+ this.tabs[1].listData = data.h_p_Sb_EquipMaintainTaskReport_APP1
+ this.tabs[1].pageMeta.total = data.h_p_Sb_EquipMaintainTaskReport_APP1.length
+ this.tabs[1].count = data.h_p_Sb_EquipMaintainTaskReport_APP1.length
+ }
+
+ if (data && data.h_p_Sb_EquipMaintainTaskReport_APP2) {
+ // 鏇存柊寰呴獙鏀堕〉绛�
+ this.tabs[2].listData = data.h_p_Sb_EquipMaintainTaskReport_APP2
+ this.tabs[2].pageMeta.total = data.h_p_Sb_EquipMaintainTaskReport_APP2.length
+ this.tabs[2].count = data.h_p_Sb_EquipMaintainTaskReport_APP2.length
+ }
+
+
+ uni.stopPullDownRefresh()
+ }
+ })
+ },
+
+ onPageChangeHandler() {
+ this.onSearchClickHandler()
+ this.goTop()
+ },
+ },
+ }
+</script>
+
+<style lang="scss">
+ .page-header {
+ display: flex;
+ box-sizing: border-box;
+ padding: 20rpx;
+ flex-direction: column;
+ gap: 10rpx;
+ font-size: 32rpx;
+
+ .search-item {
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: center;
+ align-items: center;
+
+ .left {
+ width: 4em;
+ }
+
+ .right {
+ flex: 1;
+ position: relative;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ display: flex;
+ padding: 4rpx 10rpx;
+
+ picker {
+ width: 100%;
+ }
+ }
+ }
+
+ input {
+ width: inherit;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+
+ .datetime-picker-inner {
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ display: flex;
+ align-items: center;
+ }
+
+ .font__enable {
+ color: #000;
+ }
+
+ .font__disable {
+ color: #cccccc;
+ }
+ }
+
+ .button-groups {
+ box-sizing: border-box;
+ padding: 10rpx 0 0 0;
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: space-between;
+
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+
+ .btn-a {
+ background-color: #acacac;
+ color: #fff;
+ }
+
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+ }
+
+ /* 椤电鏍峰紡 */
+ .tab-container {
+ background-color: #fff;
+ }
+
+ .tab-list {
+ display: flex;
+ flex-direction: row;
+ border-bottom: 1px solid #e5e5e5;
+ }
+
+ .tab-item {
+ flex: 1;
+ padding: 20rpx 0;
+ text-align: center;
+ font-size: 28rpx;
+ color: #666;
+ position: relative;
+
+ &.active {
+ color: #3a78ff;
+ font-weight: bold;
+
+ &::after {
+ content: '';
+ position: absolute;
+ bottom: 0;
+ left: 50%;
+ transform: translateX(-50%);
+ width: 80rpx;
+ height: 4rpx;
+ background-color: #3a78ff;
+ }
+ }
+
+ .tab-count {
+ display: inline-block;
+ margin-left: 10rpx;
+ padding: 0 12rpx;
+ background-color: #ff6b6b;
+ color: #fff;
+ border-radius: 20rpx;
+ font-size: 20rpx;
+ min-width: 30rpx;
+ text-align: center;
+ }
+ }
+
+ .page-content {
+ box-sizing: border-box;
+ padding: 10rpx 0;
+
+ .card-detail {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ line-height: 120%;
+
+ .detail {
+ font-size: 26rpx;
+ margin-bottom: 12rpx;
+ color: #555;
+ margin-right: 20rpx;
+
+ text {
+ color: #999;
+ font-size: 26rpx;
+ }
+ }
+ }
+
+ .more {
+ color: #888;
+ font-size: 24rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ text-align: center;
+ }
+ }
+
+ .op {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 20rpx;
+
+ button {
+ padding: 0;
+ width: 150rpx;
+ font-size: 25rpx;
+
+ &:disabled {
+ opacity: 0.5;
+ }
+ }
+
+ .op1 {
+ border: 1px solid #41a863;
+ color: #41a863;
+ }
+
+ .op2 {
+ border: 1px solid #d98d00;
+ color: #d98d00;
+ }
+
+ .op3 {
+ border: 1px solid #3a78ff;
+ color: #3a78ff;
+ }
+
+ .op4 {
+ border: 1px solid #da0000;
+ color: #da0000;
+ }
+
+ .op5 {
+ border: 1px solid #888;
+ color: #888;
+ }
+ }
+ }
+
+ .over {
+ text-align: center;
+ padding: 40rpx;
+ color: #999;
+ font-size: 28rpx;
+ }
+
+ .page-footer {
+ position: fixed;
+ bottom: 0;
+ width: 100%;
+ box-sizing: border-box;
+ padding: 32rpx 40rpx;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue b/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
index 191b607..bc0c727 100644
--- a/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
+++ b/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
@@ -7,6 +7,7 @@
<view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">鍩烘湰淇℃伅</view>
<view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鎵弿淇℃伅</view>
<view :class="mainTabSelected == 3 ? 'selected' : ''" @tap="mainTabSelected = 3">鍒跺崟淇℃伅</view>
+ <view :class="mainTabSelected == 4 ? 'selected' : ''" @tap="mainTabSelected = 4">鍏朵粬淇℃伅</view>
</view>
<!-- 涓昏〃鍐呭 -->
<view class="bill-main-contents">
@@ -92,19 +93,7 @@
<input type="number" v-model="hform.HCheckQty" :disabled="hasCheckQty" />
</view>
</view>
- <view class="form-item">
- <view class="left">鐢熶骇鐝粍</view>
- <view class="right-select">
- <zxz-uni-data-select
- v-model="hform.HGroupID"
- dataKey="鐝粍鍚嶇О"
- dataValue="HItemID"
- :filterable="true"
- :localdata="HGroupList"
- :clear="false"
- ></zxz-uni-data-select>
- </view>
- </view>
+
<view class="form-item">
<view class="left">妫�楠屽憳</view>
<view class="right-select">
@@ -127,19 +116,7 @@
</view>
- <view class="form-item">
- <view class="left">鐢熶骇璧勬簮</view>
- <view class="right-select">
- <zxz-uni-data-select
- v-model="hform.HSourceID"
- dataKey="鐢熶骇璧勬簮鍚嶇О"
- dataValue="HItemID"
- :filterable="true"
- :localdata="HSourceList"
- :clear="false"
- ></zxz-uni-data-select>
- </view>
- </view>
+
<view class="form-item">
<view class="left">澶囨敞</view>
@@ -225,6 +202,35 @@
<view class="left">浣滃簾鏃ユ湡</view>
<view class="right disabled">
<input type="text" :value="hform.HDeleteDate" disabled />
+ </view>
+ </view>
+ </view>
+ <!-- 鍏朵粬淇℃伅 -->
+ <view class="bill-main-content" v-if="mainTabSelected == 4">
+ <view class="form-item">
+ <view class="left">鐢熶骇鐝粍</view>
+ <view class="right-select">
+ <zxz-uni-data-select
+ v-model="hform.HGroupID"
+ dataKey="鐝粍鍚嶇О"
+ dataValue="HItemID"
+ :filterable="true"
+ :localdata="HGroupList"
+ :clear="false"
+ ></zxz-uni-data-select>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鐢熶骇璧勬簮</view>
+ <view class="right-select">
+ <zxz-uni-data-select
+ v-model="hform.HSourceID"
+ dataKey="鐢熶骇璧勬簮鍚嶇О"
+ dataValue="HItemID"
+ :filterable="true"
+ :localdata="HSourceList"
+ :clear="false"
+ ></zxz-uni-data-select>
</view>
</view>
</view>
@@ -466,7 +472,13 @@
});
},
async getGy_BadReasonList() {
- let sWhere = ` and HUSEORGID = '${uni.getStorageSync('OrganizationID')}' and ISNULL(瀹℃牳浜�,'') != '' order by 涓嶈壇鍘熷洜浠ｇ爜`
+ let sWhere = ` and HUSEORGID = '${uni.getStorageSync('OrganizationID')}' and ISNULL(瀹℃牳浜�,'') != '' `
+ if (this.serverUrl == 'http://122.228.39.234:7177/API/') {
+ //娴疯瘹鏍规嵁鐗╂枡鍒嗙粍璁剧疆涓嶈壇鍘熷洜
+ sWhere += " and 涓嶈壇绫诲瀷 like '%鎴愬搧%' order by 涓嶈壇鍘熷洜浠ｇ爜"
+ }else{
+ sWhere += " order by 涓嶈壇鍘熷洜浠ｇ爜"
+ }
let res = await CommonUtils.doRequest2Async({
url: "/Gy_BadReason/list",
data: {
@@ -523,12 +535,19 @@
count
} = res.data
if (count == 1) {
+ if(data[0]['HBack']==1){
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: data[0]['HBackRemark']
+ })
+ return;
+ }
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.HMainSourceBillNo = data[0]['鍗曟嵁鍙�']
+ this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
this.hform.HMainSourceInterID = data[0].HInterID
this.hform.HMainSourceEntryID = data[0].HEntryID
this.hform.HSourceBillQty = data[0].娴佽浆鍗℃暟閲�
@@ -583,6 +602,14 @@
count
} = res.data
if (count == 1) {
+ //濡傛灉婧愬崟鏁伴噺瓒呭嚭鎻愮ず
+ if(data[0]['HBack']==1){
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: data[0]['HBackRemark']
+ })
+ return;
+ }
console.log('鑾峰彇婧愬崟锛�', data)
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
@@ -709,7 +736,7 @@
let res = await CommonUtils.doRequest2Async({
url: "/Gy_Employee/list",
data: {
- sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' order by 閮ㄩ棬浠ｇ爜`,
+ sWhere: ` and 绂佺敤鏍囪 = '' order by 閮ㄩ棬浠ｇ爜`,
user: getUserInfo()["Czymc"],
Organization: uni.getStorageSync("Organization"),
},
@@ -744,7 +771,7 @@
let res = await CommonUtils.doRequest2Async({
url: "/Gy_Source/list",
data: {
- sWhere: `and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'') != '' and 缁勭粐 = '${uni.getStorageSync("Organization")}'`,
+ sWhere: `and 绂佺敤鏍囪 != 'Y' and 缁勭粐 = '${uni.getStorageSync("Organization")}'`,
user: getUserInfo()["Czymc"],
},
});
@@ -776,7 +803,7 @@
let res = await CommonUtils.doRequest2Async({
url: "/Gy_Group/list",
data: {
- sWhere: `and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'') != '' and 缁勭粐 = '${uni.getStorageSync("Organization")}'`,
+ sWhere: `and 绂佺敤鏍囪 != 'Y' and 缁勭粐 = '${uni.getStorageSync("Organization")}'`,
user: getUserInfo()["Czymc"],
},
});
@@ -862,6 +889,9 @@
,HMakeDate:this.hform.HMakeDate
,HReportType:1
,HSourceBillType:this.hform.HSourceBillType
+ ,HSourceBillNo:this.hform.HSourceBillNo
+ ,HSourceInterID:this.hform.HMainSourceInterID
+ ,HSourceEntryID:this.hform.HMainSourceEntryID
,HBadReasonHQty:1
,HQty:this.hform.HCheckQty
}
@@ -1014,164 +1044,7 @@
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;
@@ -1180,9 +1053,7 @@
await this.getMaxBillNo();
} else if (this.operationType == 2) {
- } else if (this.operationType == 3) {
- await this.RoadBillMain();
- }
+ }
this.getGy_BadReasonList();
await this.InitHSource();
await this.InitHEmp();
diff --git a/pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue b/pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue
index b008d73..fe425fb 100644
--- a/pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue
+++ b/pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue
@@ -68,7 +68,8 @@
</view>
<view class="op" v-if="operations == index">
<button class="op3" size="mini" plain @tap.stop="audit(item, 0)">瀹℃牳</button>
- <button class="op3" size="mini" plain @tap.stop="Reject(item)">椹冲洖</button>
+ <button class="op3" size="mini" plain @tap.stop="audit(item, 1)">鍙嶅鏍�</button>
+ <!-- <button class="op3" size="mini" plain @tap.stop="Reject(item)">椹冲洖</button> -->
<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
</uni-card>
diff --git a/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue b/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
index 6ef0cb2..883975e 100644
--- a/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
+++ b/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
@@ -780,6 +780,13 @@
count
} = res.data
if (count == 1) {
+ if(data[0]['HBack']==1){
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: data[0]['HBackRemark']
+ })
+ return;
+ }
console.log('鑾峰彇婧愬崟锛�', data)
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['HMaterName']
@@ -881,6 +888,13 @@
count
} = res.data
if (count == 1) {
+ if(data[0]['HBack']==1){
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: data[0]['HBackRemark']
+ })
+ return;
+ }
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['HMaterName']
this.hform.HMaterNumber = data[0]['HMaterNumber']
diff --git a/pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
similarity index 99%
rename from pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue
rename to pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
index f2ac772..2ed3280 100644
--- a/pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue
+++ b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -708,6 +708,13 @@
count
} = res.data
if (count == 1) {
+ if(data[0]['HBack']==1){
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: data[0]['HBackRemark']
+ })
+ return;
+ }
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
@@ -762,6 +769,13 @@
} = res.data
if (count == 1) {
console.log('鑾峰彇婧愬崟锛�', data)
+ if(data[0]['HBack']==1){
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: data[0]['HBackRemark']
+ })
+ return;
+ }
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
@@ -1933,7 +1947,7 @@
if (res.confirm) {
console.log("鐢ㄦ埛鐐瑰嚮纭畾");
uni.redirectTo({
- url: "/pages/ZLGL/mojianjianyan/form?operationType=1",
+ url: "/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=1",
});
} else if (res.cancel) {
console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
@@ -1958,7 +1972,7 @@
},
addNew() {
uni.redirectTo({
- url: "/pages/ZLGL/mojianjianyan/lastPieceCheckBillList?operationType=1",
+ url: "/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=1",
});
},
goBack() {
diff --git a/pages/ZLGL/mojianjianyan/lastPieceCheckBillList.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBillList.vue
similarity index 99%
rename from pages/ZLGL/mojianjianyan/lastPieceCheckBillList.vue
rename to pages/ZLGL/mojianjianyan/ProcessCheckBillList.vue
index e8571d7..23a4e45 100644
--- a/pages/ZLGL/mojianjianyan/lastPieceCheckBillList.vue
+++ b/pages/ZLGL/mojianjianyan/ProcessCheckBillList.vue
@@ -193,7 +193,7 @@
},
cmdAdd() {
uni.redirectTo({
- url: "/pages/ZLGL/mojianjianyan/lastPieceCheckBill?operationType=1"
+ url: "/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=1"
})
},
async cmdSearch() {
diff --git a/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue b/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
index b2fde55..eb54c98 100644
--- a/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
+++ b/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
@@ -175,13 +175,13 @@
<input type="text" v-model="hform.HErrTreatment" value="" />
</view>
</view>
- <view class="form-item" v-if="false">
+ <view class="form-item" >
<view class="left">浠诲姟鍗曟暟閲�</view>
<view class="right">
<input type="number" v-model="hform.HICMOQty" />
</view>
</view>
- <view class="form-item" v-if="false">
+ <view class="form-item">
<view class="left">娴佽浆鍗℃暟閲�</view>
<view class="right">
<input type="number" v-model="hform.HProcExchQty" />
@@ -794,6 +794,13 @@
count
} = res.data
if (count == 1) {
+ if(data[0]['HBack']==1){
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: data[0]['HBackRemark']
+ })
+ return;
+ }
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
@@ -807,6 +814,7 @@
this.hform.HProcName = data[0]['褰撳墠宸ュ簭']
this.hform.HSourceBillQty = data[0].HSourceBillQty
this.hasSourceBill = true
+ this.hform.HProcExchQty = data[0]['娴佽浆鍗℃暟閲�']
this.get_CheckItem();
this.$refs['billList'].exit()
} else {
@@ -816,14 +824,7 @@
})
}
- if (
- (uni.getStorageSync("OrganizationID") == "7667152" &&
- uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
- (uni.getStorageSync("OrganizationID") == "100199" &&
- uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
- ) {
- await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
- }
+
} catch (err) {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
@@ -894,7 +895,13 @@
} = res.data
if (count == 1) {
console.log('data: ', data);
-
+ if(data[0]['HBack']==1){
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: data[0]['HBackRemark']
+ })
+ return;
+ }
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
@@ -907,6 +914,7 @@
this.hform.HProcID = data[0]['HProcID']
this.hform.HProcName = data[0]['褰撳墠宸ュ簭']
this.hform.HSourceBillQty = data[0].HSourceBillQty
+ this.hform.HProcExchQty = data[0]['娴佽浆鍗℃暟閲�']
this.hasSourceBill = true
this.get_CheckItem();
} else {
diff --git a/pages/baogong/AddLineBind.vue b/pages/baogong/AddLineBind.vue
new file mode 100644
index 0000000..ed7c53e
--- /dev/null
+++ b/pages/baogong/AddLineBind.vue
@@ -0,0 +1,435 @@
+<template>
+ <view>
+ <view class="form" :style="{height: containerHeight + 'px',overflow: 'auto'}">
+ <view class="form-item">
+ <view class="title">鐢熶骇璧勬簮:</view>
+ <view class="right">
+ <uni-combox
+ :candidates="arrayHSourceName"
+ placeholder="璇烽�夋嫨鐢熶骇璧勬簮"
+ v-model="hform.HSourceName"
+ @input="HSourceNameChange">
+ </uni-combox>
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="title">璐熻矗浜�:</view>
+ <view class="right">
+ <uni-combox
+ :candidates="arrayHManagerName"
+ placeholder="璇烽�夋嫨璐熻矗浜�"
+ v-model="hform.HManagerName"
+ @input="HManagerNameChange">
+ </uni-combox>
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="title">鐝粍:</view>
+ <view class="right">
+ <uni-combox
+ :candidates="arrayHGroupName"
+ placeholder="璇烽�夋嫨鐝粍"
+ v-model="hform.HGroupName"
+ @input="HGroupNameChange">
+ </uni-combox>
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="title">鍒涘缓鏃ユ湡:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HCreateDate" />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="title">澶囨敞:</view>
+ <view class="right">
+ <textarea v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" auto-height />
+ </view>
+ </view>
+ </view>
+
+ <!-- 鎿嶄綔鎸夐挳 -->
+ <view class="buttons" id="buttons">
+ <button class="btn-c" size="mini" @tap="save">淇濆瓨</button>
+ <view style="flex: 1;"></view>
+ <button class="btn-a" size="mini" @tap="goBack">杩斿洖</button>
+ </view>
+
+ </view>
+</template>
+
+<script>
+ import dayjs from "dayjs";
+ import { CommonUtils } from "@/utils/common";
+ import { getUserInfo } from "@/utils/auth";
+
+ export default {
+ name: 'AddLineBind',
+ data() {
+ return {
+ // 绉婚櫎btnTop锛屾敼鐢ㄥ浐瀹氬簳閮ㄥ竷灞�
+ // 鏁版嵁鍒楄〃
+ HSourceNameList: [],
+ HManagerNameList: [],
+ HGroupNameList: [],
+
+ // 鐢ㄤ簬uni-combox鐨勬暟缁�
+ arrayHSourceName: [],
+ arrayHManagerName: [],
+ arrayHGroupName: [],
+
+ hform: {
+ HUserName: getUserInfo()['Czymc'] || uni.getStorageSync('HUserName'),
+ HSourceID: getUserInfo()['HSourceID'],
+ HSourceName: getUserInfo()['HSource'],
+ HManagerID: getUserInfo()['HKeeperID'],
+ HManagerName: getUserInfo()['HKeeper'],
+ HGroupID: getUserInfo()['HGroupID'],
+ HGroupName: getUserInfo()['HGroup'],
+ HCreateDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HRemark: ''
+ },
+
+ // 鏈嶅姟鍣ㄥ湴鍧�
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+
+ // 娣诲姞绐楀彛楂樺害
+ windowHeight: 0
+ };
+ },
+ onUnload() {
+ // 椤甸潰鍏抽棴鏃惰Е鍙戝埛鏂�
+ uni.$emit('refreshDeviceList');
+ },
+ methods: {
+ // 鑾峰彇鎵�鏈夊垪琛ㄦ暟鎹�
+ async getListData() {
+ // 鑾峰彇鐢熶骇璧勬簮鍒楄〃
+ await this.getSourceList();
+ // 鑾峰彇璐熻矗浜哄垪琛紙浜哄憳鍒楄〃锛�
+ await this.getManagerList();
+ // 鑾峰彇鐝粍鍒楄〃
+ await this.getGroupList();
+ },
+
+ // 鑾峰彇鐢熶骇璧勬簮鍒楄〃
+ async getSourceList() {
+ try {
+ const res = await uni.request({
+ url: this.serverUrl + '/api/newBill/getSourceList',
+ data: {
+ sWhere: ""
+ }
+ });
+
+ if (res[1].data.code == 1) {
+ this.HSourceNameList = res[1].data.data.Gy_Source || [];
+ for (let i = 0; i < this.HSourceNameList.length; i++) {
+ this.arrayHSourceName[i] = this.HSourceNameList[i].鐢熶骇璧勬簮;
+ }
+ this.$forceUpdate();
+ } else {
+ uni.showToast({
+ title: '鑾峰彇鐢熶骇璧勬簮鍒楄〃澶辫触',
+ icon: 'none'
+ });
+ }
+ } catch (error) {
+ console.log(error);
+ uni.showToast({
+ title: '鑾峰彇鐢熶骇璧勬簮鍒楄〃澶辫触',
+ icon: 'none'
+ });
+ }
+ },
+
+ // 鑾峰彇璐熻矗浜哄垪琛紙浜哄憳鍒楄〃锛�
+ async getManagerList() {
+ try {
+ const res = await uni.request({
+ url: this.serverUrl + '/Web/GetEmployeeList_Json',
+ data: {
+ Employee: '',
+ HGroupID: 0
+ }
+ });
+
+ if (res[1].data.count == 1) {
+ this.HManagerNameList = res[1].data.data || [];
+ for (let i = 0; i < this.HManagerNameList.length; i++) {
+ this.arrayHManagerName[i] = this.HManagerNameList[i].HName;
+ }
+ this.$forceUpdate();
+ } else {
+ uni.showToast({
+ title: '鑾峰彇璐熻矗浜哄垪琛ㄥけ璐�',
+ icon: 'none'
+ });
+ }
+ } catch (error) {
+ console.log(error);
+ uni.showToast({
+ title: '鑾峰彇璐熻矗浜哄垪琛ㄥけ璐�',
+ icon: 'none'
+ });
+ }
+ },
+
+ // 鑾峰彇鐝粍鍒楄〃
+ async getGroupList() {
+ try {
+ const res = await uni.request({
+ url: this.serverUrl + '/Gy_Group/list',
+ method: 'GET',
+ data: {
+ sWhere: "",
+ user: uni.getStorageSync('HUserName')
+ }
+ });
+
+ if (res[1].data.count == 1) {
+ this.HGroupNameList = res[1].data.data || [];
+ for (let i = 0; i < this.HGroupNameList.length; i++) {
+ this.arrayHGroupName[i] = this.HGroupNameList[i].鐝粍鍚嶇О || this.HGroupNameList[i].HName;
+ }
+ this.$forceUpdate();
+ } else {
+ uni.showToast({
+ title: '鑾峰彇鐝粍鍒楄〃澶辫触',
+ icon: 'none'
+ });
+ }
+ } catch (error) {
+ console.log(error);
+ uni.showToast({
+ title: '鑾峰彇鐝粍鍒楄〃澶辫触',
+ icon: 'none'
+ });
+ }
+ },
+
+ // 閫夋嫨鐢熶骇璧勬簮
+ HSourceNameChange(e) {
+ for (let i = 0; i < this.HSourceNameList.length; i++) {
+ if (this.HSourceNameList[i].鐢熶骇璧勬簮 == e) {
+ this.hform.HSourceName = this.HSourceNameList[i].鐢熶骇璧勬簮;
+ this.hform.HSourceID = this.HSourceNameList[i].HItemID;
+ this.hform.HSourceCode = this.HSourceNameList[i].璧勬簮浠ｇ爜 || '';
+ break;
+ }
+ }
+ },
+
+ // 閫夋嫨璐熻矗浜�
+ HManagerNameChange(e) {
+ for (let i = 0; i < this.HManagerNameList.length; i++) {
+ if (this.HManagerNameList[i].HName == e) {
+ this.hform.HManagerName = this.HManagerNameList[i].HName;
+ this.hform.HManagerID = this.HManagerNameList[i].HItemID;
+ break;
+ }
+ }
+ },
+
+ // 閫夋嫨鐝粍
+ HGroupNameChange(e) {
+ for (let i = 0; i < this.HGroupNameList.length; i++) {
+ const groupName = this.HGroupNameList[i].鐝粍鍚嶇О || this.HGroupNameList[i].HName;
+ if (groupName == e) {
+ this.hform.HGroupName = groupName;
+ this.hform.HGroupID = this.HGroupNameList[i].HItemID;
+ break;
+ }
+ }
+ },
+
+ // 楠岃瘉琛ㄥ崟
+ validateForm() {
+ if (!this.hform.HSourceID || this.hform.HSourceID == 0) {
+ uni.showToast({
+ title: '璇烽�夋嫨鐢熶骇璧勬簮',
+ icon: 'none'
+ });
+ return false;
+ }
+
+ if (!this.hform.HManagerID || this.hform.HManagerID == 0) {
+ uni.showToast({
+ title: '璇烽�夋嫨璐熻矗浜�',
+ icon: 'none'
+ });
+ return false;
+ }
+
+ return true;
+ },
+
+ // 淇濆瓨鏁版嵁
+ async save() {
+ if (!this.validateForm()) {
+ return;
+ }
+
+ uni.showLoading({
+ title: '淇濆瓨涓�...'
+ });
+
+ try {
+ const res = await CommonUtils.doRequest2Sync({
+ url: "/ReportPlatForm/SaveGetLineBindBillList",
+ data: {
+ HUserName: this.hform.HUserName,
+ HSourceID: this.hform.HSourceID,
+ HSourceName: this.hform.HSourceName,
+ HManagerID: this.hform.HManagerID,
+ HManagerName: this.hform.HManagerName,
+ HGroupID: this.hform.HGroupID,
+ HGroupName: this.hform.HGroupName,
+ HCreateDate: this.hform.HCreateDate,
+ HRemark: this.hform.HRemark
+ },
+ method: "GET"
+ });
+
+ uni.hideLoading();
+
+ if (res.data.count == 1) {
+ uni.showToast({
+ title: '淇濆瓨鎴愬姛',
+ icon: 'success',
+ success: () => {
+ setTimeout(() => {
+ // 淇濆瓨鎴愬姛鍚庤繑鍥炰笂涓�椤�
+ uni.navigateBack();
+ }, 1500);
+ }
+ });
+ } else {
+ uni.showToast({
+ title: res.data.Message || '淇濆瓨澶辫触',
+ icon: 'none'
+ });
+ }
+ } catch (err) {
+ uni.hideLoading();
+ uni.showToast({
+ title: '淇濆瓨澶辫触: ' + err,
+ icon: 'none'
+ });
+ }
+ },
+
+ // 杩斿洖涓婁竴椤�
+ goBack() {
+ uni.navigateBack();
+ }
+ },
+ onLoad() {
+ // 鍒濆鍖栨暟鎹�
+ this.hform.HUserName = getUserInfo()['Czymc'] || uni.getStorageSync('HUserName');
+ // 鑾峰彇鎵�鏈夊垪琛ㄦ暟鎹�
+ this.getListData();
+
+ // 鑾峰彇绐楀彛楂樺害
+ const systemInfo = uni.getSystemInfoSync();
+ this.windowHeight = systemInfo.windowHeight;
+ },
+ onReady() {
+ // 绉婚櫎鍘熸潵鐨勬寜閽綅缃绠楋紝浣跨敤鍥哄畾搴曢儴甯冨眬
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .form {
+ padding: 20rpx;
+ // 娣诲姞搴曢儴鍐呰竟璺濓紝涓哄簳閮ㄦ寜閽暀鍑虹┖闂�
+ padding-bottom: 160rpx; // 鎸夐挳楂樺害 + 棰濆闂磋窛
+ }
+
+ .form-item {
+ display: flex;
+ align-items: center;
+ font-size: 28rpx;
+ padding: 6rpx 0;
+ margin-bottom: 20rpx;
+
+ .title {
+ width: 180rpx;
+ flex-shrink: 0;
+ }
+
+ .right {
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ padding: 0 20rpx;
+ min-height: 70rpx;
+ display: flex;
+ align-items: center;
+
+ input, textarea {
+ width: 100%;
+ font-size: 30rpx;
+ }
+
+ textarea {
+ padding: 20rpx 0;
+ min-height: 100rpx;
+ }
+ }
+
+ .righton {
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ padding: 0 20rpx;
+ min-height: 70rpx;
+ display: flex;
+ align-items: center;
+
+ input {
+ width: 100%;
+ font-size: 30rpx;
+ color: #666;
+ }
+ }
+ }
+
+ .buttons {
+ position: fixed; // 鏀逛负鍥哄畾瀹氫綅
+ bottom: 0; // 鍥哄畾鍦ㄥ簳閮�
+ left: 0;
+ right: 0;
+ width: 100%;
+ display: flex;
+ padding: 20rpx;
+ background-color: #fff;
+ border-top: 1px solid #eee;
+ box-sizing: border-box; // 纭繚鍐呰竟璺濅笉褰卞搷瀹藉害
+ z-index: 999; // 纭繚鎸夐挳鍦ㄦ渶涓婂眰
+
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+
+ .btn-a {
+ background-color: #acacac;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/pages/baogong/DayPlanBillList.vue b/pages/baogong/DayPlanBillList.vue
index 389a726..4573cc0 100644
--- a/pages/baogong/DayPlanBillList.vue
+++ b/pages/baogong/DayPlanBillList.vue
@@ -23,7 +23,7 @@
</view>
<view class="detail" style="width: 100%;display: flex;align-items: center;">
<text>鐢熶骇杩涘害锛�</text>
- <zui-progress-bar :value="item.percent" :width="220" type="follow-left"/>
+ <zui-progress-bar :value="item.percent" :width="210" type="follow-left"/>
</view>
</view>
</uni-card>
@@ -52,6 +52,37 @@
listData:[],
chooseIt:'',
popList:['浜哄憳鍘熷洜', '璁惧鍘熷洜', '鏉愭枡鍘熷洜', '宸ヨ壓鍘熷洜', '妯″叿鍘熷洜', '娴嬭瘯鍘熷洜', '鐜鍘熷洜'],
+ // 瀹氫箟鎿嶄綔鏄犲皠閰嶇疆
+ actionConfig: {
+ '寮�宸�': {
+ apiUrl: '/Sc_MESBeginWorkBill/FastBeginWorkBill',
+ type: '寮�宸�',
+ handler: 'handleBegin',
+ checkStatus: true, // 闇�瑕佹鏌ョ姸鎬�
+ denyMsg: '鍗曟嵁鐘舵�佷笉婊¤冻寮�宸ユ潯浠�!' // 鍥哄畾閿欒鎻愮ず
+ },
+ '瀹屽伐': {
+ apiUrl: '/Sc_MESEndWorkBill/FastEndWorkBill',
+ type: '瀹屽伐',
+ handler: 'handleEnd',
+ checkStatus: true,
+ denyMsg: '鍗曟嵁鐘舵�佷笉婊¤冻瀹屽伐鏉′欢!' // 鍥哄畾閿欒鎻愮ず
+ },
+ '鍋滃伐': {
+ apiUrl: '/Sc_MESStopWorkBill/FastStopWorkBill',
+ type: '鍋滃伐',
+ handler: 'handleStop',
+ checkStatus: true,
+ denyMsg: '鍗曟嵁鐘舵�佷笉婊¤冻鍋滃伐鏉′欢!' // 鍥哄畾閿欒鎻愮ず
+ },
+ '寮傚父鍙嶉': {
+ apiUrl: '',
+ type: '寮傚父鍙嶉',
+ handler: 'handleAbnormal',
+ checkStatus: true,
+ denyMsg: '鍗曟嵁鐘舵�佷笉婊¤冻寮傚父鍙嶉鏉′欢!' // 鍥哄畾閿欒鎻愮ず
+ }
+ }
}
},
onLoad(e) {
@@ -62,8 +93,6 @@
this.HSourceName=e.HSourceName
this.HSourceID=e.HSourceID
this.getList(e.HSourceID)
- },
- onShow() {
},
onPullDownRefresh: function() {
this.getList(this.HSourceID)
@@ -112,7 +141,7 @@
console.log(item,this.chooseIt)
this.$refs.popup.close()
uni.navigateTo({
- url:'./abnormal?HICMOBillNo=' + this.chooseIt.HICMOBillNo
+ url:'./OA_ErrMsgBackBill?HICMOBillNo=' + this.chooseIt.HICMOBillNo
+'&HSourceName=' + this.HSourceName
+'&HSourceBillNo=' + this.chooseIt.HSourceBillNo
+'&HType=' + item
@@ -121,9 +150,100 @@
},
edit(item){
console.log(item)
- var lists = ['寮�宸�', '姹囨姤', '瀹屽伐', '鍋滃伐', '寮傚父鍙嶉']
this.chooseIt = item
- var upData = {
+
+ // 浣跨敤瀵硅薄鏄犲皠閰嶇疆鐢熸垚鍙敤鐨勬搷浣滃垪琛�
+ const availableActions = Object.keys(this.actionConfig)
+
+ uni.showActionSheet({
+ itemList: availableActions,
+ success: (res)=> {
+ const actionKey = availableActions[res.tapIndex]
+ const actionConfig = this.actionConfig[actionKey]
+
+ // 璋冪敤瀵瑰簲鐨勫鐞嗘柟娉�
+ this[actionConfig.handler](item, actionConfig)
+ },
+ fail: function (res) {
+ console.log(res.errMsg);
+ }
+ });
+ },
+ // 寮�宸ュ鐞�
+ handleBegin(item, config) {
+ const upData = this.createUpData(item)
+ this.checkAndExecuteWorkStatus(
+ item,
+ config,
+ config.apiUrl,
+ upData
+ )
+ },
+ // 瀹屽伐澶勭悊
+ handleEnd(item, config) {
+ const upData = this.createUpData(item)
+ this.checkAndExecuteWorkStatus(
+ item,
+ config,
+ config.apiUrl,
+ upData
+ )
+ },
+ // 鍋滃伐澶勭悊
+ handleStop(item, config) {
+ const upData = this.createUpData(item)
+ this.checkAndExecuteWorkStatus(
+ item,
+ config,
+ config.apiUrl,
+ upData
+ )
+ },
+ // 寮傚父鍙嶉澶勭悊
+ handleAbnormal(item, config) {
+ const sWhere = {
+ "HSourceID": this.HSourceID,
+ "HICMOBillNo": item.HICMOBillNo,
+ "HInterID": item.HSourceInterID,
+ "type": config.type
+ }
+
+ uni.request({
+ url: this.serverUrl + '/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus',
+ type: "GET",
+ data: { "sWhere": JSON.stringify(sWhere) },
+ dataType: "json",
+ async: false,
+ success: (res) => {
+ console.log('寮傚父鍙嶉鐘舵�佹鏌�:', res.data)
+ // 鏍规嵁绗簩涓〉闈㈢殑閫昏緫锛氬鏋渃ount>0锛岃〃绀轰笉鍏佽鎿嶄綔
+ if (res.data.count > 0) {
+ // 涓嶅厑璁告搷浣滐紝鏄剧ず閿欒鎻愮ず
+ const status = item.HICMOStatus || '鏈煡鐘舵��'
+ uni.showToast({
+ title: `宸ュ崟銆�${item.HICMOBillNo}銆戝綋鍓嶇姸鎬佷负銆�${status}銆戯紝${config.denyMsg}`,
+ icon:'none',
+ duration: 3000
+ })
+ }
+ else {
+ // count<=0锛岃〃绀哄厑璁告搷浣�
+ this.$refs.popup.open('center')
+ }
+ },
+ fail: (res) => {
+ console.log(res)
+ uni.hideLoading()
+ uni.showToast({
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
+ })
+ },
+ })
+ },
+ // 鍒涘缓閫氱敤鐨勮姹傛暟鎹�
+ createUpData(item) {
+ return {
HBillType: item.HBillType,
HSourceInterID: item.HSourceInterID,
HSourceEntryID: item.HSourceEntryID,
@@ -131,162 +251,136 @@
HSourceBillType: item.HSourceBillType,
user: uni.getStorageSync('HUserName')
}
- uni.showActionSheet({
- itemList: lists,
- success: (res)=> {
- // console.log('閫変腑浜嗙' + (res.tapIndex + 1) + '涓寜閽�');
- if(res.tapIndex == 0){
- var urls = '/Sc_MESBeginWorkBill/FastBeginWorkBill'
- this.WorkStaus(this.HSourceID, item.HICMOBillNo, item.HSourceInterID, lists[res.tapIndex],item.HMaterName,urls,upData)
- }else if(res.tapIndex == 1){
- var sWhere = { "HSourceID": this.HSourceID, "HICMOBillNo": item.HICMOBillNo, "HInterID": item.HSourceInterID,"type": "姹囨姤"}
- uni.request({
- url: this.serverUrl + '/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus',
- type: "GET",
- data: { "sWhere": JSON.stringify(sWhere) },
- dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
- async: false,
- success: (res) => {
- console.log(1,res.data);
- if (res.data.count > 0) {
- uni.navigateTo({
- url:'./form?HBillType=' + item.HBillType
- +'&HSourceInterID=' + item.HSourceInterID
- +'&HSourceEntryID=' + item.HSourceEntryID
- +'&HSourceBillNo=' + item.HSourceBillNo
- +'&HSourceBillType=' + item.HSourceBillType
- })
- }
- else {
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.hideLoading()
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- }else if(res.tapIndex == 2){
- var urls = '/Sc_MESEndWorkBill/FastEndWorkBill'
- this.WorkStaus(this.HSourceID, item.HICMOBillNo, item.HSourceInterID, lists[res.tapIndex],item.HMaterName,urls,upData)
- }else if(res.tapIndex == 3){
- var urls = '/Sc_MESStopWorkBill/FastStopWorkBill'
- this.WorkStaus(this.HSourceID, item.HICMOBillNo, item.HSourceInterID, lists[res.tapIndex],item.HMaterName,urls,upData)
- }else if(res.tapIndex == 4){
- var sWhere = { "HSourceID": this.HSourceID, "HICMOBillNo": item.HICMOBillNo, "HInterID": item.HSourceInterID,"type": "寮傚父鍙嶉"}
- uni.request({
- url: this.serverUrl + '/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus',
- type: "GET",
- data: { "sWhere": JSON.stringify(sWhere) },
- dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
- async: false,
- success: (res) => {
- console.log(1,res.data);
- if (res.data.count > 0) {
- this.$refs.popup.open('center')
- }
- else {
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.hideLoading()
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- }
- },
- fail: function (res) {
- console.log(res.errMsg);
- }
- });
},
- upWork(urls,upData){
- uni.showLoading({
- title:'璇风◢鍚�...'
- })
- console.log(upData)
- uni.request({
- url: this.serverUrl + urls,
- data:upData,
- success: (res) => {
- console.log(1,res);
- if(res.data.count == 1){
- this.getList(this.HSourceID)
- }else{
- uni.hideLoading()
- }
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
- },
- fail: (res) => {
- console.log(res);
- uni.hideLoading()
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- },
- WorkStaus(HSourceID1, workcode, HSourceInterID, btn,HMaterName, urls ,upData,) {
- var sWhere = ""
- sWhere = { "HSourceID": HSourceID1, "HICMOBillNo": workcode, "HInterID": HSourceInterID,"type": btn}
- console.log(JSON.stringify(sWhere))
+ // 閫氱敤鐨勬鏌ュ拰鎵ц鏂规硶
+ checkAndExecuteWorkStatus(item, config, apiUrl, upData) {
+ const sWhere = {
+ "HSourceID": this.HSourceID,
+ "HICMOBillNo": item.HICMOBillNo,
+ "HInterID": item.HSourceInterID,
+ "type": config.type
+ }
+
+ console.log('鐘舵�佹鏌ュ弬鏁�:', JSON.stringify(sWhere))
+
uni.request({
url: this.serverUrl + '/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus',
type: "GET",
data: { "sWhere": JSON.stringify(sWhere) },
- dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
+ dataType: "json",
async: false,
success: (res) => {
- console.log(1,res.data);
+ console.log('鐘舵�佹鏌ョ粨鏋�:', res.data)
+ // 鏍规嵁绗簩涓〉闈㈢殑閫昏緫锛氬鏋渄ata.count>0锛岃〃绀轰笉鍏佽鎿嶄綔
if (res.data.count > 0) {
- uni.showModal({
- title: btn + '纭',
- content: '璁惧缂栧彿:' + this.HSourceName + '; 宸ュ崟鍙�:' + workcode + '; 浜у搧鍚嶇О:' + HMaterName ,
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- this.upWork(urls,upData)
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- }
- }
- });
+ // 涓嶅厑璁告搷浣滐紝鏄剧ず閿欒鎻愮ず
+ const status = item.HICMOStatus || '鏈煡鐘舵��'
+ const operationMap = {
+ '寮�宸�': '寮�宸�',
+ '瀹屽伐': '瀹屽伐',
+ '鍋滃伐': '鍋滃伐',
+ '寮傚父鍙嶉': '寮傚父鍙嶉'
+ }
+ const operationName = operationMap[config.type] || config.type
+
+ // 鏍规嵁鎿嶄綔绫诲瀷缁欏嚭涓嶅悓鐨勫缓璁�
+ let suggestion = ''
+ switch(config.type) {
+ case '寮�宸�':
+ suggestion = '寮�宸ユ搷浣滈渶瑕佸伐鍗曠姸鎬佷负"寰呯敓浜�"鎴�"鎸傝捣"鐘舵�侊紝璇锋鏌ュ綋鍓嶇姸鎬佹槸鍚︾鍚堣姹�'
+ break
+ case '瀹屽伐':
+ suggestion = '瀹屽伐鎿嶄綔闇�瑕佸伐鍗曞浜�"鐢熶骇涓�"鐘舵�侊紝璇锋鏌ュ綋鍓嶇姸鎬佹槸鍚︾鍚堣姹�'
+ break
+ case '鍋滃伐':
+ suggestion = '鍋滃伐鎿嶄綔闇�瑕佸伐鍗曞浜�"鐢熶骇涓�"鐘舵�侊紝璇锋鏌ュ綋鍓嶇姸鎬佹槸鍚︾鍚堣姹�'
+ break
+ case '寮傚父鍙嶉':
+ suggestion = '寮傚父鍙嶉闇�瑕佸伐鍗曞浜�"鐢熶骇涓�"鎴�"寮�宸�"鐘舵�侊紝璇锋鏌ュ綋鍓嶇姸鎬佹槸鍚︾鍚堣姹�'
+ break
+ default:
+ suggestion = '璇锋鏌ュ伐鍗曠姸鎬佹槸鍚︾鍚堟搷浣滆姹�'
+ }
+
+ uni.showToast({
+ title: `宸ュ崟銆�${item.HICMOBillNo}銆戝綋鍓嶇姸鎬佷负銆�${status}銆戯紝鏃犳硶杩涜銆�${operationName}銆戞搷浣溿�俓n${suggestion}`,
+ icon:'none',
+ duration: 4000
+ })
}
else {
+ // data.count<=0锛岃〃绀哄厑璁告搷浣�
+ this.showConfirmDialog(config.type, item, apiUrl, upData)
+ }
+ },
+ fail: (res) => {
+ console.log(res)
+ uni.hideLoading()
+ uni.showToast({
+ title:'鐘舵�佹鏌ユ帴鍙ｈ姹傚け璐�',
+ icon:'none'
+ })
+ },
+ })
+ },
+ // 鏄剧ず纭瀵硅瘽妗�
+ showConfirmDialog(actionType, item, apiUrl, upData) {
+ // 鑾峰彇褰撳墠宸ュ崟鐘舵�佹樉绀哄湪纭妗嗕腑
+ const status = item.HICMOStatus || '鏈煡鐘舵��'
+
+ uni.showModal({
+ title: actionType + '纭',
+ content: `璁惧锛�${this.HSourceName}\n宸ュ崟锛�${item.HICMOBillNo}\n浜у搧锛�${item.HMaterName}\n褰撳墠鐘舵�侊細${status}\n\n纭畾瑕佹墽琛屻��${actionType}銆戞搷浣滃悧锛焋,
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾')
+ this.executeWork(apiUrl, upData, item, actionType)
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷')
+ }
+ }
+ })
+ },
+ // 鎵ц宸ヤ綔鎿嶄綔
+ executeWork(apiUrl, upData, item, actionType) {
+ uni.showLoading({
+ title:`姝ｅ湪${actionType}...`
+ })
+
+ console.log('鎵ц鎿嶄綔鍙傛暟:', upData)
+
+ uni.request({
+ url: this.serverUrl + apiUrl,
+ data: upData,
+ success: (res) => {
+ console.log('鎵ц鎿嶄綔缁撴灉:', res)
+ if(res.data.count == 1){
+ // 鎿嶄綔鎴愬姛鍚庡埛鏂板垪琛�
+ this.getList(this.HSourceID)
uni.showToast({
- title:res.data.Message,
- icon:'none'
+ title:`${actionType}鎴愬姛锛乣,
+ icon:'success'
+ })
+ }else{
+ uni.hideLoading()
+ // 鏄剧ず鏇磋缁嗙殑鎿嶄綔澶辫触鎻愮ず
+ let errorMsg = res.data.Message || `${actionType}澶辫触`
+ uni.showToast({
+ title: `${actionType}澶辫触锛�${errorMsg}`,
+ icon:'none',
+ duration: 3000
})
}
},
fail: (res) => {
- console.log(res);
+ console.log(res)
uni.hideLoading()
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title:`${actionType}鎺ュ彛璇锋眰澶辫触锛岃妫�鏌ョ綉缁渀,
icon:'none'
})
},
- });
+ })
},
changeTab(e){
this.number = e
@@ -354,4 +448,4 @@
color: #444;
}
}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/baogong/IpadIndex.vue b/pages/baogong/IpadIndex.vue
index 2c75642..813744c 100644
--- a/pages/baogong/IpadIndex.vue
+++ b/pages/baogong/IpadIndex.vue
@@ -1,31 +1,25 @@
<template>
<view class="content">
-<!-- <view class="form">
- <view class="form-item">
- <view class="title">璁惧缂栧彿:</view>
- <view class="right">
- <input v-model="hform.HNumber" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">璁惧鍚嶇О:</view>
- <view class="right">
- <input v-model="hform.HName" placeholder="璇疯緭鍏ヨ澶囧悕绉�" />
- </view>
- </view>
- </view> -->
-
- <!-- <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view> -->
-
+
<view class="tabs">
<view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">鍏ㄩ儴</view>
<view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">杩愯</view>
<view :class="tabs == 2 ? 'on':''" @tap="changeTab(2)">寰呮満</view>
<view :class="tabs == 3 ? 'on':''" @tap="changeTab(3)">鍋滄満</view>
</view>
-
+
<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
-
+
+ <!-- 鍙湪鍏ㄩ儴椤电鏄剧ず娣诲姞鐢熶骇璧勬簮鍗＄墖 -->
+ <view class="list" v-if="tabs == 0">
+ <uni-card style="margin: 10px;" @tap="addResource">
+ <view class="card-main add-resource">
+ <view class="add-icon">+</view>
+ <view class="add-text">娣诲姞鐢熶骇璧勬簮</view>
+ </view>
+ </uni-card>
+ </view>
+
<view class="list" v-for="(item,index) in showList" :key="index">
<uni-card style="margin: 10px;" @tap="toList(item)">
<view class="card-main">
@@ -49,65 +43,42 @@
</view>
<view class="op">
<view class="op5" v-if="item.HStatus == '绌洪棽'">
- <uni-icons type="smallcircle-filled" size="14" color=""></uni-icons><text>{{item.HStatus}}</text>
+ <uni-icons type="smallcircle-filled" size="14"
+ color=""></uni-icons><text>{{item.HStatus}}</text>
</view>
<view class="op3" v-if="item.HStatus == '寮�鏈�'">
- <uni-icons type="smallcircle-filled" size="14" color=""></uni-icons><text>{{item.HStatus}}</text>
+ <uni-icons type="smallcircle-filled" size="14"
+ color=""></uni-icons><text>{{item.HStatus}}</text>
</view>
<view class="op4" v-if="item.HStatus == '鍋滄満'">
- <uni-icons type="smallcircle-filled" size="14" color=""></uni-icons><text>{{item.HStatus}}</text>
+ <uni-icons type="smallcircle-filled" size="14"
+ color=""></uni-icons><text>{{item.HStatus}}</text>
</view>
<view class="op1" v-if="item.HStatus == '鐢熶骇'">
- <uni-icons type="smallcircle-filled" size="14" color=""></uni-icons><text>{{item.HStatus}}</text>
+ <uni-icons type="smallcircle-filled" size="14"
+ color=""></uni-icons><text>{{item.HStatus}}</text>
</view>
<view class="op2" v-if="item.HStatus == '缁翠慨杩涜涓�'">
- <uni-icons type="smallcircle-filled" size="14" color=""></uni-icons><text>{{item.HStatus}}</text>
+ <uni-icons type="smallcircle-filled" size="14"
+ color=""></uni-icons><text>{{item.HStatus}}</text>
</view>
<view class="op2" v-if="item.HStatus == '缁翠慨缁撴潫'">
- <uni-icons type="smallcircle-filled" size="14" color=""></uni-icons><text>{{item.HStatus}}</text>
+ <uni-icons type="smallcircle-filled" size="14"
+ color=""></uni-icons><text>{{item.HStatus}}</text>
</view>
<view class="op2" v-if="item.HStatus == '缁翠慨缁堟'">
- <uni-icons type="smallcircle-filled" size="14" color=""></uni-icons><text>{{item.HStatus}}</text>
+ <uni-icons type="smallcircle-filled" size="14"
+ color=""></uni-icons><text>{{item.HStatus}}</text>
</view>
</view>
- </view>
-<!-- <view class="card-detail" v-if="showDetail == index">
- <view class="detail" v-if="moreData.HSourceBillNo">
- <text>褰撳墠璁㈠崟锛�</text>{{moreData.HSourceBillNo}}
+ <!-- 鍒犻櫎鎸夐挳 -->
+ <view class="delete-btn" @tap.stop="deleteResource(item.HSourceID, index)" v-if="item.HSourceID">
+ <uni-icons type="closeempty" size="20" color="#da0000"></uni-icons>
</view>
- <view class="detail" v-if="moreData.HMaterName">
- <text>鐗╂枡鍚嶇О锛�</text>{{moreData.HMaterName}}
- </view>
- </view> -->
-
-<!-- <view class="more" v-if="showDetail == index && operations != index">
- <view class="part" style="border-right: 1px solid #eee;" @tap.stop="showMore(item,index)">
- <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
- </view>
- <view class="part" @tap.stop="operations = operations==index?-1:index">
- <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
- </view>
- </view>
- <view class="more" v-if="showDetail != index && operations != index">
- <view class="part" style="border-right: 1px solid #eee;" @tap.stop="showMore(item,index)">
- <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
- </view>
- <view class="part" @tap.stop="operations = operations==index?-1:index">
- <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
- </view>
- </view> -->
-
- <view class="op" v-if="operations == index">
- <button class="op1" size="mini" plain @tap.stop="check(item)">寮�宸�</button>
-<!-- <button class="op1" size="mini" plain @tap.stop="check(item)">瀹屽伐</button>
- <button class="op2" size="mini" plain @tap.stop="antiCheck(item)">鍋滃伐</button> -->
- <button class="op3" size="mini" plain @tap.stop="edit(item)">姹囨姤</button>
- <button class="op4" size="mini" plain @tap.stop="del(item)">寮傚父鐢宠</button>
- <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
</uni-card>
</view>
-
+
<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
@@ -115,102 +86,99 @@
</template>
<script>
- import { getUserInfo } from "@/utils/auth.js";
+ import {
+ getUserInfo
+ } from "@/utils/auth.js";
export default {
- data() {
- return {
- userInfo:getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
- tabs:0,
- status:'鍏ㄩ儴',
- hform:{
- HNumber:'',
- HName:'',
- },
- sWhere:'',
- listData:[],
- moreData:[],
- showList:[],
- showDetail:-1,
- operations:-1,
-
- page:1,
- }
- },
+ data() {
+ return {
+ userInfo: getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ tabs: 0,
+ status: '鍏ㄩ儴',
+
+ sWhere: '',
+ listData: [],
+ showList: [],
+ showDetail: -1,
+ operations: -1,
+
+ page: 1,
+ }
+ },
onLoad() {
- this.getList()
- // console.log(this.userInfo,uni.getStorageSync('HUserName'))
+ // 鐩戝惉鍒锋柊浜嬩欢
+ uni.$on('refreshDeviceList', () => {
+ this.getList();
+ });
+ this.getList();
+ },
+ onUnload() {
+ // 绉婚櫎浜嬩欢鐩戝惉
+ uni.$off('refreshDeviceList');
},
onReachBottom: function() {
this.page++
setTimeout(() => {
- this.showList = this.showList.concat(this.getPage(this.page,this.listData))
+ this.showList = this.showList.concat(this.getPage(this.page, this.listData))
}, 100)
},
onPullDownRefresh: function() {
this.clear()
- setTimeout(()=>{
+ setTimeout(() => {
uni.stopPullDownRefresh();
}, 1000);
},
- methods: {
- getPage(page,list){
+ methods: {
+ getPage(page, list) {
let sindex = (parseInt(page) - 1) * 20
let eindex = parseInt(page) * 20
- let newList = list.slice(sindex,eindex)
+ let newList = list.slice(sindex, eindex)
return newList
},
- changeTab(e){
+ changeTab(e) {
this.tabs = e
this.page = 1
this.showList = []
- if(this.tabs == 0){
+ if (this.tabs == 0) {
this.status = '鍏ㄩ儴'
this.getList()
- // this.showList = this.getPage(this.page,this.listData)
}
- if(this.tabs == 1){
+ if (this.tabs == 1) {
this.status = '杩愯'
this.getList()
- // this.showList = this.getPage(this.page,this.listData)
}
- if(this.tabs == 2){
+ if (this.tabs == 2) {
this.status = '寰呮満'
this.getList()
- // this.showList = this.getPage(this.page,this.listData)
}
- if(this.tabs == 3){
+ if (this.tabs == 3) {
this.status = '鍋滄満'
this.getList()
- // this.showList = this.getPage(this.page,this.listData)
}
},
- getList(){
- // console.log(this.sWhere)
- uni.showLoading({
- title:'鍔犺浇涓�...'
- })
+ getList() {
uni.request({
- url: this.serverUrl + '/ReportPlatForm/SearchGetLineBindBillListStatus',
- data:{
- HStatus:this.status,
+ url: this.serverUrl + '/ReportPlatForm/SearchGetLineBindBillListStatus',
+ data: {
+ HStatus: this.status,
HUserName: uni.getStorageSync('HUserName')
},
- success: (res) => {
- console.log(1,res.data);
- if(res.data.count == 1){
+ success: (res) => {
+ console.log(1, res.data);
+ if (res.data.count == 1) {
this.listData = res.data.data.h_p_JIT_GetSourceInfoByUser
console.log(this.listData.length)
- this.showList = this.getPage(this.page,this.listData)
- setTimeout(()=>{
- uni.hideLoading()
+ this.showList = this.getPage(this.page, this.listData)
+ setTimeout(() => {
+ uni.hideLoading()
}, 1000)
- }else{
+ } else {
this.listData = []
uni.hideLoading()
uni.showToast({
- title:res.data.Message,
- icon:'none'
+ title: res.data.Message,
+ icon: 'none'
})
}
},
@@ -218,285 +186,230 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- },
- //閫夋嫨鍗曟嵁鏃ユ湡
- BenginHCreateDateChange(e){
- console.log(e.detail.value)
- this.hform.BenginHCreateDate = e.detail.value
- },
- //閫夋嫨鍗曟嵁鏃ユ湡
- EndHCreateDateChange(e){
- console.log(e.detail.value)
- this.hform.EndHCreateDate = e.detail.value
- },
- //鎼滅储
- search(){
- this.sWhere = ''
- this.listData = []
- this.page = 1
- this.showList = []
-
- console.log(this.hform)
- if (this.hform.HNumber) {
- this.sWhere += " and 璁惧浠ｇ爜 like '%" + this.hform.HNumber + "%'";
- }
- if (this.hform.HName) {
- this.sWhere += " and 璁惧鍚嶇О like '%" + this.hform.HName + "%'";
- }
-
- this.getList()
- },
- //鏂板
- creat(){
- uni.navigateTo({
- url:'/pages/shebeidangan/Gy_EquipFileMainBill'
- })
- },
- //閲嶇疆
- clear(){
- this.listData = []
- this.page = 1
- this.showList = []
-
- this.sWhere = ''
- this.showDetail = -1,
- this.operations = -1,
- this.hform = {
- HNumber:'',
- HName:'',
- }
- this.getList()
- },
- //鏇村
- showMore(item,index){
- this.showDetail = this.showDetail==index?-1:index
- console.log(item)
- uni.request({
- url: this.serverUrl + '/ReportPlatForm/SearchGetWorkBillList',
- data:{
- HSourceID: item.HSourceID
- },
- success: (res) => {
- console.log(2,res.data.data);
- if(res.data.count == 1){
- this.moreData = res.data.data.h_p_JIT_GetWorkBillListInfoBySource1 //鏃堕棿鐐逛骇閲�
- console.log(2,this.moreData);
- this.$forceUpdate()
- }else{
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.hideLoading()
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
})
},
});
},
//宸ュ崟鍒楄〃
- toList(item){
+ toList(item) {
uni.navigateTo({
- url:'./list?HSourceID=' + item.HSourceID + '&HSourceName=' + item.HSourceName,
+ url: './DayPlanBillList?HSourceID=' + item.HSourceID + '&HSourceName=' + item.HSourceName,
+ success: () => {
+ // 璁剧疆椤甸潰杩斿洖鏃堕渶瑕佸埛鏂扮殑鏍囧織
+ this.needRefresh = true;
+ }
})
},
- //缂栬緫
- edit(item){
- console.log(item)
+ // 娣诲姞鐢熶骇璧勬簮
+ addResource() {
uni.navigateTo({
- url:'/pages/shebeidangan/Gy_EquipFileMainBill?hmainid=' + item.hmainid
+ url: './AddLineBind', // 浣犻渶瑕佸垱寤鸿繖涓〉闈�
+ success: () => {
+ // 璁剧疆椤甸潰杩斿洖鏃堕渶瑕佸埛鏂扮殑鏍囧織
+ this.needRefresh = true;
+ }
})
},
- //鍒犻櫎
- del(item){
- console.log(item)
+ // 鍒犻櫎鐢熶骇璧勬簮
+ deleteResource(HSourceID, index) {
uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ title: '鍒犻櫎纭',
+ content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
+ success: (res) => {
+ if (res.confirm) {
+ uni.showLoading({
+ title: '鍒犻櫎涓�...'
+ })
uni.request({
- url: this.serverUrl + '/Gy_EquipFileMain/Delete_EquipFile',
- data:{
- HItemID: item.hmainid,
+ url: this.serverUrl + '/ReportPlatForm/DeleteGetLineBindBillList',
+ method: 'GET',
+ data: {
+ HSourceID: HSourceID,
user: uni.getStorageSync('HUserName')
},
- success: (res) => {
- console.log(1,res);
- if(res.data.count == 1){
- this.clear()
+ success: (res) => {
+ uni.hideLoading()
+ if (res.data.count > 0) {
+ // 閲嶇疆鍒嗛〉鍙傛暟
+ this.page = 1
+ this.listData = []
+ this.showList = []
+ // 閲嶆柊鑾峰彇鏁版嵁
+ this.getList()
+ } else {
+ uni.showToast({
+ title: res.data.Message || '鍒犻櫎澶辫触',
+ icon: 'none'
+ })
}
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
},
- fail: (res) => {
- console.log(res);
+ fail: () => {
+ uni.hideLoading()
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
+ title: '鍒犻櫎澶辫触',
+ icon: 'none'
})
- },
- });
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- }
- }
- });
+ }
+ })
+ }
+ }
+ })
},
- // //瀹℃牳
- // check(item){
- // console.log(item)
- // if (item.HBillStatus > 0) {
- // uni.showToast({
- // title:'鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒'
- // })
- // }
- // },
- // //鍙嶅鏍�
- // antiCheck(item){
-
- // },
- }
+ }
}
</script>
+
<style lang="scss" scoped>
- .form{
+ .form {
width: 640rpx;
margin: 20rpx auto;
}
- .tabs{
+
+ .tabs {
width: 100%;
display: flex;
- view{
+
+ view {
width: 25%;
font-size: 30rpx;
color: #555;
text-align: center;
padding: 16rpx 0;
}
- .on{
+
+ .on {
color: #3a78ff;
font-weight: bold;
border-bottom: 3px solid #3a78ff;
}
}
- .form-item{
+
+ .form-item {
display: flex;
align-items: center;
font-size: 28rpx;
padding: 6rpx 0;
- .title{
+
+ .title {
width: 180rpx;
- text{
+
+ text {
color: red;
font-weight: bold;
}
}
- .right{
+
+ .right {
width: 450rpx;
border-radius: 22rpx;
border: 1px solid #acacac;
}
- .righton{
+
+ .righton {
width: 450rpx;
border-radius: 22rpx;
border: 1px solid #e4e4e4;
background-color: #e4e4e4;
}
- input{
+
+ input {
width: 100%;
padding: 8rpx 20rpx;
font-size: 30rpx;
}
}
- .buttons{
+
+ .buttons {
width: 100%;
display: flex;
justify-content: center;
margin-top: 20rpx;
- button{
+
+ button {
border-radius: 50rpx;
width: 180rpx;
height: 66rpx;
line-height: 66rpx;
font-size: 28rpx;
}
- .btn-a{
+
+ .btn-a {
background-color: #acacac;
color: #fff;
}
- .btn-b{
+
+ .btn-b {
background-color: #41a863;
color: #fff;
}
- .btn-c{
+
+ .btn-c {
background-color: #3a78ff;
color: #fff;
}
}
-
- .list{
+
+ .list {
width: 100%;
- .card-main{
+
+ .card-main {
display: flex;
- image{
+
+ image {
width: 160rpx;
height: 160rpx;
margin-right: 30rpx;
}
- .right{
+
+ .right {
font-size: 26rpx;
margin-bottom: 12rpx;
color: #555;
- text{
+
+ text {
color: #999;
}
}
}
- .card-detail{
+
+ .card-detail {
width: 100%;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
line-height: 120%;
- .detail{
+
+ .detail {
// width: 50%;
font-size: 26rpx;
margin-bottom: 12rpx;
color: #555;
margin-right: 20rpx;
- text{
+
+ text {
color: #999;
font-size: 26rpx;
}
}
}
- .more{
+
+ .more {
color: #888;
font-size: 24rpx;
display: flex;
border-top: 1px solid #eee;
padding-top: 20rpx;
- .part{
+
+ .part {
width: 50%;
text-align: center;
}
}
- .op{
+
+ .op {
display: flex;
// justify-content: space-around;
// margin-top: 20rpx;
@@ -508,57 +421,108 @@
position: absolute;
right: 30rpx;
bottom: 30rpx;
- text{
+
+ text {
margin-right: 10rpx;
font-weight: bold;
font-size: 28rpx;
}
- button{
+
+ button {
padding: 0;
width: 150rpx;
font-size: 25rpx;
}
- .op1{
+
+ .op1 {
// border: 1px solid #41a863;
color: #41a863;
- background-color: rgba( #41a863, .15);
+ background-color: rgba(#41a863, .15);
padding: 2rpx 10rpx;
border-radius: 4rpx;
box-shadow: 2rpx 2rpx 6rpx 0 #acacac;
}
- .op2{
+
+ .op2 {
// border: 1px solid #d98d00;
color: #d98d00;
- background-color: rgba( #d98d00, .15);
+ background-color: rgba(#d98d00, .15);
padding: 2rpx 10rpx;
border-radius: 4rpx;
box-shadow: 2rpx 2rpx 6rpx 0 #acacac;
}
- .op3{
+
+ .op3 {
// border: 1px solid #3a78ff;
color: #3a78ff;
- background-color: rgba( #3a78ff, .15);
+ background-color: rgba(#3a78ff, .15);
padding: 2rpx 10rpx;
border-radius: 4rpx;
box-shadow: 2rpx 2rpx 6rpx 0 #acacac;
}
- .op4{
+
+ .op4 {
// border: 1px solid #da0000;
color: #da0000;
- background-color: rgba( #da0000, .15);
+ background-color: rgba(#da0000, .15);
padding: 2rpx 10rpx;
border-radius: 4rpx;
box-shadow: 2rpx 2rpx 6rpx 0 #acacac;
}
- .op5{
+
+ .op5 {
// border: 1px solid #888;
color: #888;
- background-color: rgba( #888, .15);
+ background-color: rgba(#888, .15);
padding: 2rpx 10rpx;
border-radius: 4rpx;
box-shadow: 2rpx 2rpx 6rpx 0 #acacac;
}
}
- }
-</style>
+ // 鍒犻櫎鎸夐挳鏍峰紡
+ .delete-btn {
+ position: absolute;
+ top: 10rpx;
+ right: 10rpx;
+ width: 50rpx;
+ height: 50rpx;
+ background-color: rgba(255, 255, 255, 0.9);
+ border-radius: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.15);
+ z-index: 10;
+ }
+
+ // 娣诲姞璧勬簮鍗＄墖鏍峰紡 - 澶у皬缂╁皬涓�鍗�
+ .add-resource {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ height: 120rpx;
+ /* 浠�300rpx缂╁皬鍒�150rpx */
+ border: 2rpx dashed #3a78ff;
+ border-radius: 16rpx;
+ background-color: #f8fafc;
+
+ .add-icon {
+ font-size: 50rpx;
+ /* 浠�100rpx缂╁皬鍒�50rpx */
+ color: #3a78ff;
+ line-height: 1;
+ margin-bottom: 10rpx;
+ /* 浠�20rpx缂╁皬鍒�10rpx */
+ }
+
+ .add-text {
+ font-size: 24rpx;
+ /* 浠�32rpx缂╁皬鍒�24rpx */
+ color: #3a78ff;
+ text-align: center;
+ }
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/pages/baogong/OA_ErrMsgBackBill.vue b/pages/baogong/OA_ErrMsgBackBill.vue
new file mode 100644
index 0000000..591952e
--- /dev/null
+++ b/pages/baogong/OA_ErrMsgBackBill.vue
@@ -0,0 +1,1159 @@
+<template>
+ <view>
+ <!-- 椤电鍖哄煙 -->
+ <view class="tabs" id="tabs">
+ <view class="tabs">
+ <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+ <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鍏朵粬淇℃伅</view>
+ <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍒跺崟淇℃伅</view>
+ </view>
+ </view>
+ <!-- 鍩烘湰淇℃伅 -->
+ <template v-if="tabs == 0">
+ <view class="form" :style="{height: containerHeight + 'px',overflow: 'auto' }">
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙�:</view>
+ <view class="righton">
+ <input name="HBillNo" disabled v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鏃ユ湡:</view>
+ <view class="righton">
+ <input name="HDate" disabled v-model="hform.HDate" placeholder="璇烽�夋嫨" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">涓婚:</view>
+ <view class="right">
+ <input name="HContext" v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
+ </view>
+ </view>
+ <view class="form-item" style="align-items: flex-start;">
+ <view class="title"><text>*</text>璇︾粏鍐呭:</view>
+ <view class="right" style="min-height: 150rpx;">
+ <textarea name="HDescription" v-model="hform.HDescription" auto-height maxlength="-1"
+ placeholder="璇疯緭鍏ヨ缁嗗唴瀹�"></textarea>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">寮傚父绫诲瀷:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHErrMsgBackTypeName" placeholder="璇烽�夋嫨"
+ v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍙戦�侀儴闂�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+ @input="HDeptNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍙戦�佷汉:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鍙戦�佷汉" v-model="hform.HSendMan"
+ @input="HSendManChange"></uni-combox>
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="title"><text>*</text>鎺ユ敹浜�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎺ユ敹浜�" v-model="hform.HReceiveMan"
+ @input="HReceiveManChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">澶勭悊浜�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨澶勭悊浜�" v-model="hform.HHandleEmpName"
+ @input="HHandleEmpNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璐ｄ换浜�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨璐ｄ换浜�" v-model="hform.HBadProcManName"
+ @input="HBadProcManNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">闂鏉ユ簮:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHForm" placeholder="璇烽�夋嫨闂鏉ユ簮" v-model="hform.HForm"
+ @input="HFormChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇璧勬簮:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨" v-model="hform.HSourceName"
+ @input="HSourceNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">杞﹂棿:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHCenterName" placeholder="璇烽�夋嫨" v-model="hform.HCenterName"
+ @input="HCenterNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浜у搧缂栫爜:</view>
+ <view class="right">
+ <input name="HMaterNumber" v-model="hform.HMaterNumber" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浜у搧鍚嶇О:</view>
+ <view class="right">
+ <input name="HMaterName" v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瑙勬牸鍨嬪彿:</view>
+ <view class="right">
+ <input name="HMaterModel" v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">娑夊強鏁伴噺:</view>
+ <view class="right">
+ <input name="HQty" type="number" v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鐢熶骇鐝:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHShiftsName" placeholder="璇烽�夋嫨" v-model="hform.HShiftsName"
+ @input="HShiftsNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">褰卞搷闈㈢▼搴�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEffect" placeholder="璇烽�夋嫨褰卞搷闈㈢▼搴�" v-model="hform.HErrLev"
+ @input="HEffectChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">澶囨敞:</view>
+ <view class="right" style="min-height: 150rpx;">
+ <input name="HRemark" v-model="hform.HRemark" placeholder="" />
+ </view>
+ </view>
+ </view>
+ </template>
+ <!-- 鍏朵粬淇℃伅 -->
+ <template v-if="tabs == 1">
+ <view class="form">
+ <view class="form-item">
+ <view class="title">鎺ユ敹閮ㄩ棬:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HRecDeptName"
+ @input="HRecDeptChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鎶勯�佷汉:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎶勯�佷汉" v-model="hform.HCopyMan"
+ @input="HCopyManChange" multiple></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">QE璐ｄ换浜�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨QE璐ｄ换浜�" v-model="hform.HQEManName"
+ @input="HQEManNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">绱ф�ョ▼搴�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHLevel" placeholder="璇烽�夋嫨绱ф�ョ▼搴�" v-model="hform.HLevel"
+ @input="HLevelChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍙戦�佺被鍨�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHSendType" placeholder="璇烽�夋嫨鍙戦�佺被鍨�" v-model="hform.HSendType"
+ @input="HSendTypeChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍌績娆℃暟:</view>
+ <view class="right">
+ <input name="HHasten" type="number" v-model="hform.HHasten" placeholder="璇疯緭鍏ュ偓淇冩鏁�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍙樺寲鐐�:</view>
+ <view class="right">
+ <input name="HChangeNote" v-model="hform.HChangeNote" placeholder="璇疯緭鍏ュ彉鍖栫偣" />
+ </view>
+ </view>
+
+ <view class="form-item">
+ <view class="title">鍗曟嵁绫诲瀷:</view>
+ <view class="righton">
+ <input name="HBillTypeName" disabled v-model="hform.HBillTypeName" placeholder="璇疯緭鍏ュ崟鎹被鍨�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙风爜:</view>
+ <view class="righton">
+ <input name="HPlanBillNo" disabled v-model="hform.HPlanBillNo" placeholder="璇疯緭鍏ュ崟鎹彿鐮�" />
+ </view>
+ </view>
+ </view>
+ </template>
+ <!-- 鍒跺崟淇℃伅 -->
+ <template v-if="tabs == 2">
+ <view class="form">
+ <view class="form-item">
+ <view class="title">鍒跺崟浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HMaker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍒跺崟鏃ユ湡:</view>
+ <view class="righton">
+ <input name="HMakeDate" disabled v-model="hform.HMakeDate" placeholder="" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HUpDater" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼鏃ユ湡:</view>
+ <view class="righton">
+ <input name="HUpDateDate" disabled v-model="hform.HUpDateDate" placeholder="" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HChecker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳鏃ユ湡:</view>
+ <view class="righton">
+ <input name="HCheckDate" disabled v-model="hform.HCheckDate" placeholder="" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浣滃簾浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HDeleteMan" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浣滃簾鏃ユ湡:</view>
+ <view class="righton">
+ <input name="HDeleteDate" disabled v-model="hform.HDeleteDate" placeholder="" />
+ </view>
+ </view>
+ </view>
+ </template>
+ <view class="buttons" id="buttons">
+ <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <view style="flex: 1;"></view>
+ <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+ <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ </view>
+ </view>
+</template>
+<script>
+ import dayjs from "dayjs";
+ import {
+ CommonUtils
+ } from "@/utils/common";
+ import getDateTime from '@/utils/getdateTime.js';
+ import {
+ getUserInfo
+ } from "../../utils/auth";
+ import "@/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss"
+ export default {
+ data() {
+ return {
+ tabs: 0,
+ tabsBottom: 0,
+ userInfo: getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ OperationType: 1,
+ refSav: "",
+
+ arrayHLevel: ['鏅��', '绱ф��'],
+ arrayHForm: ['浜�', '鏈�', '鏂�', '娉�', '鐜�', '娴�'],
+ arrayHEffect: ['鍋滅嚎', '鎵归噺涓嶈壇', '鍋跺彂涓嶈壇', '鏃犳硶鍒ゆ柇'],
+ arrayHSendType: ['鍏叡', '涓汉'],
+
+ // 浜哄憳鐩稿叧鏁扮粍
+ arrayHEmpName: [], // 鎺ユ敹浜� 鍙戦�佷汉 澶勭悊浜� 璐ｄ换浜� 鎶勯�佷汉 QE璐ｄ换浜�
+ HEmpNameList: [],
+
+
+ // 鍏朵粬鏁扮粍
+ arrayHDeptName: [], // 鎺ユ敹銆佸彂閫侀儴闂�
+ HDeptNameList: [],
+ arrayHErrMsgBackTypeName: [], // 寮傚父鍙嶉绫诲瀷
+ HErrMsgBackTypeNameList: [],
+ arrayHSourceName: [], //鐢熶骇璧勬簮
+ HSourceNameList: [],
+ arrayHCenterName: [], //宸ヤ綔涓績
+ HCenterNameList: [],
+ arrayHShiftsName: [], //鐢熶骇鐝
+ HShiftsNameList: [],
+
+ isEdit: false,
+ eData: {
+ HICMOBillNo: '',
+ HSourceName: '',
+ HSourceBillNo: '',
+ HType: '',
+ OperationType: '',
+ linterid: '',
+ HSouceBillType: '',
+ },
+
+ hform: {
+ HBillNo: '',
+ HInterID: '',
+ HDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
+ HContext: '',
+ HDescription: '',
+ HRemark: '',
+
+ HErrMsgBackTypeName: '',
+ HErrMsgBackTypeID: '0',
+ HDeptName: getUserInfo().HDeptName,
+ HDeptID: getUserInfo().HDeptID,
+ HSendMan: getUserInfo().Czymc,
+ HReceiveMan: '',
+ HHandleEmpName: '',
+ HHandleEmpID: '0',
+ HCopyMan: '',
+ HBadProcManName: '',
+ HBadProcMan: '0',
+ HQEManName: '',
+ HQEMan: '0',
+ HRecDeptName: getUserInfo().HDeptName,
+ HRecDeptID: getUserInfo().HDeptID,
+
+ HLevel: '鏅��',
+ HBillTypeName: '',
+ HPlanBillNo: '',
+ HMaterNumber: '',
+ HMaterName: '',
+ HMaterModel: '',
+
+ // 鏂版坊鍔犵殑瀛楁
+ HHasten: 0, // 鍌績娆℃暟
+ HChangeNote: '', // 鍙樺寲鐐�
+ HShiftsName: '', // 鐢熶骇鐝
+ HShiftsID: '0', // 鐢熶骇鐝ID
+ HErrLev: '', // 褰卞搷闈㈢▼搴�
+ HForm: '浜�', // 闂鏉ユ簮
+ HSendType: '鍏叡', // 鍙戦�佺被鍨�
+ HReTransmitMan: '', // 杞彂鑷�
+ HSourceName: '', // 鐢熶骇璧勬簮
+ HSourceID: '0', // 鐢熶骇璧勬簮ID
+ HCenterName: getUserInfo().HWorkCenter, // 杞﹂棿
+ HCenterID: getUserInfo().HWorkCenterID, // 杞﹂棿ID
+ HQty: 0, // 鏁伴噺
+ HDeleteMan: '', // 浣滃簾浜�
+ HDeleteDate: '', // 浣滃簾鏃ユ湡
+
+ HMainSourceBillNo: '',
+ HMainSourceInterID: '0',
+ HMainSourceEntryID: '0',
+ HMainSourceBillType: '',
+
+ HMaker: getUserInfo().Czymc,
+ HMakeDate: getDateTime.dateTimeStr('y-m-d h:i:s'),
+ HUpDater: '',
+ HUpDateDate: '',
+ HChecker: '',
+ HCheckDate: '',
+ }
+ }
+ },
+ onLoad(e) {
+ this.getListData()
+ if (!e.OperationType) {
+ this.OperationType = 1
+ } else {
+ this.OperationType = e.OperationType
+ }
+
+ if (this.OperationType == 1) {
+ // 鏂板
+ this.getMaxNum()
+ } else if (this.OperationType == 2) {
+ // 鏈夋簮鍗�
+ this.getMaxNum()
+ } else if (this.OperationType == 3) {
+ // 缂栬緫
+ this.getEditData(e.hmainid)
+ } else if (this.OperationType == 4) {
+ // 鎶ュ伐鍙拌烦杞�
+ this.getMaxNum()
+ this.set_Sc_ICMOBillStatus(e.HSourceBillNo, e.HType, e.HSourceName); //鍥炲～淇℃伅
+ this.hform.HContext = e.HType
+ }
+ },
+ computed: {
+ containerHeight: {
+ get() {
+ return this.btnTop - this.tabsBottom - 5
+ }
+ }
+ },
+ onReady() {
+ const query = uni.createSelectorQuery().in(this)
+ query.select("#buttons")
+ .boundingClientRect()
+ .select("#tabs")
+ .boundingClientRect()
+ .exec(res => {
+ this.btnTop = Math.floor(res[0].top)
+ this.tabsBottom = Math.ceil(res[1].bottom)
+ })
+ },
+ methods: {
+ //閫夋嫨鍙戦�侀儴闂�
+ HDeptNameChange(e) {
+ for (var i = 0; i < this.HDeptNameList.length; i++) {
+ if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+ this.hform.HDeptID = this.HDeptNameList[i].HItemID;
+ break;
+ }
+ }
+ },
+ //閫夋嫨鎺ユ敹閮ㄩ棬
+ HRecDeptNameChange(e) {
+ for (var i = 0; i < this.HDeptNameList.length; i++) {
+ if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+ this.hform.HRecDeptID = this.HDeptNameList[i].HItemID;
+ break;
+ }
+ }
+ },
+ //閫夋嫨寮傚父鍙嶉绫诲瀷
+ HErrMsgBackTypeNameChange(e) {
+ for (var i = 0; i < this.HErrMsgBackTypeNameList.length; i++) {
+ if (this.HErrMsgBackTypeNameList[i].寮傚父鍙嶉绫诲瀷鍚嶇О == e) {
+ this.hform.HErrMsgBackTypeName = this.HErrMsgBackTypeNameList[i].寮傚父鍙嶉绫诲瀷鍚嶇О;
+ this.hform.HErrMsgBackTypeID = this.HErrMsgBackTypeNameList[i].HItemID;
+ break;
+ }
+ }
+ },
+ //閫夋嫨鍙戦�佷汉
+ HSendManChange(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+
+ }
+ }
+ },
+ //閫夋嫨鎺ユ敹浜�
+ HReceiveManChange(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+
+ }
+ }
+ },
+ //閫夋嫨澶勭悊浜�
+ HHandleEmpNameChange(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+ this.hform.HHandleEmpID = this.HEmpNameList[i].HItemID
+ }
+ }
+ },
+ //閫夋嫨鎶勯�佷汉
+ HCopyManChange(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+
+ }
+ }
+ },
+ //閫夋嫨鎶勯�佷汉
+ HBadProcManNameChange(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+ this.hform.HBadProcMan = this.HEmpNameList[i].HItemID
+ }
+ }
+ },
+ //閫夋嫨QE璐ｄ换浜�
+ HQEManNameChange(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+ this.hform.HQEMan = this.HEmpNameList[i].HItemID
+ }
+ }
+ },
+ //閫夋嫨鐢熶骇璧勬簮
+ HSourceNameChange(e) {
+ for (var i = 0; i < this.HSourceNameList.length; i++) {
+ if (this.HSourceNameList[i].鐢熶骇璧勬簮 == e) {
+ this.hform.HSourceName = this.HSourceNameList[i].鐢熶骇璧勬簮;
+ this.hform.HSourceID = this.HSourceNameList[i].HItemID;
+ break;
+ }
+ }
+ },
+ //閫夋嫨杞﹂棿
+ HCenterNameChange(e) {
+ for (var i = 0; i < this.HCenterNameList.length; i++) {
+ if (this.HCenterNameList[i].宸ヤ綔涓績 == e) {
+ this.hform.HCenterName = this.HCenterNameList[i].宸ヤ綔涓績;
+ this.hform.HCenterID = this.HCenterNameList[i].HItemID;
+ break;
+ }
+ }
+ },
+ //閫夋嫨鐢熶骇鐝
+ HShiftsNameChange(e) {
+ for (var i = 0; i < this.HShiftsNameList.length; i++) {
+ if (this.HShiftsNameList[i].鐝鍚嶇О == e) {
+ this.hform.HShiftsName = this.HShiftsNameList[i].鐝鍚嶇О;
+ this.hform.HShiftsID = this.HShiftsNameList[i].HItemID;
+ break;
+ }
+ }
+ },
+ // 闈欐�佷笅鎷夋閫夋嫨鏂规硶
+ HLevelChange(e) {
+ this.hform.HLevel = e;
+ },
+ HFormChange(e) {
+ this.hform.HForm = e;
+ },
+ HEffectChange(e) {
+ this.hform.HErrLev = e;
+ },
+ HSendTypeChange(e) {
+ this.hform.HSendType = e;
+ },
+ //鏂板鎸夐挳浜嬩欢
+ addNew() {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛岀‘瀹氳鏂板鍚楋紵',
+ success: (res) => {
+ if (res.confirm) {
+ uni.redirectTo({
+ url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill?operationType=1'
+ })
+ // 閲嶆柊鑾峰彇鏈�澶у崟鎹彿
+ this.getMaxNum();
+ // 鍒囨崲鍒板熀鏈俊鎭〉绛�
+ this.tabs = 0;
+ }
+ }
+ });
+ },
+ // 鑾峰彇鎵�鏈夊垪琛ㄦ暟鎹�
+ async getListData() {
+ // 鑾峰彇閮ㄩ棬鍒楄〃
+ await this.getDepartmentList();
+ // 鑾峰彇寮傚父鍙嶉绫诲瀷鍒楄〃
+ await this.getHErrMesTypeList();
+ // 鑾峰彇浜哄憳鍒楄〃锛堟帴鏀朵汉銆佸鐞嗕汉銆佹妱閫佷汉銆佽矗浠讳汉銆丵E璐ｄ换浜猴級
+ await this.getPersonList();
+ // 鑾峰彇鐢熶骇璧勬簮鍒楄〃
+ await this.getSourceList();
+ // 鑾峰彇杞﹂棿鍒楄〃
+ await this.getCenterList();
+ // 鑾峰彇鐢熶骇鐝鍒楄〃
+ await this.getShiftsList();
+ },
+
+ // 鑾峰彇閮ㄩ棬鍒楄〃
+ getDepartmentList() {
+ return new Promise((resolve, reject) => {
+ uni.request({
+ url: this.serverUrl + '/Gy_Department/list',
+ data: {
+ sWhere: "",
+ user: uni.getStorageSync('HUserName'),
+ Organization: uni.getStorageSync('Organization')
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.HDeptNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
+ }
+ this.$forceUpdate();
+ resolve();
+ } else {
+ uni.showToast({
+ title: '鑾峰彇閮ㄩ棬淇℃伅澶辫触',
+ icon: 'none'
+ })
+ reject();
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇閮ㄩ棬淇℃伅澶辫触',
+ icon: 'none'
+ })
+ reject();
+ },
+ });
+ });
+ },
+
+ // 鑾峰彇寮傚父鍙嶉绫诲瀷鍒楄〃
+ getHErrMesTypeList() {
+ return new Promise((resolve, reject) => {
+ uni.request({
+ url: this.serverUrl + '/Web/GetGy_ErrMsgBackTypeList_Json',
+ data: {
+ ErrMsg: "",
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.HErrMsgBackTypeNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHErrMsgBackTypeName[i] = res.data.data[i].寮傚父鍙嶉绫诲瀷鍚嶇О
+ }
+ this.$forceUpdate();
+ resolve();
+ } else {
+ uni.showToast({
+ title: '鑾峰彇寮傚父鍙嶉绫诲瀷淇℃伅澶辫触',
+ icon: 'none'
+ })
+ reject();
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇寮傚父鍙嶉绫诲瀷淇℃伅澶辫触',
+ icon: 'none'
+ })
+ reject();
+ },
+ });
+ });
+ },
+
+ // 鑾峰彇浜哄憳鍒楄〃锛堥�氱敤鏂规硶锛�
+ getPersonList() {
+ return new Promise((resolve, reject) => {
+ uni.request({
+ url: this.serverUrl + '/Web/GetEmployeeList_Json',
+ data: {
+ Employee: '',
+ HGroupID: 0
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.HEmpNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHEmpName[i] = res.data.data[i].HName
+ }
+ this.$forceUpdate();
+ resolve(); // 鎴愬姛鏃秗esolve
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ reject(res.data.Message); // 澶辫触鏃秗eject
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ reject(res); // 澶辫触鏃秗eject
+ },
+ });
+ });
+ },
+
+ // 鑾峰彇鐢熶骇璧勬簮鍒楄〃
+ getSourceList() {
+ return new Promise((resolve, reject) => {
+ uni.request({
+ url: this.serverUrl + '/api/newBill/getSourceList',
+ data: {
+ sWhere: ""
+ },
+ success: (res) => {
+ if (res.data.code == 1) {
+ this.HSourceNameList = res.data.data.Gy_Source
+ for (var i = 0; i < res.data.data.Gy_Source.length; i++) {
+ this.arrayHSourceName[i] = res.data.data.Gy_Source[i].鐢熶骇璧勬簮
+ }
+ this.$forceUpdate();
+ resolve();
+ } else {
+ uni.showToast({
+ title: '鑾峰彇鐢熶骇璧勬簮鍒楄〃澶辫触',
+ icon: 'none'
+ })
+ reject();
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇鐢熶骇璧勬簮鍒楄〃澶辫触',
+ icon: 'none'
+ })
+ reject();
+ },
+ });
+ });
+ },
+
+ // 鑾峰彇宸ヤ綔涓績鍒楄〃
+ getCenterList() {
+ return new Promise((resolve, reject) => {
+ uni.request({
+ url: this.serverUrl + '/api/newBill/getWorkCenterList',
+ data: {
+ sWhere: ""
+ },
+ success: (res) => {
+ if (res.data.code == 1) {
+ this.HCenterNameList = res.data.data.Gy_WorkCenter
+ for (var i = 0; i < res.data.data.Gy_WorkCenter.length; i++) {
+ this.arrayHCenterName[i] = res.data.data.Gy_WorkCenter[i].宸ヤ綔涓績
+ }
+ this.$forceUpdate();
+ resolve();
+ } else {
+ uni.showToast({
+ title: '鑾峰彇杞﹂棿鍒楄〃澶辫触',
+ icon: 'none'
+ })
+ reject();
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇杞﹂棿鍒楄〃澶辫触',
+ icon: 'none'
+ })
+ reject();
+ },
+ });
+ });
+ },
+
+ // 鑾峰彇鐢熶骇鐝鍒楄〃
+ getShiftsList() {
+ return new Promise((resolve, reject) => {
+ uni.request({
+ url: this.serverUrl + '/Web/GetGy_ShiftsList_Json',
+ data: {
+ Shifts: ""
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.HShiftsNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHShiftsName[i] = res.data.data[i].鐝鍚嶇О
+ }
+ this.$forceUpdate();
+ resolve();
+ } else {
+ uni.showToast({
+ title: '鑾峰彇鐢熶骇鐝鍒楄〃澶辫触',
+ icon: 'none'
+ })
+ reject();
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇鐢熶骇鐝鍒楄〃澶辫触',
+ icon: 'none'
+ })
+ reject();
+ },
+ });
+ });
+ },
+ //鏂板
+ getMaxNum() {
+ uni.request({
+ url: this.serverUrl + '/Web/GetMAXNum',
+ data: {
+ HBillType: '4502'
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.hform.HInterID = res.data.data[0].HInterID
+ this.hform.HBillNo = res.data.data[0].HBillNo
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //鎶ュ伐鍙拌烦杞�
+ set_Sc_ICMOBillStatus(HSourceBill, HType, HSourceName) {
+ uni.request({
+ url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_Sc_ICMOBillStatus',
+ type: "GET",
+ data: {
+ "HSourceBill": HSourceBill
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.hform.HMaterNumber = res.data.data[0].鐗╂枡浠ｇ爜 //浜у搧鍚嶇О
+ this.hform.HMaterName = res.data.data[0].鐗╂枡鍚嶇О //浜у搧鍚嶇О
+ this.hform.HMaterModel = res.data.data[0].瑙勬牸鍨嬪彿 //浜у搧瑙勬牸
+ this.hform.HMainSourceBillNo = res.data.data[0].娴佽浆鍗″彿 //婧愬崟鍗曞彿
+ this.hform.HMainSourceInterID = res.data.data[0].娴佽浆鍗′富鍐呯爜 //婧愬崟涓诲唴鐮�
+ this.hform.HMainSourceEntryID = res.data.data[0].娴佽浆鍗″瓙鍐呯爜 //婧愬崟瀛愬唴鐮�
+ this.hform.HMainSourceBillType = 3772 //婧愬崟绫诲瀷
+ this.hform.HQty = res.data.data[0].璁″垝鏁伴噺 //璁″垝鏁伴噺
+ this.hform.HSourceID = res.data.data[0].HSourceID //鐢熶骇璧勬簮id
+ this.hform.HSourceName = res.data.data[0].鐢熶骇璧勬簮 //鐢熶骇璧勬簮
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ uni.request({
+ url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_ErrMsgBackType',
+ type: "GET",
+ data: {
+ "TypeName": HType
+ },
+ success: (res) => {
+ var data = res.data.data[0]
+ if (res.data.count == 1) {
+ this.hform.HErrMsgBackTypeID = data.HItemID
+ this.hform.HErrMsgBackTypeName = data.HName
+ } else {
+ uni.showToast({
+ title: '鑾峰彇寮傚父绫诲瀷鏁版嵁澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇寮傚父绫诲瀷澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ uni.request({
+ url: this.serverUrl + '/Sc_MESTransFerWorkBill/set_EquipFile',
+ type: "GET",
+ data: {
+ "HSourceName": HSourceName
+ },
+ success: (res) => {
+ var data = res.data.data[0]
+ console.log(res.data)
+ if (res.data.count == 1) {
+ this.hform.EquipNumber = data.璁惧缂栫爜
+ } else {
+ uni.showToast({
+ title: '鑾峰彇璁惧缂栫爜澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇璁惧缂栫爜澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+
+ setTimeout(() => {
+ uni.hideLoading()
+ this.hform.HDescription = '寮傚父鍙嶉鍗曞彿:' + this.hform.HBillNo + ',寮傚父绫诲瀷:' + HType + ',璁㈠崟鍙�:' + this
+ .eData.HICMOBillNo + ',娴佽浆鍗″彿:' + this.eData.HICMOBillNo +
+ ', 浜у搧缂栫爜:' + this.hform.HMaterNumber + ',浜у搧鍚嶇О:' + this.hform.HMaterName + ',瑙勬牸鍨嬪彿:' + this
+ .hform.HMaterModel +
+ ',鍙戦�佷汉:' + this.hform.HMaker + ',鍙戠敓鏃堕棿:' + this.hform.HDate + ',鐢熶骇璧勬簮:' + this.hform
+ .HSourceName + ',璁惧缂栫爜:' + this.hform.EquipNumber + ',瀵瑰簲澶勭悊浜�:' + this.hform.HHandleEmpName
+ }, 1000)
+ },
+ //缂栬緫
+ getEditData(HInterID) {
+ uni.showLoading({
+ title: '鍔犺浇涓�'
+ });
+ uni.request({
+ url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_TransFerBillListCheckDetaiL_APP',
+ data: {
+ "HID": HInterID
+ },
+ success: (res) => {
+ uni.hideLoading();
+ console.log('缂栬緫鏁版嵁:', res);
+ if (res.data.code == 1) {
+ const data = res.data.data.OA_ErrMsgBackBillMain[0];
+
+ // 鏄犲皠瀛楁鍒� Vue 涓殑 hform
+ this.hform = {
+ ...this.hform, // 淇濈暀鍘熸湁鐨勯粯璁ゅ��
+ HInterID: data.HInterID,
+ HEntryID: data.HEntryID || '',
+ HBillNo: data.HBillNo || '',
+ HDate: data.HDate ? data.HDate.substr(0, 10) : dayjs(new Date()).format(
+ "YYYY-MM-DD"),
+ HErrMsgBackTypeName: data.HErrMsgBackTypeName || '',
+ HErrMsgBackTypeID: data.HErrMsgBackTypeID || '0',
+ HContext: data.HContext || '',
+ HSendMan: data.HSendMan || '',
+ HDeptID: data.HDeptID || '0',
+ HDeptName: data.HDeptName || '',
+ HRecDeptID: data.HRecDeptID || '0',
+ HRecDeptName: data.HRecDeptName || '',
+ HCenterID: data.HCenterID || '0',
+ HCenterName: data.HCenterName || '',
+ HReceiveMan: data.HReceiveMan || '',
+ HCopyMan: data.HCopyMan || '',
+ HMainSourceInterID: data.HSourceInterID || '0',
+ HMainSourceEntryID: data.HSourceEntryID || '0',
+ HMainSourceBillNo: data.HSourceBillNo || '',
+ HMainSourceBillType: data.HSourceBillType || '',
+ HHasten: data.HHasten || 0,
+ HMaterNumber: data.HMaterNumber || '',
+ HMaterName: data.HMaterName || '',
+ HHandleEmpID: data.HHandleEmpID || '0',
+ HHandleEmpName: data.HHandleEmpName || '',
+ HMaterModel: data.HMaterModel || '',
+ HQty: data.HQty || 0,
+ HForm: data.HForm || '浜�',
+ HChangeNote: data.HChangeNote || '',
+ HNote: data.HNote || '',
+ HBadProcMan: data.HBadProcMan || '0',
+ HBadProcManName: data.HBadProcManName || '',
+ HQEMan: data.HQEMan || '0',
+ HQEManName: data.HQEManName || '',
+ HSourceID: data.HSourceID || '0',
+ HSourceName: data.HSourceName || '',
+ HShiftsID: data.HShiftsID || '0',
+ HShiftsName: data.HShiftsName || '',
+ HDescription: data.HDescription || '',
+ HRemark: data.HRemark || '',
+ HLevel: data.HLevel || '鏅��',
+ HSendType: data.HSendType || '鍏叡',
+ HErrLev: data.HErrLev || '',
+ HMaker: data.HMaker || userInfo.Czymc || '',
+ HMakeDate: data.HMakeDate ? data.HMakeDate.substr(0, 10) : dayjs(
+ new Date()).format("YYYY-MM-DD"),
+ HUpDater: uni.getStorageSync('HUserName') || userInfo.Czymc || '',
+ HUpDateDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HChecker: data.HChecker || '',
+ HCheckDate: data.HCheckDate ? data.HCheckDate.substr(0, 10) : '',
+ HCloseMan: data.HCloseMan || '',
+ HCloseDate: data.HCloseDate ? data.HCloseDate.substr(0, 10) : '',
+ HDeleteMan: data.HDeleteMan || '',
+ HDeleteDate: data.HDeleteDate ? data.HDeleteDate.substr(0, 10) : '',
+ };
+
+ // 璁剧疆鍒跺崟浜轰俊鎭紙濡傛灉涓虹┖鍒欎娇鐢ㄥ綋鍓嶇敤鎴凤級
+ if (!this.hform.HMaker) {
+ this.hform.HMaker = getUserInfo().Czymc;
+ }
+
+ // 璁剧疆淇敼浜轰俊鎭�
+ if (!this.hform.HUpDater) {
+ this.hform.HUpDater = uni.getStorageSync('HUserName') || '';
+ }
+
+ // 璁剧疆鍏朵粬瀛楁锛堝鏋滈渶瑕佸湪鐣岄潰涓婃樉绀猴級
+ if (this.hform.HMainSourceBillNo) {
+ this.hform.HPlanBillNo = this.hform.HMainSourceBillNo;
+ this.hform.HBillTypeName = this.hform.HMainSourceBillType;
+ }
+
+ this.isEdit = true;
+ } else {
+ uni.showToast({
+ title: res.data.msg || '鑾峰彇缂栬緫鏁版嵁澶辫触',
+ icon: 'none'
+ });
+ }
+ },
+ fail: (res) => {
+ uni.hideLoading();
+ console.log('缂栬緫鏁版嵁璇锋眰澶辫触:', res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ });
+ }
+ });
+ },
+ //淇濆瓨
+ submit() {
+ if (!this.hform.HReceiveMan) {
+ uni.showToast({
+ title: '璇烽�夋嫨鎺ユ敹浜�',
+ icon: 'none'
+ })
+ } else {
+ uni.showLoading({
+ title: '璇风◢鍊�'
+ })
+ if (this.OperationType == 1 || this.OperationType == 2 || this.OperationType == 4) {
+ this.refSav = "Add";
+ }
+ //鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
+ if (this.OperationType == 3) {
+ this.refSav = "Update";
+ this.hform.HUpdater = getUserInfo().Czymc;
+ this.hform.HUpdaterDate = dayjs(new Date()).format("YYYY-MM-DD");
+ }
+ var sMainStr = JSON.stringify(this.hform);
+ var sMainSub = sMainStr + ';' + uni.getStorageSync('HUserName') + ';' + this.refSav
+ uni.request({
+ url: this.serverUrl + '/Sc_MESTransFerWorkBill/SaveGetMESTransFerWorkFrom_APP',
+ method: 'POST',
+ dataType: "json",
+ data: {
+ "msg": sMainSub
+ },
+ success: (res) => {
+ console.log(1, res);
+ uni.hideLoading()
+ if (res.data.count == 1) {
+ if (res.data.Verify == "Y") { //鑷姩瀹℃牳
+ this.SaveVerify(res.data.HInterID) //瀹℃牳
+ } else {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill?operationType=1'
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ }
+ }
+ });
+ }
+ }
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ }
+ },
+
+ SaveVerify(HInterID) {
+ var datas = {
+ HInterID: HInterID,
+ IsAudit: 0,
+ CurUserName: getUserInfo().Czymc
+ }
+ uni.request({
+ url: this.serverUrl + '/Sc_MESTransFerWorkBill/AuditTransFerReportList',
+ method: 'GET',
+ dataType: "json",
+ async: true,
+ data: datas,
+ success: (res) => {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill?operationType=1'
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ }
+ }
+ });
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+
+ goBack() {
+ uni.navigateBack()
+ }
+ }
+ }
+</script>
+
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/pages/baogong/abnormal.vue b/pages/baogong/abnormal.vue
deleted file mode 100644
index 1e9f7cd..0000000
--- a/pages/baogong/abnormal.vue
+++ /dev/null
@@ -1,724 +0,0 @@
-<template>
- <view>
- <view class="form">
- <view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
- <view class="righton">
- <input name="HBillNo" disabled v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曟嵁鏃ユ湡:</view>
- <view class="righton">
- <input name="HDate" disabled v-model="hform.HDate" placeholder="璇烽�夋嫨" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">涓婚:</view>
- <view class="right">
- <input name="HContext" v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
- </view>
- </view>
- <view class="form-item" style="align-items: flex-start;">
- <view class="title"><text>*</text>璇︾粏鍐呭:</view>
- <view class="right" style="min-height: 150rpx;">
- <textarea name="HDescription" v-model="hform.HDescription" auto-height maxlength="-1" placeholder="璇疯緭鍏ヨ缁嗗唴瀹�"></textarea>
- </view>
- </view>
- <view class="form-item" style="align-items: flex-start;">
- <view class="title">澶囨敞:</view>
- <view class="right" style="min-height: 150rpx;">
- <textarea name="HRemark" v-model="hform.HRemark" auto-height maxlength="-1" placeholder="璇疯緭鍏ュ娉�"></textarea>
- </view>
- </view>
-
- <view class="tab_area"></view>
-
- <view class="form-item">
- <view class="title">鍙戦�侀儴闂�:</view>
- <view class="righton">
- <input name="HDeptName" disabled v-model="hform.HDeptName" placeholder="" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍙戦�佷汉:</view>
- <view class="righton">
- <input name="HSendMan" disabled v-model="hform.HSendMan" placeholder="" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鎺ユ敹浜�:</view>
- <view class="righton">
- <input name="HReceiveMan" disabled v-model="hform.HReceiveMan" placeholder="" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鎶勯�佷汉:</view>
- <view class="righton">
- <input name="HCopyMan" disabled v-model="hform.HCopyMan" placeholder="" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">璐ｄ换浜�:</view>
- <view class="righton">
- <input name="HBadProcManName" disabled v-model="hform.HBadProcManName" placeholder="" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">QE璐ｄ换浜�:</view>
- <view class="righton">
- <input name="HQEManName" disabled v-model="hform.HQEManName" placeholder="" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鎸囨淳澶勭悊浜�:</view>
- <view class="righton">
- <input name="HHandleEmpName" disabled v-model="hform.HHandleEmpName" placeholder="" />
- </view>
- </view>
-
- <view class="tab_area"></view>
-
- <view class="form-item">
- <view class="title">寮傚父绫诲瀷:</view>
- <view class="righton">
- <input name="HErrMsgBackTypeName" disabled v-model="hform.HErrMsgBackTypeName" placeholder="" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">浜у搧缂栫爜:</view>
- <view class="right">
- <input name="HMaterNumber" v-model="hform.HMaterNumber" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">浜у搧鍚嶇О:</view>
- <view class="right">
- <input name="HMaterName" v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">瑙勬牸鍨嬪彿:</view>
- <view class="right">
- <input name="HMaterModel" v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title"><text>*</text>鏁伴噺:</view>
- <view class="right">
- <input name="HQty" v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">绱ф�ョ▼搴�:</view>
- <view class="right">
- <picker :range="arrayHLevel" v-model="hform.HLevel" @change="HLevelChange">
- <input name="HLevel" disabled v-model="hform.HLevel" placeholder="璇烽�夋嫨绱ф�ョ▼搴�" />
- </picker>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍌績娆℃暟:</view>
- <view class="right">
- <input name="HHasten" v-model="hform.HHasten" placeholder="璇疯緭鍏ュ偓淇冩鏁�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">闂鏉ユ簮:</view>
- <view class="right">
- <picker :range="arrayHForm" v-model="hform.HForm" @change="HFormChange">
- <input name="HForm" disabled v-model="hform.HForm" placeholder="璇烽�夋嫨闂鏉ユ簮" />
- </picker>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍙樺寲鐐�:</view>
- <view class="right">
- <input name="HChangeNote" v-model="hform.HChangeNote" placeholder="璇疯緭鍏ュ彉鍖栫偣" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">褰卞搷闈㈢▼搴�:</view>
- <view class="right">
- <picker :range="arrayHErrLev" v-model="hform.HErrLev" @change="HErrLevChange">
- <input name="HErrLev" disabled v-model="hform.HErrLev" placeholder="璇烽�夋嫨褰卞搷闈㈢▼搴�" />
- </picker>
- </view>
- </view>
-
- <view class="tab_area"></view>
-
- <view class="form-item">
- <view class="title">鐢熶骇璧勬簮:</view>
- <view class="righton">
- <input name="HSourceName" disabled v-model="hform.HSourceName" placeholder="" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐢熶骇鐝:</view>
- <view class="righton">
- <input name="HShiftsName" disabled v-model="hform.HShiftsName" placeholder="" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">婧愬崟鍗曞彿:</view>
- <view class="righton">
- <input name="HMainSourceBillNo" disabled v-model="hform.HMainSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">婧愬崟绫诲瀷:</view>
- <view class="righton">
- <input name="HMainSourceBillType" disabled v-model="hform.HMainSourceBillType" placeholder="璇疯緭鍏ユ簮鍗曠被鍨�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">杞﹂棿:</view>
- <view class="righton">
- <input name="HCenterName" disabled v-model="hform.HCenterName" placeholder="璇疯緭鍏ヨ溅闂�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍙戦�佺被鍨�:</view>
- <view class="right">
- <picker :range="arrayHSendType" v-model="hform.HSendType" @change="HSendTypeChange">
- <input name="HSendType" disabled v-model="hform.HSendType" placeholder="璇烽�夋嫨鍙戦�佺被鍨�" />
- </picker>
- </view>
- </view>
-
- <view class="tab_area"></view>
-
- <view class="form-item">
- <view class="title">鍒跺崟浜�:</view>
- <view class="righton">
- <input v-model="hform.HMaker" disabled/>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍒跺崟鏃ユ湡:</view>
- <view class="righton">
- <input name="HMakeDate" disabled v-model="hform.HMakeDate" placeholder="璇烽�夋嫨鍒跺崟鏃ユ湡" />
- </view>
- </view>
-
- <view class="bottom-btn">
- <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
- <!-- <button class="btn-b" size="mini" @tap="showMask = true">鏂板</button> -->
- <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
- </view>
- </view>
- </view>
-</template>
-<script>
- import getDateTime from '@/utils/getdateTime.js';
- import { getUserInfo } from "@/utils/auth.js";
- export default {
- data() {
- return {
- userInfo:getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
-
- arrayHLevel:['鏅��','绱ф��'],
- arrayHForm:['浜�','鏈�','鏂�','娉�','鐜�','娴�'],
- arrayHErrLev:['鏃犳硶鍒ゆ柇','鍋滅嚎','鎵归噺涓嶈壇','鍋跺彂涓嶈壇'],
- arrayHSendType:['鍏叡','涓汉'],
- isEdit: false,
- eData:{
- HICMOBillNo:'',
- HSourceName:'',
- HSourceBillNo:'',
- HType:'',
- OperationType:'',
- linterid:'',
- HSouceBillType:'',
- },
- hform:{
- HBillNo:'',
- HInterID:'',
- HEntryID:'',
- HDate:getDateTime.dateTimeStr('y-m-d h:i:s'),
- HContext:'',
- HDescription:'',
- HRemark:'',
-
- HDeptName:'',
- HDeptID:'',
- HSendMan:'',
- HReceiveMan:'',
- HCopyMan:'',
- HBadProcManName:'',
- HBadProcMan:0,
- HQEManName:'',
- HQEMan:0,
- HHandleEmpName:'',
- HHandleEmpID:0,
-
- HErrMsgBackTypeID:'',
- HErrMsgBackTypeName:'',
- HMaterNumber:'',
- HMaterName:'',
- HMaterModel:'',
- HQty:'',
- HLevel:'鏅��',
- HHasten:'0',
- HForm:'',
- HChangeNote:'',
- HErrLev:'',
-
- HSourceName:'',
- HSourceID:'',
- HShiftsName:'',
- HShiftsID:0,
- HReTransmitMan:'',
- HMainSourceBillNo:'',
- HMainSourceInterID:'',
- HMainSourceEntryID:'',
- HMainSourceBillType:'',
- HCenterName:'',
- HCenterID:'',
- HSendType:'鍏叡',
-
- EquipNumber:'',
-
- HMaker:getUserInfo().Czymc,
- HMakeDate:getDateTime.dateTimeStr('y-m-d h:i:s'),
- }
- }
- },
- onLoad(e) {
- console.log(e)
- uni.showLoading({
- title:'鏁版嵁鍔犺浇涓�'
- })
- this.eData = e
- this.hform.HErrMsgBackTypeName = e.HType
- //鍒ゆ柇鎿嶄綔绫诲瀷
- if (e.OperationType == 1) {//鏃犳簮鍗�
- this.set_AddFNew();
- }else if (e.OperationType == 2) {//鏈夋簮鍗�
- this.set_AddNew();
- }else if (e.OperationType == 3) {//缂栬緫
- this.set_EditFromGrid();
- }else if (e.OperationType == 4) {
- this.set_AddFNew();
- this.set_Sc_ICMOBillStatus(e.HSourceBillNo,e.HType,e.HSourceName);//鍥炲～淇℃伅
- this.hform.HContext = e.HType
- // this.hform.HDescription = this.generateString(this.hform.HDate, getUserInfo().Czymc, HSourceName1, HICMOBillNo, HTypes, EquipNumber)
- }else if (OperationType == 5) { //鏌ョ湅
- set_EditFromGrid();
- $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
- $('#VerIfySaver').addClass("layui-btn-disabled").attr("disabled", true);
- }
- this.getNewData()
-
- },
- methods: {
- //閫夋嫨绱ф�ョ▼搴�
- HLevelChange(e){
- this.hform.HLevel = this.arrayHLevel[e.detail.value]
- },
- //闂鏉ユ簮
- HFormChange(e){
- this.hform.HForm = this.arrayHForm[e.detail.value]
- },
- //褰卞搷绋嬪害
- HErrLevChange(e){
- this.hform.HErrLev = this.arrayHErrLev[e.detail.value]
- },
- //鍙戦�佺被鍨�
- HSendTypeChange(e){
- this.hform.HSendType = this.arrayHSendType[e.detail.value]
- },
- set_AddFNew() {
- //鍒濆鍩烘湰淇℃伅璧嬪��
- // console.log(getUserInfo())
- this.hform.HDeptID = this.userInfo.HDeptID
- this.hform.HDeptName = this.userInfo.HDept
- this.hform.HSendMan = this.userInfo.Czymc
- this.hform.HCenterName = this.userInfo.HWorkCenter
- this.hform.HCenterID = this.userInfo.HWorkCenterID
- this.hform.HReceiveMan = this.userInfo.Czymc
- },
- set_Sc_ICMOBillStatus(HSourceBill,HType,HSourceName){
- uni.request({
- url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_Sc_ICMOBillStatus',
- type: "GET",
- data: { "HSourceBill": HSourceBill },
- success: (res) => {
- var data = res.data.data[0]
- console.log(HSourceBill,res.data)
- if(res.data.count == 1 ){
- if(res.data.data[0]){
- this.hform.HMaterNumber = data.鐗╂枡浠ｇ爜//浜у搧鍚嶇О
- this.hform.HMaterName = data.鐗╂枡鍚嶇О//浜у搧鍚嶇О
- this.hform.HMaterModel = data.瑙勬牸鍨嬪彿//浜у搧瑙勬牸
- this.hform.HMainSourceBillNo = data.娴佽浆鍗″彿//婧愬崟鍗曞彿
- this.hform.HMainSourceInterID = data.娴佽浆鍗′富鍐呯爜//婧愬崟涓诲唴鐮�
- this.hform.HMainSourceEntryID = data.娴佽浆鍗″瓙鍐呯爜//婧愬崟瀛愬唴鐮�
- this.hform.HMainSourceEntryID = data.娴佽浆鍗″瓙鍐呯爜//婧愬崟瀛愬唴鐮�
- this.hform.HMainSourceBillType = 3772//婧愬崟绫诲瀷
- this.hform.HQty = data.璁″垝鏁伴噺//璁″垝鏁伴噺
- this.hform.HSourceID = data.HSourceID//鐢熶骇璧勬簮id
- this.hform.HSourceName = data.鐢熶骇璧勬簮//鐢熶骇璧勬簮
- }
- }else{
- uni.showToast({
- title:'鑾峰彇浜у搧鍩烘湰淇℃伅澶辫触',
- icon:'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- uni.request({
- url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_ErrMsgBackType',
- type: "GET",
- data: { "TypeName": HType },
- success: (res) => {
- var data = res.data.data[0]
- // console.log(res.data)
- if(res.data.count == 1 ){
- this.hform.HErrMsgBackTypeID = data.HItemID
- this.hform.HErrMsgBackTypeName = data.HName
- }else{
- uni.showToast({
- title:'鑾峰彇寮傚父绫诲瀷鏁版嵁澶辫触',
- icon:'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title:'鑾峰彇寮傚父绫诲瀷澶辫触',
- icon:'none'
- })
- },
- });
- uni.request({
- url: this.serverUrl + '/Sc_MESTransFerWorkBill/set_EquipFile',
- type: "GET",
- data: { "HSourceName": HSourceName },
- success: (res) => {
- var data = res.data.data[0]
- console.log(res.data)
- if(res.data.count == 1 ){
- this.hform.EquipNumber = data.璁惧缂栫爜
- }else{
- uni.showToast({
- title:'鑾峰彇璁惧缂栫爜澶辫触',
- icon:'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title:'鑾峰彇璁惧缂栫爜澶辫触',
- icon:'none'
- })
- },
- });
-
- setTimeout(()=>{
- uni.hideLoading()
- this.hform.HDescription = '寮傚父鍙嶉鍗曞彿:' + this.hform.HBillNo + ',寮傚父绫诲瀷:' + HType + ',璁㈠崟鍙�:' + this.eData.HICMOBillNo + ',娴佽浆鍗″彿:' + this.eData.HICMOBillNo
- + ', 浜у搧缂栫爜:' + this.hform.HMaterNumber + ',浜у搧鍚嶇О:' + this.hform.HMaterName + ',瑙勬牸鍨嬪彿:' + this.hform.HMaterModel
- + ',鍙戦�佷汉:' + this.hform.HMaker + ',鍙戠敓鏃堕棿:' + this.hform.HDate + ',鐢熶骇璧勬簮:' + this.hform.HSourceName + ',璁惧缂栫爜:' + this.hform.EquipNumber + ',瀵瑰簲澶勭悊浜�:' + this.hform.HHandleEmpName
- },1000)
- },
- //缂栬緫
- getEditData(hmainid){
- //涓昏〃
- uni.request({
- url: this.serverUrl + '/Gy_EquipFileMain/Gy_EquipFileCheckDetai',
- data: { HInterID: hmainid },
- success: (res) => {
- console.log(1,res.data.data[0]);
- if(res.data.code == 1){
- var data = res.data.data[0]
- this.hform = {
- HInterID:hmainid,
- HBillNo:data.鍗曟嵁鍙�,
- HDate:data.鏃ユ湡.substr(0,10),
- HOutComNo:data.璁惧鍑哄巶缂栧彿,
- HBarCode:data.鏉″舰鐮�,
-
- HEquipFileNumber:data.璁惧浠ｇ爜,
- HEquipFileNo:data.璁惧缂栫爜,
- HName:data.璁惧鍚嶇О,
- HModel:data.璁惧瑙勬牸,
- HModel2:data.璁惧鍨嬪彿,
-
- HEquipMaintainRuleInterName:data.榛樿淇濆吇瑙勭▼,
- HEquipMaintainRuleInterID:data.HEquipMaintainRuleInterID,
- HEquipDotCheckRuleInterName:data.榛樿鐐规瑙勭▼,
- HEquipDotCheckRuleInterID:data.HEquipDotCheckRuleInterID,
- HSourceName:data.HSourceName,
- HSourceID:data.HSourceID,
-
- HMaterNumber:data.鐗╂枡鍚嶇О,
- HMaterID:data.HMaterID,
- HEquipFileTypeName:data.璁惧绫诲瀷,
- HEquipFileTypeID:data.HEquipFileTypeID,
- HUnitName:data.鍗曚綅,
- HUnitID:data.HUnitID,
- HSellSupName:data.渚涘簲鍟�,
- HSellSupID:data.HSellSupID,
-
- HDeptName:data.浣跨敤閮ㄩ棬,
- HDeptID:data.HDeptID,
- HUseEmpName:data.浣跨敤璐熻矗浜�,
- HUseEmpID:data.HUseEmpID,
- HRepairEmpName:data.缁存姢璐熻矗浜�,
- HRepairEmpID:data.HRepairEmpID,
- HMakeSupName:data.鍒堕�犲晢,
- HMakeSupID:data.HMakeSupID,
-
- HOutComDate:data.璁惧鍑哄巶鏃ユ湡.substr(0,10),
- HAddress:data.瀹夎鍦扮偣,
- HSetupDate:data.瀹夎鏃ユ湡.substr(0,10),
- HStartupDate:data.杩愯寮�濮嬫棩鏈�.substr(0,10),
-
- HProNum:data.宸ョ▼缂栫爜,
- HWorkArea:data.浜у湴,
- HLogo:data.鍝佺墝,
- HStatus:data.褰撳墠鐘舵��,
- }
- }else{
- uni.showToast({
- title:'鑾峰彇琛ㄥ崟淇℃伅鍥炲～澶辫触',
- icon:'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- },
- //鏂板
- getNewData(){
- uni.request({
- url: this.serverUrl + '/Web/GetMAXNum',
- data: { HBillType: '4502' },
- success: (res) => {
- // console.log(res.data)
- if(res.data.count == 1){
- this.hform.HInterID = res.data.data[0].HInterID
- this.hform.HBillNo = res.data.data[0].HBillNo
- }else{
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- },
- submit() {
- if(!this.hform.HDescription){
- uni.showToast({
- title:'璇疯緭鍏ヨ缁嗗唴瀹�',
- icon:'none'
- })
- }else if(!this.hform.HQty){
- uni.showToast({
- title:'璇疯緭鍏ユ暟閲�',
- icon:'none'
- })
- }else{
- uni.showLoading({
- title:'璇风◢鍊�'
- })
- // var ModRightNameAdd = 'Gy_MouldFile_Edit';
- // if(this.isEdit){
- // this.hform.HUpDater = uni.getStorageSync('HUserName');//淇敼浜�
- // var sMainStr = JSON.stringify(this.hform);
- // var sMainSub = sMainStr + ";" + ModRightNameAdd + ";" + uni.getStorageSync('HUserName');
- // var urls = '/Gy_EquipFileMain/EditBill'
- // }else{
- // this.hform.HMaker = uni.getStorageSync('HUserName');//鍒跺崟浜�
- // var sMainStr = JSON.stringify(this.hform);
- // var sMainSub = sMainStr + ";" + ModRightNameAdd + ";" + uni.getStorageSync('HUserName');
- // var urls = '/Gy_EquipFileMain/AddBill'
- // }
- var sMainStr = JSON.stringify(this.hform);
- var sMainSub = sMainStr + ';' + uni.getStorageSync('HUserName') + ';Add'
- // console.log(sMainSub);
- uni.request({
- url: this.serverUrl + '/Sc_MESTransFerWorkBill/SaveGetMESTransFerWorkFrom',
- method:'POST',
- dataType:"json",
- data:{ "msg": sMainSub },
- success: (res) => {
- console.log(1,res);
- uni.hideLoading()
- if(res.data.count == 1){
- if (res.data.Verify == "Y"){ //鑷姩瀹℃牳
- this.SaveVerify(res.data.HInterID) //瀹℃牳
- }else {
- let pages = getCurrentPages(); // 褰撳墠椤甸潰
- let prePage = pages[pages.length - 2]; // 涓婁竴椤�
- prePage.$vm.getList(this.hform.HSourceID)//璋冪敤涓婁竴椤垫柟娉昰etList()
- setTimeout(()=>{
- uni.navigateBack()
- },1000)
- }
- }
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- }
- },
- SaveVerify(HInterID){
- var datas={
- HInterID:HInterID,
- IsAudit:0,
- CurUserName:getUserInfo().Czymc
- }
- console.log(datas)
- uni.request({
- url: this.serverUrl + '/Sc_MESTransFerWorkBill/AuditTransFerReportList',
- method:'GET',
- dataType:"json",
- async: true,
- data:datas,
- success: (res) => {
- console.log(1,res);
- uni.hideLoading()
- if(res.data.count == 1){
- let pages = getCurrentPages();
- let prePage = pages[pages.length - 2];
- prePage.$vm.getList(this.hform.HSourceID)
- setTimeout(()=>{
- uni.navigateBack()
- },1000)
- }
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- },
- goBack(){
- uni.navigateBack()
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .form{
- width: 668rpx;
- margin: 20rpx auto;
- padding-bottom: 240rpx;
- }
- .tab_area{
- width: 100%;
- height: 50rpx;
- }
- .form-item{
- display: flex;
- align-items: center;
- font-size: 30rpx;
- padding: 6rpx 0;
- .title{
- width: 208rpx;
- text{
- color: red;
- font-weight: bold;
- }
- }
- .right{
- width: 450rpx;
- border-radius: 22rpx;
- border: 1px solid #acacac;
- }
- .righton{
- width: 450rpx;
- border-radius: 22rpx;
- border: 1px solid #e4e4e4;
- background-color: #e4e4e4;
- }
- input{
- width: 100%;
- padding: 8rpx 20rpx;
- font-size: 30rpx;
- }
- textarea{
- width: 94%;
- padding: 8rpx 3%;
- font-size: 30rpx;
- }
-
- }
- .bottom-btn{
- width: 100%;
- // height: 120rpx;
- position: fixed;
- bottom: 0;
- left: 0;
- background-color: #fff;
- box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
- padding: 30rpx 40rpx 40rpx 40rpx;
- button{
- border-radius: 50rpx;
- width: 180rpx;
- height: 66rpx;
- line-height: 66rpx;
- font-size: 28rpx;
- }
- .btn-a{
- background-color: #3A78FF;
- color: #fff;
- }
- .btn-b{
- background-color: #41a863;
- color: #fff;
- margin-left: 30rpx;
- }
- .btn-c{
- background-color: #acacac;
- color: #fff;
- position: absolute;
- right: 120rpx;
- }
- }
-</style>
\ No newline at end of file
diff --git a/pages/index/login.vue b/pages/index/login.vue
index 615cdc6..4e96492 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -118,9 +118,11 @@
"瀹佹尝鍥涚淮灏�-澶栫綉": "http://220.189.218.155:9010/API/",
// 閿﹂殕
"閿﹂殕-鏅鸿兘瀹跺眳": "http://192.168.1.11/API/",
- "閿﹂殕-鏅鸿兘瀹跺眳-澶栫綉": "http://61.174.29.234:8880/API/"
+ // 鍗庤垷鍖呰
+ "瀹佹尝鍗庤垷鍖呰": "http://192.168.88.167:8082/API/",
+ "瀹佹尝鍗庤垷鍖呰-澶栫綉": "http://61.164.64.222:8082//API/",
},
- serverUrlName: '娴欐睙鏅轰簯杩堟��',
+ serverUrlName:uni.getStorageSync('serverUrlName') || '娴欐睙鏅轰簯杩堟��',
arrayOrganization: [],
Organization: '',
@@ -193,6 +195,7 @@
let url = this.serverUrlandName[this.serverUrlName];
if (url != undefined) {
uni.setStorageSync('serverUrl', url)
+ uni.setStorageSync('serverUrlName', this.serverUrlName)
this.serverUrl = url
this.changeApi = false
this.getOrganization()
diff --git a/pages/index/tab1.vue b/pages/index/tab1.vue
index 34012ab..1c72b32 100644
--- a/pages/index/tab1.vue
+++ b/pages/index/tab1.vue
@@ -49,7 +49,7 @@
text: '宸ュ簭鍑虹珯姹囨姤鍗曟柊澧�',
tip: '绔嬪嵆鏂板',
url: '/pages/gongxuOut/Cj_StationOutBill',
- id: 3,
+ id: 2,
hidden: false,
},
@@ -58,7 +58,7 @@
text: '宸ュ簭濮斿鍙戝嚭鍗曟柊澧�',
tip: '绔嬪嵆鏂板',
url: '/pages/weiwaigxIn/Cj_StationEntrustInBill',
- id: 5,
+ id: 3,
hidden: false,
},
@@ -67,7 +67,7 @@
text: '宸ュ簭濮斿鎺ユ敹鍗曟柊澧�',
tip: '绔嬪嵆鏂板',
url: '/pages/weiwaigxOut/Cj_StationEntrustOutBill',
- id: 7,
+ id: 4,
hidden: false,
},
{
@@ -75,106 +75,20 @@
text: '鎴戠殑鎶ュ伐骞冲彴',
tip: '鐐瑰嚮杩涘叆',
url: '/pages/baogong/IpadIndex',
- id: 11,
- hidden: true,
+ id: 5,
+ hidden: false,
},
{
img: '../../static/icon/icon10.png',
text: '鎴戠殑浠诲姟',
tip: '绔嬪嵆鏂板',
url: '/pages/gongxuOutSendWork/gongxuOutSendWorkBill',
- id: 16,
+ id: 6,
hidden: false,
},
]
- // itemData: [{
- // // img:'../../static/icon0.png',
- // // text:'鎶ヨ〃涓績',
- // // url:'/pages/shebeilvli/EquipFileBillResume',
- // // id:0
- // // },{
- // img: '../../static/icon/icon_a1.png',
- // text: '璁惧妗ｆ',
- // url: '/pages/shebeidangan/Gy_EquipFileMainBillList',
- // id: 1
- // }, {
- // img: '../../static/icon/icon_a2.png',
- // text: '璁惧淇濆吇璁″垝鍗�',
- // url: '/pages/baoyangjihua/Sb_EquipMaintainPlanList',
- // id: 2
- // }, {
- // img: '../../static/icon/icon_a3.png',
- // text: '璁惧淇濆吇璁板綍鍗�',
- // url: '/pages/baoyangjilu/Sb_EquipMaintainRuleList',
- // id: 3
- // // },{
- // // img:'../../static/icon/icon_a4.png',
- // // text:'璁惧鐐规璁″垝鍗�',
- // // url:'',
- // // id:4
- // // },{
- // // img:'../../static/icon/icon_a5.png',
- // // text:'璁惧鐐规璁板綍鍗�',
- // // url:'',
- // // id:5,
- // }, {
- // img: '../../static/icon/icon_a6.png',
- // text: '璁惧鏁呴殰鐧昏琛�',
- // url: '/pages/guzhangdengji/EqpConkBookBillList',
- // id: 6
- // }, {
- // img: '../../static/icon/icon_a7.png',
- // text: '璁惧缁翠慨璁板綍鍗�',
- // url: '/pages/shebeiweixiu/SbEqpMaintenanceBillList',
- // id: 7,
- // }, {
- // img: '../../static/icon/icon_a8.png',
- // text: '璁惧灞ュ巻',
- // url: '/pages/shebeilvli/EquipFileBillResume',
- // id: 8,
- // }, {
- // img: '../../static/icon/icon_a9.png',
- // text: '宸ュ簭杩涚珯鎺ユ敹鍗�',
- // url: '/pages/gongxuIn/Cj_StationInBillList',
- // id: 9,
- // }, {
- // img: '../../static/icon/icon_a10.png',
- // text: '宸ュ簭鍑虹珯姹囨姤鍗�',
- // url: '/pages/gongxuOut/Cj_StationOutBillList',
- // id: 10,
- // }, {
- // img: '../../static/icon/icon_a11.png',
- // text: '宸ュ簭濮斿鍙戝嚭鍗�',
- // url: '/pages/weiwaigxIn/Cj_StationEntrustInBillList',
- // id: 11,
- // }, {
- // img: '../../static/icon/icon_a12.png',
- // text: '宸ュ簭濮斿鎺ユ敹鍗�',
- // url: '/pages/weiwaigxIn/Cj_StationEntrustInBillList',
- // id: 12,
- // // }, {
- // // img: '../../static/icon/icon_a13.png',
- // // text: '璁惧绠＄悊',
- // // url: '',
- // // id: 13,
- // }, {
- // img: '../../static/icon/icon_a14.png',
- // text: '鎶ュ伐骞冲彴',
- // url: '/pages/baogong/table',
- // id: 14,
- // }, {
- // img: '../../static/icon/icon_a15.png',
- // text: '寮傚父鍙嶉鍗�',
- // url: '/pages/yichang/MESExecptFeedBackBillList',
- // id: 15,
- // }, {
- // img: '../../static/icon/icon_a16.png',
- // text: '寮傚父鍙嶉澶勭悊鍗�',
- // url: '/pages/yichang/list',
- // id: 16,
- // }]
}
},
onLoad() {
@@ -182,11 +96,6 @@
},
methods: {
async getHiddenItem() {
- // let itemCache = uni.getStorageSync('HTab1ItemData') || ''
- // console.log('itemCache: ', itemCache);
- // if (itemCache !== '') {
- // this.itemData = itemCache
- // }
let data = await getMenuList({
menuName: this.menuListName
})
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index 06c5dde..18011ea 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -358,7 +358,7 @@
{
"img": "../../static/icon/icon8.png",
"text": "鏈欢妫�楠屽崟鍒楄〃",
- "url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBillList",
+ "url": "/pages/ZLGL/mojianjianyan/ProcessCheckBillList",
"id": 43,
"hidden": false
},
@@ -558,31 +558,6 @@
</script>
<style lang="scss" scoped>
- // .mains{
- // width: 720rpx;
- // margin: 0 auto;
- // display: flex;
- // flex-wrap: wrap;
- // margin-top: 10rpx;
- // padding-bottom: 80rpx;
- // .box{
- // width: 100%;
- // margin: 26rpx 26rpx 0 26rpx;
- // padding: 0 0 16rpx 10rpx;
- // display: flex;
- // align-items: center;
- // border-bottom: 1px solid #f0f0f0;
- // image{
- // width: 52rpx;
- // height: 52rpx;
- // }
- // .texts{
- // font-size: 30rpx;
- // color: #333333;
- // margin-left: 30rpx;
- // }
- // }
- // }
.header {
width: 100%;
diff --git a/pages/index/tab3.vue b/pages/index/tab3.vue
index 3bfaf07..f864579 100644
--- a/pages/index/tab3.vue
+++ b/pages/index/tab3.vue
@@ -195,6 +195,20 @@
"id": 23,
"hidden": false
},
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "璁惧淇濆吇浠诲姟",
+ "url": "/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport",
+ "id": 24,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon8.png",
+ "text": "妯″叿淇濆吇浠诲姟",
+ "url": "/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport",
+ "id": 25,
+ "hidden": false
+ },
]
}
},
diff --git a/pages/index/tab4.vue b/pages/index/tab4.vue
index 0ccf50b..8ce41ca 100644
--- a/pages/index/tab4.vue
+++ b/pages/index/tab4.vue
@@ -64,7 +64,7 @@
{
"img": "../../static/icon/icon8.png",
"text": "鏈欢妫�楠屽崟",
- "url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBill?operationType=1",
+ "url": "/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=1",
"id": 3,
"hidden": false
},
diff --git a/pages/jishikucunchaxun/table.vue b/pages/jishikucunchaxun/table.vue
index 90ddd46..719d382 100644
--- a/pages/jishikucunchaxun/table.vue
+++ b/pages/jishikucunchaxun/table.vue
@@ -45,6 +45,9 @@
<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>
--
Gitblit v1.9.1