From f20a697d4d3b666b2754b6d7057205f3d98503b7 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 26 一月 2026 09:30:09 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue | 2
pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue | 22
pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill.vue | 2
pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue | 1834 ++++++------
pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue | 65
pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBill.vue | 2
pages/MJGL/shangmudan/MouldUpperBill.vue | 201 -
.hbuilderx/launch.json | 4
pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill.vue | 34
pages/tiaomachaima/tiaomachaimaCopy.vue | 703 +++++
pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss | 37
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue | 28
pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue | 21
pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue | 36
components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue | 730 ++--
pages/ZLGL/shoujianjianyan/firstCheckBill.vue | 10
components/BillListPopup/BillListPopupMouldConkBookBill.vue | 1
nativeplugins/LcPrinter/package.json | 25
pages/index/index.vue | 8
pages.json | 16
pages/ZLGL/QualityReportStep/QualityReportStepBill.vue | 2
pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue | 1999 +++++++-------
pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue | 2
pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue | 1486 +++++----
nativeplugins/LcPrinter/android/unilcprinterplugin_module-release.aar | 0
pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue | 36
pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue | 12
pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue | 352 +
manifest.json | 14
pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue | 11
pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue | 242 +
pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue | 38
components/BillListPopup/BillListPopupEquipConkBookBill.vue | 398 ++
33 files changed, 4,993 insertions(+), 3,380 deletions(-)
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index a7d9080..a41ed7d 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -22,9 +22,9 @@
},
{
"customPlaygroundType" : "local",
- "localRepoPath" : "D:/WorkBench/ZY_APP_Dev/STUWMS/unpackage/debug",
+ "localRepoPath" : "C:/Users/19858/Desktop/鏅轰簯杩堟��/APP/STUWMS/unpackage/debug",
"openVueDevtools" : true,
- "packageName" : "com.shebeiguanli.www",
+ "packageName" : "com.iflytek.inputmethod",
"playground" : "custom",
"type" : "uni-app:app-android"
}
diff --git a/components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue b/components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue
index defa328..c03ebd4 100644
--- a/components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue
+++ b/components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue
@@ -1,385 +1,389 @@
<template>
- <view>
- <uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
- <view class="content">
- <view class="search-condition">
- <view class="title"><text>鏃ユ湡: </text></view>
- <view class="daterange" style="flex: 1;">
- <view class="right general">
- <uni-datetime-picker type="date" :clear-icon="false" v-model="HBeginDate">
- <view>{{HBeginDate}}</view>
- </uni-datetime-picker>
- </view>
- <view>鈥�</view>
- <view class="right general">
- <uni-datetime-picker type="date" :clear-icon="false" v-model="HEndDate">
- <view>{{HEndDate}}</view>
- </uni-datetime-picker>
- </view>
- </view>
- </view>
- <!-- 淇濇寔涓庢晠闅滅櫥璁板崟鐩稿悓鐨勬悳绱㈡潯浠� -->
- <view class="search-condition">
- <view class="title"><text>妯″叿缂栫爜: </text></view>
- <view class="right"><input type="text" :focus="enablefocus" v-model="HNumber"
- @confirm="getRepairRecordList" /></view>
- </view>
- <view class="search-condition">
- <view class="title"><text>妯″叿鍚嶇О: </text></view>
- <view class="right"><input type="text" v-model="HName" @confirm="getRepairRecordList" /></view>
- </view>
- <view class="search-condition">
- <view class="title"><text>鍗曟嵁鍙�: </text></view>
- <view class="right"><input type="text" v-model="HBillNo" @confirm="getRepairRecordList" /></view>
- </view>
- <view class="buttons">
- <view style="flex: 1;"></view>
- <button size="mini" type="primary" @click="search">鎼滅储</button>
- <button size="mini" type="primary" @click="exit">閫�鍑�</button>
- </view>
- <scroll-view id="#BillListPanel" scroll-y="true" style="height: 50vh;">
- <view class="options-wrapper" v-show="HRepairRecordList.length != 0">
- <uni-card :is-active="record.isActive" :class="record.isActive?'uni-card--is-active':''"
- v-for="(record, index) in HRepairRecordList[curPage-1]" :key="index"
- :title="record['鍗曟嵁鍙�'] || record['HBillNo'] || record['缁翠慨鍗曞彿']"
- @tap="clickCard(record, index)">
- <view class="item">
- <view class="left">鏃ユ湡: </view>
- <view class="right">{{dayjs(record['鏃ユ湡'] || record['缁翠慨鏃ユ湡'] || record['HDate']).format('YYYY-MM-DD')}}</view>
- </view>
- <view class="item" v-if="record['妯″叿缂栫爜'] || record['HMouldCode']">
- <view class="left">妯″叿缂栫爜: </view>
- <view class="right">{{record['浜у搧妯″叿浠ｇ爜'] || record['HMouldCode']}}</view>
- </view>
- <view class="item" v-if="record['妯″叿鍚嶇О'] || record['HMouldName']">
- <view class="left">妯″叿鍚嶇О: </view>
- <view class="right">{{record['浜у搧妯″叿'] || record['HMouldName']}}</view>
- </view>
- <view class="item" v-if="record['妯″叿瑙勬牸'] || record['HMouldSpec']">
- <view class="left">妯″叿瑙勬牸: </view>
- <view class="right">{{record['妯″叿瑙勬牸'] || record['HMouldSpec']}}</view>
- </view>
- <view class="item" v-if="record['妯″叿鍨嬪彿'] || record['HMouldModel']">
- <view class="left">妯″叿鍨嬪彿: </view>
- <view class="right">{{record['妯″叿鍨嬪彿'] || record['HMouldModel']}}</view>
- </view>
- <view class="item" v-if="record['缁翠慨鍗曞彿'] || record['HRepairNo']">
- <view class="left">缁翠慨鍗曞彿: </view>
- <view class="right">{{record['缁翠慨鍗曞彿'] || record['HRepairNo']}}</view>
- </view>
- <view class="item" v-if="record['缁翠慨鍐呭'] || record['HRepairContent']">
- <view class="left">缁翠慨鍐呭: </view>
- <view class="right">{{record['缁翠慨鍐呭'] || record['HRepairContent']}}</view>
- </view>
- <view class="item" v-if="record['缁翠慨浜�'] || record['HEmpName']">
- <view class="left">缁翠慨浜�: </view>
- <view class="right">{{record['缁翠慨浜�'] || record['HEmpName']}}</view>
- </view>
- <view class="item" v-if="record['缁翠慨浜�'] || record['HStatus']">
- <view class="left">缁翠慨浜�: </view>
- <view class="right">{{record['缁翠慨浜�'] || record['HStatus']}}</view>
- </view>
- </uni-card>
- </view>
- <view class="over" v-show="HRepairRecordList.length == 0">鏆傛棤鏁版嵁</view>
- </scroll-view>
- <uni-pagination id="#pagination" title="鏍囬鏂囧瓧" v-model="curPage" :pageSize="size"
- :total="length"></uni-pagination>
- </view>
- </uni-popup>
- </view>
+ <view>
+ <uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
+ <view class="content">
+ <view class="search-condition">
+ <view class="title"><text>鏃ユ湡: </text></view>
+ <view class="daterange" style="flex: 1;">
+ <view class="right general">
+ <uni-datetime-picker type="date" :clear-icon="false" v-model="HBeginDate">
+ <view>{{HBeginDate}}</view>
+ </uni-datetime-picker>
+ </view>
+ <view>鈥�</view>
+ <view class="right general">
+ <uni-datetime-picker type="date" :clear-icon="false" v-model="HEndDate">
+ <view>{{HEndDate}}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ </view>
+ <!-- 淇濇寔涓庢晠闅滅櫥璁板崟鐩稿悓鐨勬悳绱㈡潯浠� -->
+ <view class="search-condition">
+ <view class="title"><text>妯″叿缂栫爜: </text></view>
+ <view class="right"><input type="text" :focus="enablefocus" v-model="HNumber"
+ @confirm="getRepairRecordList" /></view>
+ </view>
+ <view class="search-condition">
+ <view class="title"><text>妯″叿鍚嶇О: </text></view>
+ <view class="right"><input type="text" v-model="HName" @confirm="getRepairRecordList" /></view>
+ </view>
+ <view class="search-condition">
+ <view class="title"><text>鍗曟嵁鍙�: </text></view>
+ <view class="right"><input type="text" v-model="HBillNo" @confirm="getRepairRecordList" /></view>
+ </view>
+ <view class="buttons">
+ <view style="flex: 1;"></view>
+ <button size="mini" type="primary" @click="search">鎼滅储</button>
+ <button size="mini" type="primary" @click="exit">閫�鍑�</button>
+ </view>
+ <scroll-view id="#BillListPanel" scroll-y="true" style="height: 50vh;">
+ <view class="options-wrapper" v-show="HRepairRecordList.length != 0">
+ <uni-card :is-active="record.isActive" :class="record.isActive?'uni-card--is-active':''"
+ v-for="(record, index) in HRepairRecordList[curPage-1]" :key="index"
+ :title="record['鍗曟嵁鍙�'] || record['HBillNo'] || record['缁翠慨鍗曞彿']"
+ @tap="clickCard(record, index)">
+ <view class="item">
+ <view class="left">鏃ユ湡: </view>
+ <view class="right">
+ {{dayjs(record['鏃ユ湡'] || record['缁翠慨鏃ユ湡'] || record['HDate']).format('YYYY-MM-DD')}}
+ </view>
+ </view>
+ <view class="item" v-if="record['妯″叿缂栫爜'] || record['HMouldCode']">
+ <view class="left">妯″叿缂栫爜: </view>
+ <view class="right">{{record['浜у搧妯″叿浠ｇ爜'] || record['HMouldCode']}}</view>
+ </view>
+ <view class="item" v-if="record['妯″叿鍚嶇О'] || record['HMouldName']">
+ <view class="left">妯″叿鍚嶇О: </view>
+ <view class="right">{{record['浜у搧妯″叿'] || record['HMouldName']}}</view>
+ </view>
+ <view class="item" v-if="record['妯″叿瑙勬牸'] || record['HMouldSpec']">
+ <view class="left">妯″叿瑙勬牸: </view>
+ <view class="right">{{record['妯″叿瑙勬牸'] || record['HMouldSpec']}}</view>
+ </view>
+ <view class="item" v-if="record['妯″叿鍨嬪彿'] || record['HMouldModel']">
+ <view class="left">妯″叿鍨嬪彿: </view>
+ <view class="right">{{record['妯″叿鍨嬪彿'] || record['HMouldModel']}}</view>
+ </view>
+ <view class="item" v-if="record['缁翠慨鍗曞彿'] || record['HRepairNo']">
+ <view class="left">缁翠慨鍗曞彿: </view>
+ <view class="right">{{record['缁翠慨鍗曞彿'] || record['HRepairNo']}}</view>
+ </view>
+ <view class="item" v-if="record['缁翠慨鍐呭'] || record['HRepairContent']">
+ <view class="left">缁翠慨鍐呭: </view>
+ <view class="right">{{record['缁翠慨鍐呭'] || record['HRepairContent']}}</view>
+ </view>
+ <view class="item" v-if="record['缁翠慨浜�'] || record['HEmpName']">
+ <view class="left">缁翠慨浜�: </view>
+ <view class="right">{{record['缁翠慨浜�'] || record['HEmpName']}}</view>
+ </view>
+ <view class="item" v-if="record['缁翠慨浜�'] || record['HStatus']">
+ <view class="left">缁翠慨浜�: </view>
+ <view class="right">{{record['缁翠慨浜�'] || record['HStatus']}}</view>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-show="HRepairRecordList.length == 0">鏆傛棤鏁版嵁</view>
+ </scroll-view>
+ <uni-pagination id="#pagination" title="鏍囬鏂囧瓧" v-model="curPage" :pageSize="size"
+ :total="length"></uni-pagination>
+ </view>
+ </uni-popup>
+ </view>
</template>
<script>
- import dayjs from 'dayjs';
- import {
- CommonUtils
- } from '../../utils/common';
- import {
- getUserInfo
- } from '../../utils/auth';
- export default {
- name: "RepairRecordPopup",
- data() {
- return {
- dayjs: dayjs,
- enablefocus: false,
- size: 20,
- curPage: 1,
- length: 0,
- page: 0,
- HMouldID: 0, // 褰撳墠閫夋嫨鐨勬ā鍏稩D
- HRepairRecordList: [],
-
- // 鎼滅储鏉′欢 - 涓庢晠闅滅櫥璁板崟淇濇寔涓�鑷�
- HBeginDate: dayjs(new Date()).subtract(30, 'd').format("YYYY-MM-DD"),
- HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
- HNumber: '',
- HName: '',
- HBillNo: '',
-
- };
- },
- props: {
- HBillType: {
- type: [String, Number],
- required: true
- },
- HStockOrgID: {
- type: [String, Number],
- required: true
- },
- // 鏂板涓�涓槸鍚︽樉绀烘ā鍏蜂俊鎭殑鍙傛暟
- showMouldInfo: {
- type: Boolean,
- default: true
- }
- },
- methods: {
- popupChangeHandler(e) {
- if (e.show === true) {
- this.getRepairRecordList()
- }
- },
- async exit() {
- this.resetSearchConditions();
- await this.$nextTick();
- this.$refs.popup.close();
- },
-
- resetSearchConditions() {
- this.size = 20;
- this.curPage = 1;
- this.length = 0;
- this.page = 0;
- this.HRepairRecordList = [];
- this.enablefocus = false;
-
- // 閲嶇疆鎼滅储鏉′欢
- this.HBeginDate = dayjs(new Date()).subtract(30, 'd').format("YYYY-MM-DD");
- this.HEndDate = dayjs(new Date()).format("YYYY-MM-DD");
- this.HNumber = '';
- this.HName = '';
- this.HBillNo = '';
- this.HRepairNo = '';
- this.HRepairContent = '';
- this.HRepairStatus = '';
- },
-
- showPopup(HMouldID) {
- this.HMouldID = HMouldID || 0;
- this.resetSearchConditions();
- this.$refs.popup.open();
- },
-
- search() {
- this.getRepairRecordList();
- },
-
- repairStatusChange(e) {
- const index = e.detail.value;
- if (index == 0) {
- this.HRepairStatus = ''; // 鍏ㄩ儴
- } else {
- this.HRepairStatus = this.repairStatusOptions[index];
- }
- },
-
- clickCard(record, index) {
- // 鍙戦�侀�夋嫨瀹屾垚浜嬩欢
- uni.$emit('RepairRecordSelectComplete', {
- HInterID: record["hmainid"],
- HEntryID: record["hsubid"] || record["HEntryID"] || 0,
- HBillNo: record["鍗曟嵁鍙�"] || record["HBillNo"] || "",
- HMouldID: record['HMouldID'] || this.HMouldID || 0,
- HMouldName: record['浜у搧妯″叿'],
- HMouldCode: record['浜у搧妯″叿浠ｇ爜'],
- HMouldSpec: record['妯″叿瑙勬牸'],
- HMouldModel: record['妯″叿鍨嬪彿']
- });
- },
-
- getsWhere() {
- let sWhere = '';
-
- // 鏃ユ湡鑼冨洿鏉′欢 - 涓庢晠闅滅櫥璁板崟淇濇寔涓�鑷�
- if (this.HBeginDate && this.HEndDate) {
- sWhere += ` and (CONVERT(varchar(100),鏃ユ湡, 23) between '${this.HBeginDate}' and '${this.HEndDate}') `;
- }
- // 妯″叿ID鏉′欢 - 濡傛灉浼犲叆浜嗘ā鍏稩D
- if (this.HMouldID) {
- sWhere += ` and HMouldID = ${this.HMouldID} `;
- }
- // 妯″叿缂栫爜鏉′欢
- if (this.HNumber) {
- sWhere += ` and (浜у搧妯″叿浠ｇ爜 like '%${this.HNumber}%' `;
- }
- // 妯″叿鍚嶇О鏉′欢
- if (this.HName) {
- sWhere += ` and (浜у搧妯″叿 like '%${this.HName}%' `;
- }
- // 鍗曟嵁鍙锋潯浠�
- if (this.HBillNo) {
- sWhere += ` and (鍗曟嵁鍙� like '%${this.HBillNo}%' `;
- }
- return sWhere;
- },
-
- getRepairRecordList() {
- this.HRepairRecordList = [];
- this.length = 0;
- this.page = 0;
- this.curPage = 1;
-
- // 璋冪敤缁翠慨璁板綍鍒楄〃鎺ュ彛
- CommonUtils.doRequest(
- "/Sb_MouldRepairWorkBill/GetMouldRepairWorkBill_PDA", { // 璇锋牴鎹疄闄呮儏鍐佃皟鏁存帴鍙ｈ矾寰�
- sWhere: this.getsWhere(),
- user: getUserInfo()["Czymc"]
- },
- (res) => {
- let {
- data,
- count,
- Message
- } = res.data;
- if (count == 1) {
- this.length = Array.from(data).length;
- const result = [];
- for (let i = 0; i < data.length; i += this.size) {
- result.push(data.slice(i, i + this.size));
- }
- this.HRepairRecordList = result;
- this.page = result.length;
- setTimeout(() => {
- this.enablefocus = true;
- }, 500);
- } else {
- setTimeout(() => {
- this.enablefocus = true;
- }, 500);
- uni.showToast({
- icon: 'none',
- title: Message || '鏆傛棤缁翠慨璁板綍鏁版嵁'
- });
- }
- },
- (err) => {
- setTimeout(() => {
- this.enablefocus = true;
- }, 500);
- uni.showToast({
- icon: 'none',
- title: '鍔犺浇澶辫触: ' + (err.message || '鏈煡閿欒')
- });
- }
- );
- }
- }
- }
+ import dayjs from 'dayjs';
+ import {
+ CommonUtils
+ } from '../../utils/common';
+ import {
+ getUserInfo
+ } from '../../utils/auth';
+ export default {
+ name: "RepairRecordPopup",
+ data() {
+ return {
+ dayjs: dayjs,
+ enablefocus: false,
+ size: 20,
+ curPage: 1,
+ length: 0,
+ page: 0,
+ HMouldID: 0, // 褰撳墠閫夋嫨鐨勬ā鍏稩D
+ HRepairRecordList: [],
+
+ // 鎼滅储鏉′欢 - 涓庢晠闅滅櫥璁板崟淇濇寔涓�鑷�
+ HBeginDate: dayjs(new Date()).subtract(30, 'd').format("YYYY-MM-DD"),
+ HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HNumber: '',
+ HName: '',
+ HBillNo: '',
+
+ };
+ },
+ props: {
+ HBillType: {
+ type: [String, Number],
+ required: true
+ },
+ HStockOrgID: {
+ type: [String, Number],
+ required: true
+ },
+ // 鏂板涓�涓槸鍚︽樉绀烘ā鍏蜂俊鎭殑鍙傛暟
+ showMouldInfo: {
+ type: Boolean,
+ default: true
+ }
+ },
+ methods: {
+ popupChangeHandler(e) {
+ if (e.show === true) {
+ this.getRepairRecordList()
+ }
+ },
+ async exit() {
+ this.resetSearchConditions();
+ await this.$nextTick();
+ this.$refs.popup.close();
+ },
+
+ resetSearchConditions() {
+ this.size = 20;
+ this.curPage = 1;
+ this.length = 0;
+ this.page = 0;
+ this.HRepairRecordList = [];
+ this.enablefocus = false;
+
+ // 閲嶇疆鎼滅储鏉′欢
+ this.HBeginDate = dayjs(new Date()).subtract(30, 'd').format("YYYY-MM-DD");
+ this.HEndDate = dayjs(new Date()).format("YYYY-MM-DD");
+ this.HNumber = '';
+ this.HName = '';
+ this.HBillNo = '';
+ this.HRepairNo = '';
+ this.HRepairContent = '';
+ this.HRepairStatus = '';
+ },
+
+ showPopup(HMouldID) {
+ this.HMouldID = HMouldID || 0;
+ this.resetSearchConditions();
+ this.$refs.popup.open();
+ },
+
+ search() {
+ this.getRepairRecordList();
+ },
+
+ repairStatusChange(e) {
+ const index = e.detail.value;
+ if (index == 0) {
+ this.HRepairStatus = ''; // 鍏ㄩ儴
+ } else {
+ this.HRepairStatus = this.repairStatusOptions[index];
+ }
+ },
+
+ clickCard(record, index) {
+ // 鍙戦�侀�夋嫨瀹屾垚浜嬩欢
+ uni.$emit('RepairRecordSelectComplete', {
+ HInterID: record["hmainid"],
+ HEntryID: record["hsubid"] || record["HEntryID"] || 0,
+ HBillNo: record["鍗曟嵁鍙�"] || record["HBillNo"] || "",
+ HMouldID: record['HMouldID'] || this.HMouldID || 0,
+ HMouldName: record['浜у搧妯″叿'],
+ HMouldCode: record['浜у搧妯″叿浠ｇ爜'],
+ HMouldSpec: record['妯″叿瑙勬牸'],
+ HMouldModel: record['妯″叿鍨嬪彿']
+ });
+ },
+
+ getsWhere() {
+ let sWhere = '';
+
+ // 鏃ユ湡鑼冨洿鏉′欢 - 涓庢晠闅滅櫥璁板崟淇濇寔涓�鑷�
+ if (this.HBeginDate && this.HEndDate) {
+ sWhere += ` and (CONVERT(varchar(100),鏃ユ湡, 23) between '${this.HBeginDate}' and '${this.HEndDate}') `;
+ }
+ // 妯″叿ID鏉′欢 - 濡傛灉浼犲叆浜嗘ā鍏稩D
+ if (this.HMouldID) {
+ sWhere += ` and HMouldID = ${this.HMouldID} `;
+ }
+ // 妯″叿缂栫爜鏉′欢
+ if (this.HNumber) {
+ sWhere += ` and (浜у搧妯″叿浠ｇ爜 like '%${this.HNumber}%' `;
+ }
+ // 妯″叿鍚嶇О鏉′欢
+ if (this.HName) {
+ sWhere += ` and (浜у搧妯″叿 like '%${this.HName}%' `;
+ }
+ // 鍗曟嵁鍙锋潯浠�
+ if (this.HBillNo) {
+ sWhere += ` and (鍗曟嵁鍙� like '%${this.HBillNo}%' `;
+ }
+ sWhere += ` and isnull(缁翠慨浜�,'')!='${uni.getStorageSync('HUserName')}$' `
+ sWhere += ` and isnull(鍏抽棴浜�,'')!='' `
+ return sWhere;
+ },
+
+ getRepairRecordList() {
+ this.HRepairRecordList = [];
+ this.length = 0;
+ this.page = 0;
+ this.curPage = 1;
+
+ // 璋冪敤缁翠慨璁板綍鍒楄〃鎺ュ彛
+ CommonUtils.doRequest(
+ "/Sb_MouldRepairWorkBill/GetMouldRepairWorkBill_PDA", { // 璇锋牴鎹疄闄呮儏鍐佃皟鏁存帴鍙ｈ矾寰�
+ sWhere: this.getsWhere(),
+ user: getUserInfo()["Czymc"]
+ },
+ (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data;
+ if (count == 1) {
+ this.length = Array.from(data).length;
+ const result = [];
+ for (let i = 0; i < data.length; i += this.size) {
+ result.push(data.slice(i, i + this.size));
+ }
+ this.HRepairRecordList = result;
+ this.page = result.length;
+ setTimeout(() => {
+ this.enablefocus = true;
+ }, 500);
+ } else {
+ setTimeout(() => {
+ this.enablefocus = true;
+ }, 500);
+ uni.showToast({
+ icon: 'none',
+ title: Message || '鏆傛棤缁翠慨璁板綍鏁版嵁'
+ });
+ }
+ },
+ (err) => {
+ setTimeout(() => {
+ this.enablefocus = true;
+ }, 500);
+ uni.showToast({
+ icon: 'none',
+ title: '鍔犺浇澶辫触: ' + (err.message || '鏈煡閿欒')
+ });
+ }
+ );
+ }
+ }
+ }
</script>
<style lang="scss">
- .content {
- box-sizing: border-box;
- border-radius: 15rpx 15rpx 0 0;
- padding: 20rpx 20rpx 40rpx 20rpx;
- background-color: #fff;
- display: flex;
- flex-direction: column;
- gap: 10rpx;
+ .content {
+ box-sizing: border-box;
+ border-radius: 15rpx 15rpx 0 0;
+ padding: 20rpx 20rpx 40rpx 20rpx;
+ background-color: #fff;
+ display: flex;
+ flex-direction: column;
+ gap: 10rpx;
- .search-condition {
- display: flex;
- flex-direction: row;
- align-items: center;
- gap: 20rpx;
- font-size: 30rpx;
+ .search-condition {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ gap: 20rpx;
+ font-size: 30rpx;
- .title {
- width: 5rem;
- text-align: right;
- }
+ .title {
+ width: 5rem;
+ text-align: right;
+ }
- .right {
- flex: 1;
- border-radius: 22rpx;
- border: 1px solid #acacac;
- height: auto;
- padding: 8rpx 16rpx;
+ .right {
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ height: auto;
+ padding: 8rpx 16rpx;
- input {
- width: 100%;
- font-size: 30rpx;
- }
-
- picker {
- width: 100%;
- font-size: 30rpx;
- line-height: 1.5;
- }
- }
- }
+ input {
+ width: 100%;
+ font-size: 30rpx;
+ }
- .buttons {
- display: flex;
- flex-direction: row;
- gap: 20rpx;
- justify-content: flex-end;
+ picker {
+ width: 100%;
+ font-size: 30rpx;
+ line-height: 1.5;
+ }
+ }
+ }
- >button {
- display: inline-flex;
- width: 4rem;
- }
- }
+ .buttons {
+ display: flex;
+ flex-direction: row;
+ gap: 20rpx;
+ justify-content: flex-end;
- .options-wrapper {
- padding: 20rpx;
- display: grid;
- grid-template-columns: repeat(1, 1fr);
- gap: 20rpx;
+ >button {
+ display: inline-flex;
+ width: 4rem;
+ }
+ }
- >view {
- margin: 0 !important;
- box-sizing: border-box;
+ .options-wrapper {
+ padding: 20rpx;
+ display: grid;
+ grid-template-columns: repeat(1, 1fr);
+ gap: 20rpx;
- }
+ >view {
+ margin: 0 !important;
+ box-sizing: border-box;
- .item {
- .left {
- display: inline-block;
- width: 6rem;
- font-size: 26rpx;
- color: #666;
- }
+ }
- .right {
- display: inline-block;
- font-size: 28rpx;
- color: #333;
- word-break: break-all;
- }
- }
- }
+ .item {
+ .left {
+ display: inline-block;
+ width: 6rem;
+ font-size: 26rpx;
+ color: #666;
+ }
- .uni-card--is-active {
- background-color: rgba(0, 122, 255, 0.2);
- }
+ .right {
+ display: inline-block;
+ font-size: 28rpx;
+ color: #333;
+ word-break: break-all;
+ }
+ }
+ }
- .daterange {
- display: flex;
- flex-direction: row;
- gap: 10rpx;
- justify-content: center;
- align-items: center;
+ .uni-card--is-active {
+ background-color: rgba(0, 122, 255, 0.2);
+ }
- }
-
- .over {
- text-align: center;
- padding: 100rpx 0;
- color: #999;
- font-size: 28rpx;
- }
- }
+ .daterange {
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: center;
+ align-items: center;
+
+ }
+
+ .over {
+ text-align: center;
+ padding: 100rpx 0;
+ color: #999;
+ font-size: 28rpx;
+ }
+ }
</style>
\ No newline at end of file
diff --git a/components/BillListPopup/BillListPopupEquipConkBookBill.vue b/components/BillListPopup/BillListPopupEquipConkBookBill.vue
new file mode 100644
index 0000000..2d28518
--- /dev/null
+++ b/components/BillListPopup/BillListPopupEquipConkBookBill.vue
@@ -0,0 +1,398 @@
+<template>
+ <view>
+ <uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
+ <view class="content">
+ <view class="search-condition">
+ <view class="title"><text>鏃ユ湡: </text></view>
+ <view class="daterange" style="flex: 1;">
+ <view class="right general">
+ <uni-datetime-picker type="date" :clear-icon="false" v-model="HBeginDate">
+ <view>{{HBeginDate}}</view>
+ </uni-datetime-picker>
+ </view>
+ <view>鈥�</view>
+ <view class="right general">
+ <uni-datetime-picker type="date" :clear-icon="false" v-model="HEndDate">
+ <view>{{HEndDate}}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ </view>
+ <view class="search-condition">
+ <view class="title"><text>璁惧浠ｇ爜: </text></view>
+ <view class="right"><input type="text" :focus="enablefocus" v-model="HNumber"
+ @confirm="getBillList" /></view>
+ </view>
+ <view class="search-condition">
+ <view class="title"><text>璁惧鍚嶇О: </text></view>
+ <view class="right"><input type="text" v-model="HName" @confirm="getBillList" /></view>
+ </view>
+ <view class="search-condition">
+ <view class="title"><text>鍗曟嵁鍙�: </text></view>
+ <view class="right"><input type="text" v-model="HBillNo" @confirm="getBillList" /></view>
+ </view>
+ <view class="buttons">
+ <view style="flex: 1;"></view>
+ <button size="mini" type="primary" @click="search">鎼滅储</button>
+ <button v-if="MultiSourceBill" size="mini" type="primary" @click="ret">杩斿洖</button>
+ <button size="mini" type="primary" @click="exit">閫�鍑�</button>
+ </view>
+ <scroll-view id="#BillListPanel" scroll-y="true" style="height: 55vh;">
+ <view class="options-wrapper" v-show="HBillList.length != 0">
+ <uni-card :is-active="bill.isActive" :class="bill.isActive?'uni-card--is-active':''"
+ v-for="(bill, index) in HBillList[curPage-1]" :key="index" :title="bill['鍗曟嵁鍙�']"
+ @tap="clickCard(bill, index)">
+ <view class="item">
+ <view class="left">鏃ユ湡: </view>
+ <view class="right">{{dayjs(bill['鏃ユ湡']).format('YYYY-MM-DD')}}</view>
+ </view>
+ <view class="item" v-if="bill['璁惧浠ｇ爜']">
+ <view class="left">璁惧浠ｇ爜: </view>
+ <view class="right">{{bill['璁惧浠ｇ爜']}}</view>
+ </view>
+ <view class="item" v-if="bill['璁惧鍚嶇О']">
+ <view class="left">璁惧鍚嶇О: </view>
+ <view class="right">{{bill['璁惧鍚嶇О']}}</view>
+ </view>
+ <view class="item" v-if="bill['鍙戠幇浜�']">
+ <view class="left">鍙戠幇浜�: </view>
+ <view class="right">{{bill['鍙戠幇浜�']}}</view>
+ </view>
+ <view class="item" v-if="bill['缁翠慨浜�']">
+ <view class="left">缁翠慨浜�: </view>
+ <view class="right">{{bill['缁翠慨浜�']}}</view>
+ </view>
+ <view class="item" v-if="bill['璐熻矗浜�']">
+ <view class="left">璐熻矗浜�: </view>
+ <view class="right">{{bill['璐熻矗浜�']}}</view>
+ </view>
+ <view class="item" v-if="bill['鏁呴殰绫诲埆']">
+ <view class="left">鏁呴殰绫诲埆: </view>
+ <view class="right">{{bill['鏁呴殰绫诲埆']}}</view>
+ </view>
+ <view class="item" v-if="bill['缁翠慨椤圭洰']">
+ <view class="left">缁翠慨椤圭洰: </view>
+ <view class="right">{{bill['缁翠慨椤圭洰']}}</view>
+ </view>
+ <view class="item" v-if="bill['鏁呴殰鍙戠敓鏃ユ湡']">
+ <view class="left">鏁呴殰鍙戠敓鏃ユ湡: </view>
+ <view class="right">{{dayjs(bill['鍙戠敓鏃ユ湡']).format('YYYY-MM-DD')}}</view>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-show="HBillList.length == 0">鏆傛棤鏁版嵁</view>
+ </scroll-view>
+ <uni-pagination id="#pagination" title="鏍囬鏂囧瓧" v-model="curPage" :pageSize="size"
+ :total="length"></uni-pagination>
+ </view>
+
+ </uni-popup>
+ </view>
+</template>
+
+<script>
+ import dayjs from 'dayjs';
+ import {
+ CommonUtils
+ } from '../../utils/common';
+ import {
+ getUserInfo
+ } from '../../utils/auth';
+ export default {
+ name: "BillListPopup",
+ data() {
+ return {
+ dayjs: dayjs,
+ enablefocus: false,
+ size: 20,
+ curPage: 1,
+ length: 0,
+ page: 0,
+ HSourceBillNo: '',
+ HMater: '',
+ HCustom: '',
+ HBillList: [],
+ panelHeight: 0,
+ HBeginDate: dayjs(new Date()).subtract(30, 'd').format("YYYY-MM-DD"),
+ HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HNumber: '',
+ HName: '',
+ HBillNo: '',
+
+ multiSouceBillList: []
+ };
+ },
+ props: {
+ HBillType: {
+ type: [String, Number],
+ required: true
+ },
+ HSourceBillType: {
+ type: [String, Number],
+ required: true
+ },
+ HStockOrgID: {
+ type: [String, Number],
+ required: true
+ },
+ MultiSourceBill: {
+ type: Boolean,
+ default: false,
+ required: false
+ }
+ },
+ model: {
+ prop: "HSourceBill",
+ event: 'change'
+ },
+ methods: {
+ popupChangeHandler(e) {
+ if (e.show === true) {
+ this.getBillList()
+ }
+ },
+ async exit() {
+ this.size = 20
+ this.curPage = 1
+ this.length = 0
+ this.page = 0
+ this.HSourceBillNo = ''
+ this.HMater = ''
+ this.HCustom = ''
+ this.HBillList = []
+ this.enablefocus = false
+ this.multiSouceBillList = []
+ // 闇�瑕佺瓑寰呴〉闈㈠唴鐨勬暟鎹祴鍊煎畬姣�
+ await this.$nextTick()
+ this.$refs.popup.close();
+ },
+ search() {
+ this.getBillList()
+ },
+ ret() {
+ console.log('this.MultiSourceBill: ', this.MultiSourceBill);
+ uni.$emit('BillSelectComplete', {
+ HInterID: 0,
+ HBillNo: 0,
+ enableMultiSourceBill: this.MultiSourceBill,
+ MultiSourceBillList: this.multiSouceBillList
+ })
+ },
+ showPopup() {
+ this.$refs.popup.open();
+ },
+ clickCard(bill, index) {
+ if (this.MultiSourceBill == false) { // 闈炲婧愬崟妯″紡
+ uni.$emit('BillSelectComplete', {
+ HInterID: bill["hmainid"],
+ HEntryID: bill["hsubid"],
+ HBillNo: bill["鍗曟嵁鍙�"],
+ HEquipID: bill["HEquipID"],
+ HEquipNumber: bill['璁惧浠ｇ爜'],
+ HEquipName: bill['璁惧鍚嶇О'],
+ HEquipSpec: bill['妯″叿瑙勬牸'],
+ HEquipModel: bill['妯″叿鍨嬪彿'],
+ enableMultiSourceBill: this.MultiSourceBill
+ })
+ } else {
+ this.$set(this.HBillList[this.curPage - 1][index], 'isActive', !this.HBillList[this.curPage - 1][
+ index
+ ]['isActive'])
+ console.log(this.HBillList[this.curPage - 1][index])
+ // 璁剧疆浜嗗婧愬崟妯″紡
+ this.setMultiSourceBillList({
+ HInterID: interid,
+ HBillNo: billno,
+ HIsActive: this.HBillList[this.curPage - 1][index]['isActive']
+ })
+ }
+
+ // this.exit()
+ },
+ setMultiSourceBillList(billInfo) {
+ let index = this.multiSouceBillList.findIndex(item => item.HInterID == billInfo.HInterID)
+ if (index == -1) {
+ billInfo['count'] = 1
+ this.multiSouceBillList.push(billInfo)
+ } else {
+ if (billInfo.HIsActive) {
+ // 濡傛灉瀵瑰簲鍗曟嵁浼犲叆鐨勬槸鍚︽縺娲绘暟鏄痶rue锛屽垯璁℃暟鍣�+1
+ this.multiSouceBillList[index]['count']++;
+ } else {
+ // 濡傛灉瀵瑰簲鍗曟嵁浼犲叆鐨勬槸鍚︽縺娲绘暟鏄痜alse锛屽垯璁℃暟鍣�-1
+ this.multiSouceBillList[index]['count']--;
+ }
+ if (this.multiSouceBillList[index]['count'] == 0) {
+ // 娌℃湁閫変腑鐨勫崟鎹紝鍒欑Щ闄ょ紦瀛樹腑鐨勬暟鎹�
+ this.multiSouceBillList.splice(index, 1)
+ }
+ }
+ console.log('this.multiSouceBillList: ', this.multiSouceBillList);
+ },
+ getsWhere() {
+ let sWhere = ''
+ if (this.HBeginDate && this.HEndDate) {
+ sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) between '${this.HBeginDate}' and '${this.HEndDate}'`
+ }
+
+
+ if (this.HNumber) {
+ sWhere += ` and 璁惧浠ｇ爜 like '%${this.HNumber}%'`
+ }
+
+ if (this.HName) {
+ sWhere += ` and 璁惧鍚嶇О like '%${this.HName}%'`
+ }
+
+ if (this.HBillNo) {
+ sWhere += ` and 鍗曟嵁鍙� like '%${this.HBillNo}%'`
+ }
+ if (this.HSourceBillType === '璁惧缁翠慨璁板綍鍗�') {
+ sWhere += ` and isnull(缁翠慨浜�,'')!='${uni.getStorageSync('HUserName')}$' `
+ }
+ sWhere += ` and isnull(鍏抽棴浜�,'')!='' `
+
+
+ return sWhere
+ },
+ getBillList() {
+ this.HBillList = []
+ this.length = 0
+ this.page = 0
+ this.curPage = 1
+
+ let type = "GZ"; // 榛樿鏄晠闅滃崟
+
+ if (this.HSourceBillType === '璁惧缁翠慨鐧昏鍗�') {
+ type = "GZ";
+ } else if (this.HSourceBillType === '璁惧缁翠慨娲惧伐鍗�') {
+ type = "PG";
+ } else if (this.HSourceBillType === '璁惧缁翠慨璁板綍鍗�') {
+ type = "WX";
+ }
+
+ CommonUtils.doRequest(
+ "/Web/GetEquipmentBillsList", {
+ sWhere: this.getsWhere(),
+ Type: type,
+ user: getUserInfo()["Czymc"]
+ },
+ (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.length = Array.from(data).length
+ const result = [];
+ for (let i = 0; i < data.length; i += this.size) {
+ result.push(data.slice(i, i + this.size));
+ }
+ this.HBillList = result
+ this.page = result.length
+ setTimeout(() => {
+ this.enablefocus = true
+ }, 500)
+ } else {
+ setTimeout(() => {
+ this.enablefocus = true
+ }, 500)
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ )
+ },
+ },
+ }
+</script>
+
+<style lang="scss">
+ .content {
+ box-sizing: border-box;
+ border-radius: 15rpx 15rpx 0 0;
+ padding: 20rpx 20rpx 40rpx 20rpx;
+ background-color: #fff;
+ display: flex;
+ flex-direction: column;
+ gap: 10rpx;
+
+ .search-condition {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ gap: 20rpx;
+ font-size: 30rpx;
+
+ .title {
+ width: 5rem;
+ text-align: right;
+ }
+
+ .right {
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ height: auto;
+ padding: 8rpx 16rpx;
+
+ input {
+ width: 100%;
+ font-size: 30rpx;
+ }
+ }
+ }
+
+ .buttons {
+ display: flex;
+ flex-direction: row;
+ gap: 20rpx;
+ justify-content: flex-end;
+
+ >button {
+ display: inline-flex;
+ width: 4rem;
+ }
+ }
+
+ .options-wrapper {
+ padding: 20rpx;
+ display: grid;
+ grid-template-columns: repeat(1, 1fr);
+ gap: 20rpx;
+
+ >view {
+ margin: 0 !important;
+ box-sizing: border-box;
+
+ }
+
+ .item {
+ .left {
+ display: inline-block;
+ width: 6rem;
+ }
+
+ .right {
+ display: inline-block;
+ }
+ }
+ }
+
+ .uni-card--is-active {
+ background-color: rgba(0, 122, 255, 0.2);
+ }
+
+ .daterange {
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: center;
+ align-items: center;
+
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/components/BillListPopup/BillListPopupMouldConkBookBill.vue b/components/BillListPopup/BillListPopupMouldConkBookBill.vue
index a7237af..d2ea0f6 100644
--- a/components/BillListPopup/BillListPopupMouldConkBookBill.vue
+++ b/components/BillListPopup/BillListPopupMouldConkBookBill.vue
@@ -246,6 +246,7 @@
if (this.HBillNo) {
sWhere += ` and 鍗曟嵁鍙� like '%${this.HBillNo}%'`
}
+ sWhere += ` and isnull(鍏抽棴浜�,'')!='' `
return sWhere
},
getBillList() {
diff --git a/manifest.json b/manifest.json
index dfd7443..3073b58 100644
--- a/manifest.json
+++ b/manifest.json
@@ -158,6 +158,20 @@
}
}
}
+ },
+ "LcPrinter" : {
+ "__plugin_info__" : {
+ "name" : "LcPrinter",
+ "description" : "鏂扮増鎵撳嵃鎻掍欢",
+ "platforms" : "Android",
+ "url" : "",
+ "android_package_name" : "",
+ "ios_bundle_id" : "",
+ "isCloud" : false,
+ "bought" : -1,
+ "pid" : "",
+ "parameters" : {}
+ }
}
}
},
diff --git a/nativeplugins/LcPrinter/android/unilcprinterplugin_module-release.aar b/nativeplugins/LcPrinter/android/unilcprinterplugin_module-release.aar
new file mode 100644
index 0000000..76138ef
--- /dev/null
+++ b/nativeplugins/LcPrinter/android/unilcprinterplugin_module-release.aar
Binary files differ
diff --git a/nativeplugins/LcPrinter/package.json b/nativeplugins/LcPrinter/package.json
new file mode 100644
index 0000000..d2af7ef
--- /dev/null
+++ b/nativeplugins/LcPrinter/package.json
@@ -0,0 +1,25 @@
+{
+ "name": "LcPrinter",
+ "id": "LcPrinter",
+ "version": "1.0.1",
+ "description": "鏂扮増鎵撳嵃鎻掍欢",
+ "_dp_type":"nativeplugin",
+ "_dp_nativeplugin":{
+ "android": {
+ "plugins": [
+ {
+ "type": "module",
+ "name": "LcPrinter",
+ "class": "uni.dcloud.io.uniplugin_lcprint_new.PrinterModule"
+ }
+ ],
+ "abis": [
+ "armeabi-v7a",
+ "arm64-v8a",
+ "x86"
+ ],
+ "integrateType": "aar",
+ "minSdkVersion" : 21
+ }
+ }
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 2ee1f48..268d60d 100644
--- a/pages.json
+++ b/pages.json
@@ -230,13 +230,13 @@
"enablePullDownRefresh": true
}
},
- // {
- // "path": "pages/baogong/OA_ErrMsgBackBill",
- // "style": {
- // "navigationBarTitleText": "寮傚父鍙嶉鍗�",
- // "enablePullDownRefresh": false
- // }
- // },
+ {
+ "path": "pages/baogong/OA_ErrMsgBackBill",
+ "style": {
+ "navigationBarTitleText": "寮傚父鍙嶉鍗�",
+ "enablePullDownRefresh": false
+ }
+ },
{
"path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBillList",
"style": {
@@ -1676,7 +1676,7 @@
"style": {
"navigationBarTitleText": "璁惧缁翠慨璁板綍鍗曞垪琛�"
}
- },
+ },
{
"path" : "pages/ZLGL/awaitCheckBillList/awaitCheckBillList",
"style" :
diff --git a/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue b/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue
index 17ddc2b..647fc59 100644
--- a/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue
+++ b/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue
@@ -1,938 +1,986 @@
<template>
- <view>
- <view class="tabs" id="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
- <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
- </view>
- <!-- 鍩烘湰淇℃伅 -->
- <template v-if="tabs == 0">
- <view class="form" :style="{
+ <view>
+ <view class="tabs" id="tabs">
+ <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+ <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</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="enableEdit?'right':'righton'">
- <input v-model="hform.HBarCode" :disabled="!enableEdit"
- @confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)璁惧鏉＄爜" />
- </view>
- <view class="icon-wrapper">
- <uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
- </view>
- </view>
- <view class="form-item">
- <view class="title">缁翠慨寮�濮�:</view>
- <view class="right">
- <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HRepairPlanBeginDate">
- <input :value="hform.HRepairBeginDate" />
- </uni-datetime-picker>
- </view>
- </view>
- <view class="form-item">
- <view class="title">缁翠慨缁撴潫:</view>
- <view class="right">
- <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HRepairPlanEndDate">
- <input :value="hform.HRepairEndDate" />
- </uni-datetime-picker>
- </view>
- </view>
- <view class="form-item">
- <view class="title">缁翠慨鍐呭:</view>
- <view class="right">
- <textarea v-model="hform.HRepairContent" placeholder="璇疯緭鍏ョ淮淇唴瀹�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
- <view class="righton">
- <input disabled v-model="hform.HBillNo" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曟嵁鏃ユ湡:</view>
- <view class="righton">
- <input disabled v-model="hform.HDate" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">婧愬崟绫诲瀷:</view>
- <zxz-uni-data-select class="right" :localdata="[
- {key: '璁惧缁翠慨鐧昏鍗�', value: '璁惧缁翠慨鐧昏鍗�'},
- {key: '鎵嬪伐褰曞叆', value: '鎵嬪伐褰曞叆'},
- {key: '璁惧缁翠慨娲惧伐鍗�', value: '璁惧缁翠慨娲惧伐鍗�'},
- ]" dataKey="key" dataValue="value" v-model="hform.HMainSourceBillType">
- </zxz-uni-data-select>
- </view>
- <view class="form-item">
- <view class="title">鏁呴殰鐧昏鍗�:</view>
- <view :class="enableSourceBillEdit?'right':'righton'" >
- <input v-model="hform.HMainSourceBillNo" :disabled="enableSourceBillEdit?false:true"
- @confirm="GetMessageByHMainSourceBillNo(hform.HMainSourceBillNo)"
- placeholder="璇疯緭鍏�(鎴栨壂鎻�)鏁呴殰鐧昏鍗�" />
- </view>
- <view class="icon-wrapper">
- <uni-icons type="scan" size="20" @click="toScanHMainSourceBillNo"></uni-icons>
- </view>
- </view>
- <view class="form-item">
- <view class="title">缁翠慨瑕佹眰:</view>
- <view class="right">
- <textarea v-model="hform.HExplanation" placeholder="璇疯緭鍏ョ淮淇姹�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鏃堕棿鍗曚綅:</view>
- <zxz-uni-data-select class="right" :localdata="[
+ <view class="form-item">
+ <view class="title">璁惧鏉＄爜:</view>
+ <view :class="enableEdit?'right':'righton'">
+ <input v-model="hform.HBarCode" :disabled="!enableEdit"
+ @confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)璁惧鏉＄爜" />
+ </view>
+ <view class="icon-wrapper">
+ <uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">缁翠慨寮�濮�:</view>
+ <view class="right">
+ <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HRepairPlanBeginDate">
+ <input :value="hform.HRepairBeginDate" />
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">缁翠慨缁撴潫:</view>
+ <view class="right">
+ <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HRepairPlanEndDate">
+ <input :value="hform.HRepairEndDate" />
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">缁翠慨鍐呭:</view>
+ <view class="right">
+ <textarea v-model="hform.HRepairContent" placeholder="璇疯緭鍏ョ淮淇唴瀹�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙�:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HBillNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鏃ユ湡:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HDate" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">婧愬崟绫诲瀷:</view>
+ <view class="right" v-show="showHMainSourceBillType">
+ <picker :range="arrayHMainSourceBillType" @change="HMainSourceBillTypeChange">
+
+ <input disabled name="HMainSourceBillType" v-model="HMainSourceBillType"
+ placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+ <view class="picker-overlay"></view>
+ </picker>
+ </view>
+ <view class="righton" v-show="!showHMainSourceBillType">
+ <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+ placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title required">婧愬崟鍗曞彿:</view>
+ <view :class="enableSourceBillEdit?'right':'righton'">
+ <input v-model="hform.HMainSourceBillNo" :disabled="enableSourceBillEdit?false:true"
+ @confirm="GetMessageByHMainSourceBillNo(hform.HMainSourceBillNo)"
+ placeholder="璇疯緭鍏�(鎴栨壂鎻�)婧愬崟鍗曞彿" />
+ </view>
+ <view class="icon-wrapper" v-show="hform.HMainSourceBillType != '鎵嬪伐褰曞叆'"
+ :disabled="hform.HMainSourceBillType == '鎵嬪伐褰曞叆'">
+ <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+ </view>
+ <view class="icon-wrapper">
+ <uni-icons type="scan" size="20" @click="toScanHMainSourceBillNo"></uni-icons>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">缁翠慨瑕佹眰:</view>
+ <view class="right">
+ <textarea v-model="hform.HExplanation" placeholder="璇疯緭鍏ョ淮淇姹�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鏃堕棿鍗曚綅:</view>
+ <zxz-uni-data-select class="right" :localdata="[
{key: '灏忔椂', value: '灏忔椂'},
{key: '澶�', value: '澶�'},
{key: '鏈�', value: '鏈�'},
]" dataKey="key" dataValue="value" v-model="hform.HCycleUnit">
- </zxz-uni-data-select>
- </view>
- <view class="form-item">
- <view class="title">缁翠慨宸ユ椂:</view>
- <view class="right">
- <input type="number" v-model="hform.HTimes" />
- </view>
- </view>
- <view class="form-item">
- <view class="title required">閮ㄩ棬:</view>
- <zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
- dataValue="HItemID" v-model="hform.HDeptID">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title">缁翠慨宸ユ椂:</view>
+ <view class="right">
+ <input type="number" v-model="hform.HTimes" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title required">閮ㄩ棬:</view>
+ <zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
+ dataValue="HItemID" v-model="hform.HDeptID">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title required">缁翠慨浜�:</view>
+ <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+ dataValue="HItemID" v-model="hform.HEmpID">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title required">缁翠慨椤圭洰:</view>
+ <zxz-uni-data-select required class="right" :localdata="HRepairList" dataKey="缁翠慨椤圭洰"
+ dataValue="hitemid" v-model="hform.HRepairID">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title required">璐熻矗浜�:</view>
+ <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+ dataValue="HItemID" v-model="hform.HManagerID">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title">璁惧鍚嶇О:</view>
+ <view class="righton">
+ <input v-model="hform.HBarName" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璁惧瑙勬牸:</view>
+ <view class="righton">
+ <input v-model="hform.HBarSpec" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璁惧鍨嬪彿:</view>
+ <view class="righton">
+ <input v-model="hform.HBarModel" disabled />
+ </view>
+ </view>
+ </view>
+ </template>
- </zxz-uni-data-select>
- <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
- </view>
- <view class="form-item">
- <view class="title required">缁翠慨浜�:</view>
- <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
- dataValue="HItemID" v-model="hform.HEmpID">
-
- </zxz-uni-data-select>
- <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
- </view>
- <view class="form-item">
- <view class="title required">缁翠慨椤圭洰:</view>
- <zxz-uni-data-select required class="right" :localdata="HRepairList" dataKey="缁翠慨椤圭洰"
- dataValue="hitemid" v-model="hform.HRepairID">
-
- </zxz-uni-data-select>
- <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
- </view>
- <view class="form-item">
- <view class="title required">璐熻矗浜�:</view>
- <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
- dataValue="HItemID" v-model="hform.HManagerID">
-
- </zxz-uni-data-select>
- <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
- </view>
- <view class="form-item">
- <view class="title">璁惧鍚嶇О:</view>
- <view class="righton">
- <input v-model="hform.HBarName" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">璁惧瑙勬牸:</view>
- <view class="righton">
- <input v-model="hform.HBarSpec" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">璁惧鍨嬪彿:</view>
- <view class="righton">
- <input v-model="hform.HBarModel" disabled />
- </view>
- </view>
- </view>
- </template>
-
- <!-- 鍏朵粬淇℃伅 -->
- <template v-if="tabs == 2">
- <view class="form" :style="{
+ <!-- 鍏朵粬淇℃伅 -->
+ <template v-if="tabs == 2">
+ <view class="form" :style="{
height: containerHeight + 'px',
overflow: 'auto'
}">
- <view class="form-item">
- <view class="title">鍒涘缓浜�:</view>
- <view class="righton">
- <input v-model="hform.HMaker" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍒涘缓鏃ユ湡:</view>
- <view class="righton">
- <input v-model="hform.HMakeDate" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">淇敼浜�:</view>
- <view class="righton">
- <input v-model="hform.HUpDater" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">淇敼鏃ユ湡:</view>
- <view class="righton">
- <input v-model="hform.HUpDateDate" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">瀹℃牳浜�:</view>
- <view class="righton">
- <input v-model="hform.HChecker" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">瀹℃牳鏃堕棿:</view>
- <view class="righton">
- <input v-model="hform.HCheckDate" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">浣滃簾浜�:</view>
- <view class="righton">
- <input v-model="hform.HDeleteMan" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">浣滃簾鏃ユ湡:</view>
- <view class="righton">
- <input v-model="hform.HDeleteDate" />
- </view>
- </view>
- </view>
+ <view class="form-item">
+ <view class="title">鍒涘缓浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HMaker" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍒涘缓鏃ユ湡:</view>
+ <view class="righton">
+ <input v-model="hform.HMakeDate" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HUpDater" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼鏃ユ湡:</view>
+ <view class="righton">
+ <input v-model="hform.HUpDateDate" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HChecker" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳鏃堕棿:</view>
+ <view class="righton">
+ <input v-model="hform.HCheckDate" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浣滃簾浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HDeleteMan" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浣滃簾鏃ユ湡:</view>
+ <view class="righton">
+ <input v-model="hform.HDeleteDate" />
+ </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" v-if="operationType!=4" size="mini" @tap="addNew">鏂板</button>
- <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
- </view>
- <!-- <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload> -->
- </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" v-if="operationType!=4" size="mini" @tap="addNew">鏂板</button>
+ <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ </view>
+ <!-- <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload> -->
+ <!-- 婧愬崟鍗曟嵁鍒楄〃寮圭獥 -->
+ <BillListPopupEquipConkBookBillVue ref="billList" :HBillType="hform.HBillType"
+ :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
+ </BillListPopupEquipConkBookBillVue>
+ </view>
</template>
<script>
- import dayjs from "dayjs";
- import {
- CommonUtils
- } from "@/utils/common";
- import {
- MpaasScan
- } from "@/utils/mpaasScan.js"
- import {
- getUserInfo
- } from "../../../utils/auth";
- export default {
- // 璁惧缁翠慨璁板綍鍗�
- name: 'Sb_EqpMaintenanceBill',
- data() {
- return {
- tabs: 0,
- HMainSourceBillType: "",
- btnTop: 0,
- tabsBottom: 0,
- HModName: "Sb_EqpMaintenanceBill",
- HBillType: '3910',
- operationType: 1,
- uploadOptions: {},
- enableEdit: true,
- enableSourceBillEdit: true,
+ import dayjs from "dayjs";
+ import {
+ CommonUtils
+ } from "@/utils/common";
+ import {
+ MpaasScan
+ } from "@/utils/mpaasScan.js"
+ import {
+ getUserInfo
+ } from "../../../utils/auth";
+ // 寮曞叆婧愬崟鍗曟嵁鍒楄〃寮圭獥缁勪欢
+ import BillListPopupEquipConkBookBillVue from '../../../components/BillListPopup/BillListPopupEquipConkBookBill.vue';
- HDeptList: [],
- HRepairCheckList: [],
- HEmpList: [],
- HRepairList: [],
+ export default {
+ // 璁惧缁翠慨璁板綍鍗�
+ name: 'Sb_EqpMaintenanceBill',
+ components: {
+ BillListPopupEquipConkBookBillVue
+ },
+ data() {
+ return {
+ tabs: 0,
+
+ btnTop: 0,
+ tabsBottom: 0,
+ HModName: "Sb_EqpMaintenanceBill",
+ HBillType: '3910',
+ operationType: 1,
+ uploadOptions: {},
+ enableEdit: true,
+ enableSourceBillEdit: true,
- hform: {
- HBarCode: "",
- HBarCode: '',
- HRepairBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HRepairEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HRepairContent: '',
- HBillNo: '',
- HInterID: 0,
- HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HDeptName: '',
- HDeptID: 0,
- HEmpName: '',
- HEmpID: 0,
- HRepair: '',
- HRepairID: 0,
- HExplanation: '',
- HMainSourceBillType: '璁惧缁翠慨鐧昏鍗�',
- HMainSourceBillNo: '',
- HMainSourceInterID: 0,
- HMainSourceEntryID: 0,
- HManagerName: '',
- HManagerID: 0,
- HTimes: '',
- HCycleUnit: '灏忔椂',
- HBarName: '',
- HNumber: '',
- HEquipID: 0,
- HBarSpec: '',
- HBarModel: '',
- HMaker: getUserInfo()["Czymc"],
- HChecker: '',
- HCloseMan: '',
- HUpDater: '',
- HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
- HCheckDate: '',
- HCloseDate: '',
- HUpDateDate: '',
- HDeleteMan: '',
- HDeleteDate: ''
- },
- HDetailList: [{
- "HRepairID": 0,
- "HRepairCode": "",
- "HRepairName": "",
- "HManagerID": 0,
- "HManagerCode": "",
- "HManagerName": "",
- "HRepairExplanation": '',
- "HRemark": "",
- "HEmpID": '',
- "HSourceInterID": 0,
- "HSourceEntryID": 0,
- "HSourceBillNo": ''
- }]
- };
- },
- computed: {
- containerHeight: {
- get() {
- return this.btnTop - this.tabsBottom - 5
- }
- },
- },
- methods: {
- // 缁翠慨椤圭洰
- async getRepairList() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: '/Gy_Repair/GetRepairList',
- data: {
- sWhere: '',
- user: getUserInfo()["Czymc"]
- }
- })
+ // 婧愬崟绫诲瀷鐩稿叧
+ HMainSourceBillType: "璁惧缁翠慨鐧昏鍗�", // 鐢ㄤ簬鏄剧ず鐨勬簮鍗曠被鍨�
+ arrayHMainSourceBillType: ['璁惧缁翠慨鐧昏鍗�', '鎵嬪伐褰曞叆', '璁惧缁翠慨娲惧伐鍗�'],
+ arrayHMainSourceBillTypeID: ['璁惧缁翠慨鐧昏鍗�', '鎵嬪伐褰曞叆', '璁惧缁翠慨娲惧伐鍗�'], // 瀵瑰簲鐨勫崟鎹被鍨婭D
+ showHMainSourceBillType: true,
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- this.HRepairList = data
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇妫�楠岄」鐩け璐�: ${Message}`
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇妫�楠岄」鐩け璐�: ${err}`
- })
- }
- },
- // 鍒犻櫎鏄庣粏
- delDetail(item) {
+ HDeptList: [],
+ HRepairCheckList: [],
+ HEmpList: [],
+ HRepairList: [],
- },
- // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
- ValidCheck() {
- if (this.hform.HEquipID == 0) {
- return {
- Message: "鏈綍鍏ヨ澶囦俊鎭紝璇峰厛褰曞叆璁惧淇℃伅!",
- state: false
- }
- }
- if (this.hform.HDeptID == 0) {
- return {
- Message: "閮ㄩ棬涓嶅緱涓虹┖!",
- state: false
- }
- }
- if (this.hform.HEmpID == 0) {
- return {
- Message: "楠屾敹浜轰笉寰椾负绌�!",
- state: false
- }
- }
- if (this.hform.HRepairCheckMainID == 0) {
- return {
- Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
- state: false
- }
- }
- if (this.hform.HManagerID == 0) {
- return {
- Message: "璐熻矗浜轰笉寰椾负绌�!",
- state: false
- }
- }
+ hform: {
+ HBillType: '3910',
+ HStockOrgID: uni.getStorageSync("OrganizationID"),
+ HBarCode: "",
+ HBarCode: '',
+ HRepairBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HRepairEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HRepairContent: '',
+ HBillNo: '',
+ HInterID: 0,
+ HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HDeptName: getUserInfo().HDeptName,
+ HDeptID: getUserInfo().HDeptID,
+ HEmpName: getUserInfo().HEmpName,
+ HEmpID: getUserInfo().HEmpID,
+ HRepair: '',
+ HRepairID: 0,
+ HExplanation: '',
+ HMainSourceBillType: '璁惧缁翠慨鐧昏鍗�', // 榛樿涓鸿澶囩淮淇櫥璁板崟
+ HMainSourceBillNo: '',
+ HMainSourceInterID: 0,
+ HMainSourceEntryID: 0,
+ HManagerName: getUserInfo().HManagerName,
+ HManagerID: getUserInfo().HManagerID,
+ HTimes: 0,
+ HCycleUnit: '灏忔椂',
+ HBarName: '',
+ HNumber: '',
+ HEquipID: 0,
+ HBarSpec: '',
+ HBarModel: '',
+ HMaker: getUserInfo()["Czymc"],
+ HChecker: '',
+ HCloseMan: '',
+ HUpDater: '',
+ HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HCheckDate: '',
+ HCloseDate: '',
+ HUpDateDate: '',
+ HDeleteMan: '',
+ HDeleteDate: ''
+ },
+ HDetailList: [{
+ "HRepairID": 0,
+ "HRepairCode": "",
+ "HRepairName": "",
+ "HManagerID": 0,
+ "HManagerCode": "",
+ "HManagerName": "",
+ "HRepairExplanation": '',
+ "HRemark": "",
+ "HEmpID": '',
+ "HSourceInterID": 0,
+ "HSourceEntryID": 0,
+ "HSourceBillNo": ''
+ }]
+ };
+ },
+ computed: {
+ containerHeight: {
+ get() {
+ return this.btnTop - this.tabsBottom - 5
+ }
+ },
+ },
+ methods: {
+ // 鏄剧ず婧愬崟鍗曟嵁鍒楄〃寮圭獥
+ showBillList() {
+ this.$refs.billList.showPopup()
+ },
- return {
- Message: "",
- state: true
- }
- },
- addNew() {
- uni.redirectTo({
- url: './Sb_EquipRepairSendWorkBill?operationType=1'
- })
- },
- goBack() {
- uni.navigateBack()
- },
- checkBoxChangeHandler(index, e) {
- let cr = e.detail.value
- if (cr.length == 0) {
- this.HCheckFileList[index]["HDotCheckResult"] = false
- } else {
- this.HCheckFileList[index]["HDotCheckResult"] = true
- }
- },
- uploadFile(index) {
- console.log('filePath: ', this.attachmentInfo[index].filePath);
- // 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
- uni.uploadFile({
- url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
- filePath: this.attachmentInfo[index].filePath,
- name: 'file',
- formData: {
- HBillNo: this.hform.HBillNo,
- HRemark: "",
- HUserName: getUserInfo()["Czymc"]
- },
- success: (uploadRes) => {
- CommonUtils.showTips({
- message: "涓婁紶鎴愬姛"
- })
- this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
- },
- fail: (err) => {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `涓婁紶澶辫触: ${err}`
- })
- }
- })
- },
- delFile(index) {
- console.log('attachmentInfo: ', this.attachmentInfo[index]);
- uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
- success: (res) => {
- if (res.confirm) {
- this.attachmentInfo.splice(index, 1)
- }
- },
- })
+ // 閫夋嫨婧愬崟绫诲瀷
+ HMainSourceBillTypeChange(e) {
+ if (e.detail.value == -1 || e.detail.value == NaN) {
+ this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+ this.hform.HMainSourceBillType = '鎵嬪伐褰曞叆'
+ return
+ }
- },
- handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
- console.log('file: ', res);
- let fileInfo = res.data[0]
- this.attachmentInfo.push({
- fileName: fileInfo.name,
- size: fileInfo.size,
- status: '绛夊緟涓婁紶',
- filePath: fileInfo.tempFilePath
- })
- },
- // 涓婁紶鏂囦欢
- fileUpload() {
- this.$refs.XeUpload.upload('file', {});
- },
- //鑾峰彇鐝鏁版嵁
- async getShiftList() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: '/Web/GetGy_ShiftsList_Json',
- data: {
- Shifts: "",
- }
- })
+ this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+ this.hform.HMainSourceBillType = this.arrayHMainSourceBillTypeID[e.detail.value]
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- this.HShiftsList = data
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: Message
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: err
- })
- }
- },
- //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
- async getHDeptList() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: '/Gy_Department/list',
- data: {
- sWhere: ` and HUSEORGID = ${uni.getStorageSync('OrganizationID')} `,
- user: uni.getStorageSync('HUserName'),
- Organization: uni.getStorageSync('Organization')
- }
- })
+ // 缂撳瓨褰撳墠椤甸潰閫夋嫨
+ const pages = getCurrentPages()
+ const currentPage = pages[pages.length - 1]
+ uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
+ HSourceBillTypeName: this.HMainSourceBillType,
+ HSourceBillType: this.hform.HMainSourceBillType
+ })
+ },
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- this.HDeptList = data
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: Message
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: err
- })
- }
- },
- // 鑾峰彇鑱屽憳鏁版嵁
- async getEmpList() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: '/PublicPageMethod/UserList',
- data: {
- sWhere: " where 1=1",
- }
- })
+ // 璇诲彇缂撳瓨
+ loadCache() {
+ const pages = getCurrentPages()
+ const currentPage = pages[pages.length - 1]
+ let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`)
+ if (HBillTypeCache) {
+ this.HMainSourceBillType = HBillTypeCache.HSourceBillTypeName
+ this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType
+ }
+ },
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- this.HEmpList = data
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: Message
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: err
- })
- }
- },
- // 鑾峰彇楠岃瘉椤圭洰鏁版嵁
- async getCheckProjList() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: '/Gy_RepairCheck/GetRepairCheckList',
- data: {
- sWhere: "",
- user: uni.getStorageSync('HUserName'),
- }
- })
+ // 缁翠慨椤圭洰
+ async getRepairList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_Repair/GetRepairList',
+ data: {
+ sWhere: '',
+ user: getUserInfo()["Czymc"]
+ }
+ })
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- this.HRepairCheckList = data
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: Message
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: err
- })
- }
- },
- toScanCode() {
- MpaasScan.scanCode(cb => {
- this.hfrom.HBarCode = cb
- this.GetMessageByBarCode(cb)
- })
- },
- toScanHMainSourceBillNo() {
- MpaasScan.scanCode(cb => {
- this.hfrom.HMainSourceBillNo = cb
- this.GetMessageByHMainSourceBillNo(cb)
- })
- },
- async GetMessageByHMainSourceBillNo(HSouceBillNo) {
- try{
- let res = await CommonUtils.doRequest2Async({
- url: "/Sb_EqpRepairWorkBill/GetEqpConkBookBillListPage",
- data: {
- sWhere: ` and 鍗曟嵁鍙� = '${HSouceBillNo}'`,
- user: getUserInfo()["Czymc"],
- page: 1,
- size: 1,
- }
- })
-
- let {count, Message, data} = res.data
- if(count == 1) {
- this.hform.HMainSourceBillNo = data[0]["鍗曟嵁鍙�"]
- this.hform.HMainSourceInterID = data[0]["hmainid"]
- this.hform.HMainSourceEntryID = data[0]["hsubid"]
-
- }else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇缁翠慨鐧昏鍗曞け璐�: ${Message}`
- })
- }
- }catch(err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇缁翠慨鐧昏鍗曞け璐�: ${err}`
- })
- }
- },
- async GetMessageByBarCode(HBarCode) {
- try {
- let res = await CommonUtils.doRequest2Sync({
- url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_List",
- data: {
- HBarCode: HBarCode,
- },
- })
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HRepairList = data
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇缁翠慨椤圭洰澶辫触: ${Message}`
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇缁翠慨椤圭洰澶辫触: ${err}`
+ })
+ }
+ },
+ // 鍒犻櫎鏄庣粏
+ delDetail(item) {
+
+ },
+ // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
+ ValidCheck() {
+ if (this.hform.HEquipID == 0) {
+ return {
+ Message: "鏈綍鍏ヨ澶囦俊鎭紝璇峰厛褰曞叆璁惧淇℃伅!",
+ state: false
+ }
+ }
+ if (this.hform.HDeptID == 0) {
+ return {
+ Message: "閮ㄩ棬涓嶅緱涓虹┖!",
+ state: false
+ }
+ }
+ if (this.hform.HEmpID == 0) {
+ return {
+ Message: "楠屾敹浜轰笉寰椾负绌�!",
+ state: false
+ }
+ }
+ if (this.hform.HRepairCheckMainID == 0) {
+ return {
+ Message: "缁翠慨椤圭洰涓嶅緱涓虹┖!",
+ state: false
+ }
+ }
+ if (this.hform.HManagerID == 0) {
+ return {
+ Message: "璐熻矗浜轰笉寰椾负绌�!",
+ state: false
+ }
+ }
+ if (this.hform.HMainSourceBillType !== '鎵嬪伐褰曞叆') {
+ if (!this.hform.HMainSourceBillNo || this.hform.HMainSourceBillNo.trim() === '') {
+ CommonUtils.showTips({
+ message: '婧愬崟绫诲瀷闈炴墜宸ュ綍鍏ワ紝蹇呴』閫夋嫨婧愬崟锛�'
+ })
+ return
+ }
+ }
+ return {
+ Message: "",
+ state: true
+ }
+ },
+ addNew() {
+ uni.redirectTo({
+ url: './Sb_EquipRepairSendWorkBill?operationType=1'
+ })
+ },
+ goBack() {
+ uni.navigateBack()
+ },
+ checkBoxChangeHandler(index, e) {
+ let cr = e.detail.value
+ if (cr.length == 0) {
+ this.HCheckFileList[index]["HDotCheckResult"] = false
+ } else {
+ this.HCheckFileList[index]["HDotCheckResult"] = true
+ }
+ },
+ uploadFile(index) {
+ console.log('filePath: ', this.attachmentInfo[index].filePath);
+ // 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
+ uni.uploadFile({
+ url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
+ filePath: this.attachmentInfo[index].filePath,
+ name: 'file',
+ formData: {
+ HBillNo: this.hform.HBillNo,
+ HRemark: "",
+ HUserName: getUserInfo()["Czymc"]
+ },
+ success: (uploadRes) => {
+ CommonUtils.showTips({
+ message: "涓婁紶鎴愬姛"
+ })
+ this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
+ },
+ fail: (err) => {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `涓婁紶澶辫触: ${err}`
+ })
+ }
+ })
+ },
+ delFile(index) {
+ console.log('attachmentInfo: ', this.attachmentInfo[index]);
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+ success: (res) => {
+ if (res.confirm) {
+ this.attachmentInfo.splice(index, 1)
+ }
+ },
+ })
+
+ },
+ handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
+ console.log('file: ', res);
+ let fileInfo = res.data[0]
+ this.attachmentInfo.push({
+ fileName: fileInfo.name,
+ size: fileInfo.size,
+ status: '绛夊緟涓婁紶',
+ filePath: fileInfo.tempFilePath
+ })
+ },
+ // 涓婁紶鏂囦欢
+ fileUpload() {
+ this.$refs.XeUpload.upload('file', {});
+ },
+ //鑾峰彇鐝鏁版嵁
+ async getShiftList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Web/GetGy_ShiftsList_Json',
+ data: {
+ Shifts: "",
+ }
+ })
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HShiftsList = data
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: err
+ })
+ }
+ },
+ //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+ async getHDeptList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_Department/list',
+ data: {
+ sWhere: ` and HUSEORGID = ${uni.getStorageSync('OrganizationID')} `,
+ user: uni.getStorageSync('HUserName'),
+ Organization: uni.getStorageSync('Organization')
+ }
+ })
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HDeptList = data
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: err
+ })
+ }
+ },
+ // 鑾峰彇鑱屽憳鏁版嵁
+ async getEmpList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/PublicPageMethod/UserList',
+ data: {
+ sWhere: " where 1=1",
+ }
+ })
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HEmpList = data
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: err
+ })
+ }
+ },
+ // 鑾峰彇楠岃瘉椤圭洰鏁版嵁
+ async getCheckProjList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_RepairCheck/GetRepairCheckList',
+ data: {
+ sWhere: "",
+ user: uni.getStorageSync('HUserName'),
+ }
+ })
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HRepairCheckList = data
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: err
+ })
+ }
+ },
+ toScanCode() {
+ MpaasScan.scanCode(cb => {
+ this.hfrom.HBarCode = cb
+ this.GetMessageByBarCode(cb)
+ })
+ },
+ toScanHMainSourceBillNo() {
+ MpaasScan.scanCode(cb => {
+ this.hfrom.HMainSourceBillNo = cb
+ this.GetMessageByHMainSourceBillNo(cb)
+ })
+ },
+ async GetMessageByHMainSourceBillNo(HSouceBillNo) {
+ try {
+ // 鏍规嵁婧愬崟绫诲瀷閫夋嫨涓嶅悓鐨勬帴鍙�
+ if (this.hform.HMainSourceBillType === '璁惧缁翠慨鐧昏鍗�') {
+ url = "/Sb_EqpRepairWorkBill/GetEqpConkBookBillListPage";
+ dataField = {
+ sWhere: ` and 鍗曟嵁鍙� = '${HSouceBillNo}'`,
+ user: getUserInfo()["Czymc"],
+ page: 1,
+ size: 1,
+ };
+ } else if (this.hform.HMainSourceBillType === '璁惧缁翠慨娲惧伐鍗�') {
+ url = "/Sb_EquipRepairSendWorkBill/GetEquipRepairSendWorkBillListPage";
+ dataField = {
+ sWhere: ` and 鍗曟嵁鍙� = '${HSouceBillNo}'`,
+ user: getUserInfo()["Czymc"],
+ page: 1,
+ size: 1,
+ };
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鏆備笉鏀寔璇ユ簮鍗曠被鍨嬶細${this.hform.HMainSourceBillType}`
+ })
+ return;
+ }
+
+ let res = await CommonUtils.doRequest2Async({
+ url: url,
+ data: dataField
+ })
+
+ let { count, Message, data } = res.data
+ if (count == 1) {
+ this.hform.HMainSourceBillNo = data[0]["鍗曟嵁鍙�"]
+ this.hform.HMainSourceInterID = data[0]["hmainid"]
+ this.hform.HMainSourceEntryID = data[0]["hsubid"]
+
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇婧愬崟鍗曞彿澶辫触: ${Message}`
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇婧愬崟鍗曞彿澶辫触: ${err}`
+ })
+ }
+ },
+ async GetMessageByBarCode(HBarCode) {
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_List",
+ data: {
+ HBarCode: HBarCode,
+ },
+ })
- if (!res) {
- return
- }
+ if (!res) {
+ return
+ }
- let {
- data,
- count,
- Message
- } = res.data
+ let {
+ data,
+ count,
+ Message
+ } = res.data
- if (count == 1) {
- console.log('data: ', data);
- this.hform.HEquipID = data[0].hmainid
- this.hform.HBarName = data[0].璁惧鍚嶇О
- this.hform.HBarSpec = data[0].璁惧瑙勬牸
- this.hform.HBarModel = data[0].璁惧鍨嬪彿
- this.hform.HQty = 1
+ if (count == 1) {
+ console.log('data: ', data);
+ this.hform.HEquipID = data[0].hmainid
+ this.hform.HBarName = data[0].璁惧鍚嶇О
+ this.hform.HBarSpec = data[0].璁惧瑙勬牸
+ this.hform.HBarModel = data[0].璁惧鍨嬪彿
+ this.hform.HQty = 1
- this.enableEdit = false
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: Message
- })
- }
+ this.enableEdit = false
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: Message
+ })
+ }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: err
- })
- }
- },
- async GetItemByEquipFile() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Web/GetItemByEquipFile",
- data: {
- "EquipProjectID": this.hform.HEquipID,
- "Type": "DJ",
- "HDate": this.hform.HBeginDate
- }
- })
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: err
+ })
+ }
+ },
+ radioChange({
+ detail: {
+ value
+ }
+ }) {
+ this.hform.HCheckResult = value
+ },
+ async getMaxNum() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Web/GetMAXNum",
+ data: {
+ "HBillType": this.HBillType
+ }
+ })
+ let {
+ count,
+ data,
+ Message
+ } = res.data
+ this.hform.HInterID = 0
+ this.hform.HBillNo = data[0]["HBillNo"]
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+ })
+ }
+ },
+ async submit() {
+ let valid = this.ValidCheck()
+ if (!valid.state) {
+ CommonUtils.showTips({
+ message: valid.Message
+ })
+ return
+ }
- let {
- data,
- Message,
- count
- } = res.data
- if (count == 1) {
- this.hform.HEquipDotCheckRuleInterID = data[0].鐐规瑙勭▼ID
- this.hform.HEquipDotCheckRuleInterNo = data[0].鐐规瑙勭▼鍗曞彿
- this.hform.HPlanNo = data[0].鐐规璁″垝鍗�
- this.hform.HPlanInterID = (data[0].鐐规璁″垝ID == null ? 0 : data[0].鐐规璁″垝ID) == "" ? 0 : data[0]
- .鐐规璁″垝ID
- this.hform.HPlanEntryID = (data[0].鐐规璁″垝瀛怚D == null ? 0 : data[0].鐐规璁″垝瀛怚D) == "" ? 0 : data[
- 0].鐐规璁″垝瀛怚D
+ try {
+ let oMain = JSON.stringify(this.hform);
+ this.HDetailList[0].HManagerID = this.hform.HManagerID
+ this.HDetailList[0].HRepairID = this.hform.HRepairID
+ this.HDetailList[0].HRepairExplanation = this.hform.HExplanation
+ this.HDetailList[0].HEmpID = this.hform.HEmpID
+ this.HDetailList[0].HSourceInterID = this.hform.HMainSourceInterID
+ this.HDetailList[0].HSourceEntryID = this.hform.HMainSourceEntryID
+ this.HDetailList[0].HSourceBillNo = this.hform.HMainSourceBillNo
- this.HCheckFileList = Array.from(data).map(item => {
- return {
- "HDotCheckItemID": item.HDotCheckItemID,
- "HDotCheckCode": item.鐐规椤圭洰浠ｇ爜,
- "HDotCheckItem": item.鐐规椤圭洰,
- "HDotCheckPart": item.鐐规閮ㄤ綅,
- "HClaim": item.鍏蜂綋瑕佹眰,
- "HManagerID": item.璐熻矗浜篒D,
- "HManagerCode": item.璐熻矗浜轰唬鐮�,
- "HManagerName": item.璐熻矗浜哄悕绉�,
- "HSourceInterID": item.鐐规璁″垝ID == null ? 0 : item.鐐规璁″垝ID,
- "HSourceEntryID": item.鐐规璁″垝瀛怚D == null ? 0 : item.鐐规璁″垝瀛怚D,
- "HSourceBillNo": item.鐐规璁″垝鍗�,
- "HDotCheckItemClassID": 0,
- "HDotCheckItemClassName": "",
- "HDotCheckItemMethodID": 0,
- "HDotCheckItemMethodName": "",
- "HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
- }
- })
+ let sSubStr = JSON.stringify(this.HDetailList);
+ let sMainSub = oMain + ';' + sSubStr + `;-1;${this.operationType}` + ';' + getUserInfo()[
+ 'Czymc'];
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sb_PDA_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList",
+ data: {
+ "msg": sMainSub
+ },
+ method: "POST"
+ })
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${Message}`
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${err}`
- })
- }
- },
- radioChange({
- detail: {
- value
- }
- }) {
- this.hform.HCheckResult = value
- },
- async getMaxNum() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Web/GetMAXNum",
- data: {
- "HBillType": this.HBillType
- }
- })
+ if (!res) {
+ return
+ }
- let {
- count,
- data,
- Message
- } = res.data
- console.log('data: ', data);
- this.hform.HInterID = data[0]["HInterID"]
- this.hform.HBillNo = data[0]["HBillNo"]
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
- })
- }
- },
- async submit() {
- let valid = this.ValidCheck()
- if (!valid.state) {
- CommonUtils.showTips({
- message: valid.Message
- })
- return
- }
-
- try {
- let oMain = JSON.stringify(this.hform);
- this.HDetailList[0].HManagerID = this.hform.HManagerID
- this.HDetailList[0].HRepairID = this.hform.HRepairID
- this.HDetailList[0].HRepairExplanation = this.hform.HExplanation
- this.HDetailList[0].HEmpID = this.hform.HEmpID
- this.HDetailList[0].HSourceInterID = this.hform.HMainSourceInterID
- this.HDetailList[0].HSourceEntryID = this.hform.HMainSourceEntryID
- this.HDetailList[0].HSourceBillNo = this.hform.HMainSourceBillNo
-
- let sSubStr = JSON.stringify(this.HDetailList);
- let sMainSub = oMain + ';' + sSubStr + `;-1;${this.operationType}` + ';' + getUserInfo()[
- 'Czymc'];
- let res = await CommonUtils.doRequest2Sync({
- url: "/Sb_PDA_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList",
- data: {
- "msg": sMainSub
- },
- method: "POST"
- })
-
- if (!res) {
- return
- }
-
- let {
- count,
- Message
- } = res.data
- if (count == 1) {
- if(this.operationType == 4) {
- uni.showModal({
- title: '鎻愮ず',
- content: res.data.Message + '銆傚嵆灏嗚繑鍥炰笂绾ч〉闈�',
- showCancel: false,
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- setTimeout(() => {
- uni.navigateBack();
- }, 50)
- // uni.redirectTo({
- // url: './Sb_EquipRepairSendWorkBill?operationType=1'
- // })
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- setTimeout(() => {
- uni.navigateBack();
- }, 50)
- }
- }
- });
- return
- }
- uni.showModal({
- title: '鎻愮ず',
- content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- uni.redirectTo({
- url: './Sb_EquipRepairSendWorkBill?operationType=1'
- })
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- setTimeout(() => {
- uni.navigateBack();
- }, 50)
- }
- }
- });
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: "鎻愪氦鍗曟嵁澶辫触: " + Message
- })
- }
+ let {
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ if (this.operationType == 4) {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傚嵆灏嗚繑鍥炰笂绾ч〉闈�',
+ showCancel: false,
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ // uni.redirectTo({
+ // url: './Sb_EquipRepairSendWorkBill?operationType=1'
+ // })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ }
+ }
+ });
+ return
+ }
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url: './Sb_EquipRepairSendWorkBill?operationType=1'
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ }
+ }
+ });
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+ })
+ }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: "鎻愪氦鍗曟嵁澶辫触: " + err
- })
- }
- },
- async getEquipFileMain(HInterID) {
- try {
- let res = await CommonUtils.doRequest2Sync({
- url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_ListByHEquipID",
- data: {
- HEquipID: HInterID,
- },
- })
-
-
- if (!res) {
- return
- }
-
- let {
- data,
- count,
- Message
- } = res.data
-
- if (count == 1) {
- console.log('data: ', data);
- this.hform.HEquipID = data[0].hmainid
- this.hform.HBarName = data[0].璁惧鍚嶇О
- this.hform.HBarSpec = data[0].璁惧瑙勬牸
- this.hform.HBarModel = data[0].璁惧鍨嬪彿
- this.hform.HQty = 1
-
- this.enableEdit = false
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: Message
- })
- }
-
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: err
- })
- }
- }
- },
- onLoad(e) {
- console.log('e: ', e);
- if (!e.operationType) {
- this.operationType = 1
- } else {
- this.operationType = e.operationType
- }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鎻愪氦鍗曟嵁澶辫触: " + err
+ })
+ }
+ },
+ async getEquipFileMain(HInterID) {
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_ListByHEquipID",
+ data: {
+ HEquipID: HInterID,
+ },
+ })
- if (this.operationType == 1) {
- // 鏂板
- this.getMaxNum()
- } else if (this.operationType == 2) {
- // 澶嶅埗
- } else if (this.operationType == 3) {
- // 缂栬緫
- } else if (this.operationType == 4) {
- // 鐢辨姤宸ュ钩鍙版墦寮�
- let HEquipID = e.HEquipID
- this.getMaxNum()
- this.getEquipFileMain(HEquipID)
- }
+ if (!res) {
+ return
+ }
- this.getHDeptList()
- this.getEmpList()
- this.getRepairList()
- },
- 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)
- })
- }
- }
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+
+ if (count == 1) {
+ console.log('data: ', data);
+ this.hform.HEquipID = data[0].hmainid
+ this.hform.HBarName = data[0].璁惧鍚嶇О
+ this.hform.HBarSpec = data[0].璁惧瑙勬牸
+ this.hform.HBarModel = data[0].璁惧鍨嬪彿
+ this.hform.HQty = 1
+
+ this.enableEdit = false
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: Message
+ })
+ }
+
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: err
+ })
+ }
+ }
+ },
+ onLoad(e) {
+ console.log('e: ', e);
+ if (!e.operationType) {
+ this.operationType = 1
+ } else {
+ this.operationType = e.operationType
+ }
+
+ if (this.operationType == 1) {
+ // 鏂板
+ this.getMaxNum()
+ } else if (this.operationType == 2) {
+ // 澶嶅埗
+ } else if (this.operationType == 3) {
+ // 缂栬緫
+
+ } else if (this.operationType == 4) {
+ // 鐢辨姤宸ュ钩鍙版墦寮�
+ let HEquipID = e.HEquipID
+ this.getMaxNum()
+ this.getEquipFileMain(HEquipID)
+ }
+
+ this.getHDeptList()
+ this.getEmpList()
+ this.getRepairList()
+ this.loadCache()
+
+ // 鐩戝惉鍗曟嵁閫夋嫨瀹屾垚浜嬩欢
+ uni.$on('BillSelectComplete', (e) => {
+ console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
+ this.hform.HMainSourceInterID = e.HInterID
+ this.hform.HMainSourceBillNo = e.HBillNo
+ this.hform.HMainSourceEntryID = e.HEntryID
+ this.hform.HEquipID = e.HEquipID
+ this.hform.HBarName = e.HEquipName
+ this.hform.HBarSpec = e.HEquipSpec
+ this.hform.HBarModel = e.HEquipModel
+ this.$refs.billList.exit()
+ })
+ },
+ onUnload() {
+ uni.$off('BillSelectComplete')
+ },
+ 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)
+ })
+ }
+ }
</script>
<style lang="scss" scoped>
- @import "@/pages/MJGL/style/MJBillStyle.scss"
+ @import "@/pages/MJGL/style/MJBillStyle.scss";
+
+ .picker-overlay {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ z-index: 1;
+ }
</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
index e731c50..46200f5 100644
--- a/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
+++ b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
@@ -1,736 +1,834 @@
<template>
- <view>
- <view class="tabs" id="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 :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view> -->
- </view>
- <!-- 鍩烘湰淇℃伅 -->
- <template v-if="tabs == 0">
- <view class="form" :style="{
+ <view>
+ <view class="tabs" id="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 :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</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="enableEdit?'right':'righton'">
- <input v-model="hform.HBarCode" :disabled="!enableEdit"
- @confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)璁惧鏉＄爜" />
- </view>
- <view class="icon-wrapper">
- <uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鏈�缁堢粨璁�:</view>
- <view class="right none-border">
- <radio-group @change="radioChange" class="radio_Container">
- <label>
- <view>
- <radio value="OK" :checked="hform.HCheckResult == 'OK'" />
- <text>OK</text>
- </view>
- </label>
- </label>
- <view>
- <radio value="NG" :checked="hform.HCheckResult == 'NG'" />
- <text>NG</text>
- </view>
- </label>
- </radio-group>
- </view>
- </view>
- <view class="form-item">
- <view class="title">楠岃瘉鍐呭:</view>
- <view class="right">
- <textarea v-model="hform.HRepairCheckMainContent" placeholder="璇疯緭鍏ラ獙璇佸唴瀹�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
- <view class="righton">
- <input disabled v-model="hform.HBillNo" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曟嵁鏃ユ湡:</view>
- <view class="righton">
- <input disabled v-model="hform.HDate" />
- </view>
- </view>
- <view class="form-item">
- <view class="title required">閮ㄩ棬:</view>
- <zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
- dataValue="HItemID" v-model="hform.HDeptID">
-
- </zxz-uni-data-select>
- <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
- </view>
- <view class="form-item">
- <view class="title required">楠屾敹浜�:</view>
- <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
- dataValue="HItemID" v-model="hform.HEmpID">
-
- </zxz-uni-data-select>
- <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
- </view>
- <view class="form-item">
- <view class="title required">楠岃瘉椤圭洰:</view>
- <zxz-uni-data-select required class="right" :localdata="HRepairCheckList" dataKey="缁翠慨楠屾敹椤圭洰"
- dataValue="hitemid" v-model="hform.HRepairCheckMainID">
-
- </zxz-uni-data-select>
- <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
- </view>
- <view class="form-item">
- <view class="title required">璐熻矗浜�:</view>
- <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
- dataValue="HItemID" v-model="hform.HManagerID">
-
- </zxz-uni-data-select>
- <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
- </view>
- <view class="form-item">
- <view class="title">璁惧鍚嶇О:</view>
- <view class="righton">
- <input v-model="hform.HBarName" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">璁惧瑙勬牸:</view>
- <view class="righton">
- <input v-model="hform.HBarSpec" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">璁惧鍨嬪彿:</view>
- <view class="righton">
- <input v-model="hform.HBarModel" disabled />
- </view>
- </view>
- </view>
- </template>
- <!-- 鍏朵粬淇℃伅 -->
- <template v-if="tabs == 2">
- <view class="form" :style="{
+ <view class="form-item">
+ <view class="title">璁惧鏉＄爜:</view>
+ <view :class="enableEdit?'right':'righton'">
+ <input v-model="hform.HBarCode" :disabled="!enableEdit"
+ @confirm="GetMessageByBarCode(hform.HBarCode)" placeholder="璇疯緭鍏�(鎴栨壂鎻�)璁惧鏉＄爜" />
+ </view>
+ <view class="icon-wrapper">
+ <uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鏈�缁堢粨璁�:</view>
+ <view class="right none-border">
+ <radio-group @change="radioChange" class="radio_Container">
+ <label>
+ <view>
+ <radio value="OK" :checked="hform.HCheckResult == 'OK'" />
+ <text>OK</text>
+ </view>
+ </label>
+ </label>
+ <view>
+ <radio value="NG" :checked="hform.HCheckResult == 'NG'" />
+ <text>NG</text>
+ </view>
+ </label>
+ </radio-group>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">楠屾敹鍐呭:</view>
+ <view class="right">
+ <textarea v-model="HDetailList[0].HRepairCheckContent" placeholder="璇疯緭鍏ラ獙鏀跺唴瀹�" />
+ </view>
+ </view>
+ <!-- 缁翠慨璁板綍锛堟簮鍗曪級 -->
+ <view class="form-item">
+ <view class="title required">缁翠慨璁板綍:</view>
+ <view :class="enableSourceBillEdit?'right':'righton'">
+ <input v-model="hform.HMainSourceBillNo" :disabled="!enableSourceBillEdit"
+ @confirm="GetMessageByHMainSourceBillNo(hform.HMainSourceBillNo)"
+ placeholder="璇疯緭鍏�(鎴栨壂鎻�)缁翠慨璁板綍鍗曞彿" />
+ </view>
+ <!-- 鏀惧ぇ闀滃浘鏍� -->
+ <view class="icon-wrapper">
+ <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+ </view>
+ <!-- 鎵弿鍥炬爣 -->
+ <view class="icon-wrapper">
+ <uni-icons type="scan" size="20" @click="toScanHMainSourceBillNo"></uni-icons>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙�:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HBillNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鏃ユ湡:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HDate" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title required">閮ㄩ棬:</view>
+ <zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
+ dataValue="HItemID" v-model="hform.HDeptID">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title required">楠屾敹浜�:</view>
+ <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+ dataValue="HItemID" v-model="hform.HEmpID">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title required">楠屾敹椤圭洰:</view>
+ <zxz-uni-data-select required class="right" :localdata="HRepairCheckList" dataKey="缁翠慨楠屾敹椤圭洰"
+ dataValue="hitemid" v-model="hform.HRepairCheckID">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title required">璐熻矗浜�:</view>
+ <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
+ dataValue="HItemID" v-model="hform.HManagerID">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title">璁惧鍚嶇О:</view>
+ <view class="righton">
+ <input v-model="hform.HBarName" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璁惧瑙勬牸:</view>
+ <view class="righton">
+ <input v-model="hform.HBarSpec" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璁惧鍨嬪彿:</view>
+ <view class="righton">
+ <input v-model="hform.HBarModel" disabled />
+ </view>
+ </view>
+ </view>
+ </template>
+ <!-- 鍏朵粬淇℃伅 -->
+ <template v-if="tabs == 2">
+ <view class="form" :style="{
height: containerHeight + 'px',
overflow: 'auto'
}">
- <view class="form-item">
- <view class="title">鍒涘缓浜�:</view>
- <view class="righton">
- <input v-model="hform.HMaker" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍒涘缓鏃ユ湡:</view>
- <view class="righton">
- <input v-model="hform.HMakeDate" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">淇敼浜�:</view>
- <view class="righton">
- <input v-model="hform.HUpDater" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">淇敼鏃ユ湡:</view>
- <view class="righton">
- <input v-model="hform.HUpDateDate" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">瀹℃牳浜�:</view>
- <view class="righton">
- <input v-model="hform.HChecker" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">瀹℃牳鏃堕棿:</view>
- <view class="righton">
- <input v-model="hform.HCheckDate" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">浣滃簾浜�:</view>
- <view class="righton">
- <input v-model="hform.HDeleteMan" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">浣滃簾鏃ユ湡:</view>
- <view class="righton">
- <input v-model="hform.HDeleteDate" />
- </view>
- </view>
- </view>
+ <view class="form-item">
+ <view class="title">鍒涘缓浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HMaker" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍒涘缓鏃ユ湡:</view>
+ <view class="righton">
+ <input v-model="hform.HMakeDate" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HUpDater" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼鏃ユ湡:</view>
+ <view class="righton">
+ <input v-model="hform.HUpDateDate" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HChecker" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳鏃堕棿:</view>
+ <view class="righton">
+ <input v-model="hform.HCheckDate" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浣滃簾浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HDeleteMan" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浣滃簾鏃ユ湡:</view>
+ <view class="righton">
+ <input v-model="hform.HDeleteDate" />
+ </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>
- <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
- </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>
+ <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
+
+ <!-- 婧愬崟鍗曟嵁鍒楄〃寮圭獥 -->
+ <BillListPopupEquipConkBookBillVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="'璁惧缁翠慨璁板綍鍗�'"
+ :HStockOrgID="hform.HStockOrgID">
+ </BillListPopupEquipConkBookBillVue>
+ </view>
</template>
<script>
- import dayjs from "dayjs";
- import {
- CommonUtils
- } from "@/utils/common";
- import {
- MpaasScan
- } from "@/utils/mpaasScan.js"
- import {
- getUserInfo
- } from "../../../utils/auth";
- export default {
- name: 'sb_EquipRepairCheckBill',
- data() {
- return {
- tabs: 0,
- HMainSourceBillType: "",
- btnTop: 0,
- tabsBottom: 0,
- HModName: "sb_EquipRepairCheckBill",
- HBillType: '3911',
- operationType: 1,
- uploadOptions: {},
- enableEdit: true,
+ import dayjs from "dayjs";
+ import {
+ CommonUtils
+ } from "@/utils/common";
+ import {
+ MpaasScan
+ } from "@/utils/mpaasScan.js"
+ import {
+ getUserInfo
+ } from "../../../utils/auth";
+ // 寮曞叆婧愬崟鍗曟嵁鍒楄〃寮圭獥缁勪欢
+ import BillListPopupEquipConkBookBillVue from '../../../components/BillListPopup/BillListPopupEquipConkBookBill.vue';
- HDeptList: [],
- HRepairCheckList: [],
- HEmpList: [],
+ export default {
+ name: 'sb_EquipRepairCheckBill',
+ components: {
+ BillListPopupEquipConkBookBillVue
+ },
+ data() {
+ return {
+ tabs: 0,
+ btnTop: 0,
+ tabsBottom: 0,
+ HModName: "sb_EquipRepairCheckBill",
+ HBillType: '3911',
+ operationType: 1,
+ uploadOptions: {},
+ enableEdit: true,
+ enableSourceBillEdit: true, // 鏂板锛氭帶鍒剁淮淇褰曠紪杈戠姸鎬�
- hform: {
- "HBarCode": "",
- "HCheckBeginDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- "HCheckResult": "OK",
- "HRepairCheckMainContent": "",
- "HBillNo": "",
- "HInterID": 0,
- "HDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- "HDeptName": getUserInfo().HDeptName,
- "HDeptID": getUserInfo().HDeptID,
- "HEmpName": getUserInfo().HEmpName,
- "HEmpID": getUserInfo().HEmpID,
- "HManagerName": getUserInfo().HManagerName,
- "HManagerID": getUserInfo().HManagerID,
- "HRepairCheckMainName": "",
- "HRepairCheckMainID": 0,
- "HBarName": "",
- "HEquipID": 0,
- "HBarSpec": "",
- "HBarModel": "",
- "HMaker": getUserInfo()["Czymc"],
- "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- "HUpDater": "",
- "HUpDateDate": "",
- "HChecker": "",
- "HCheckDate": "",
- "HDeleteMan": "",
- "HDeleteDate": "",
- "lngBillKey": "",
- "lngBillSubKey": ""
- },
- HBillSub: [{ // 鍚庣鎺ュ彛闇�瑕併�傚惁鍒欐暟鎹笉浼氭樉绀哄湪缂撳瓨涓�
- "HRepairID": 0,
- "HRepairCode": "",
- "HRepairName": "",
- "HManagerID": 0,
- "HManagerCode": "",
- "HManagerName": "",
- "HRepairExplanation": "",
- "HRemark": "",
- "LAY_TABLE_INDEX": 0
- }]
- };
- },
- computed: {
- containerHeight: {
- get() {
- return this.btnTop - this.tabsBottom - 5
- }
- },
- },
- methods: {
- // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
- ValidCheck() {
- if (this.hform.HEquipID == 0) {
- return {
- Message: "鏈綍鍏ヨ澶囦俊鎭紝璇峰厛褰曞叆璁惧淇℃伅!",
- state: false
- }
- }
- if (this.hform.HDeptID == 0) {
- return {
- Message: "閮ㄩ棬涓嶅緱涓虹┖!",
- state: false
- }
- }
- if (this.hform.HEmpID == 0) {
- return {
- Message: "楠屾敹浜轰笉寰椾负绌�!",
- state: false
- }
- }
- if (this.hform.HRepairCheckMainID == 0) {
- return {
- Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
- state: false
- }
- }
- if (this.hform.HManagerID == 0) {
- return {
- Message: "璐熻矗浜轰笉寰椾负绌�!",
- state: false
- }
- }
+ HDeptList: [],
+ HRepairCheckList: [],
+ HEmpList: [],
- return {
- Message: "",
- state: true
- }
- },
- addNew() {
- uni.redirectTo({
- url: './Sb_EquipRepairCheckBill?operationType=1'
- })
- },
- goBack() {
- uni.navigateBack()
- },
- checkBoxChangeHandler(index, e) {
- let cr = e.detail.value
- if (cr.length == 0) {
- this.HCheckFileList[index]["HDotCheckResult"] = false
- } else {
- this.HCheckFileList[index]["HDotCheckResult"] = true
- }
- },
- uploadFile(index) {
- console.log('filePath: ', this.attachmentInfo[index].filePath);
- // 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
- uni.uploadFile({
- url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
- filePath: this.attachmentInfo[index].filePath,
- name: 'file',
- formData: {
- HBillNo: this.hform.HBillNo,
- HRemark: "",
- HUserName: getUserInfo()["Czymc"]
- },
- success: (uploadRes) => {
- CommonUtils.showTips({
- message: "涓婁紶鎴愬姛"
- })
- this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
- },
- fail: (err) => {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `涓婁紶澶辫触: ${err}`
- })
- }
- })
- },
- delFile(index) {
- console.log('attachmentInfo: ', this.attachmentInfo[index]);
- uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
- success: (res) => {
- if (res.confirm) {
- this.attachmentInfo.splice(index, 1)
- }
- },
- })
+ hform: {
+ "HBillType": '3911',
+ "HBarCode": "",
+ "HCheckBeginDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ "HCheckResult": "OK",
+ "HRepairCheckContent": "",
+ "HBillNo": "",
+ "HInterID": 0,
+ "HDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ "HDeptName": getUserInfo().HDeptName,
+ "HDeptID": getUserInfo().HDeptID,
+ "HEmpName": getUserInfo().HEmpName,
+ "HEmpID": getUserInfo().HEmpID,
+ "HManagerName": getUserInfo().HManagerName,
+ "HManagerID": getUserInfo().HManagerID,
+ "HRepairCheckMainName": "",
+ "HRepairCheckID": 0,
+ "HBarName": "",
+ "HEquipID": 0,
+ "HBarSpec": "",
+ "HBarModel": "",
+ "HMaker": getUserInfo()["Czymc"],
+ "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ "HUpDater": "",
+ "HUpDateDate": "",
+ "HChecker": "",
+ "HCheckDate": "",
+ "HDeleteMan": "",
+ "HDeleteDate": "",
+ "lngBillKey": "",
+ "lngBillSubKey": "",
+ // 鏂板锛氱淮淇褰曪紙婧愬崟锛夌浉鍏冲瓧娈�
+ "HMainSourceBillNo": "",
+ "HMainSourceInterID": 0,
+ "HMainSourceEntryID": 0,
+ "HMouldRepairWorkName":"",
+ "HMouldRepairWorkID":0,
+ "HStockOrgID": uni.getStorageSync("OrganizationID"),
+ },
+ HDetailList: [{ // 鍚庣鎺ュ彛鎻愪氦闇�瑕� 鏄庣粏淇℃伅
+ "HRepairCheckID": 0,
+ "HRepairCode": "",
+ "HRepairName": "",
+ "HManagerID": 0,
+ "HManagerCode": "",
+ "HManagerName": "",
+ "HRepairCheckContent": "",
+ "HRemark": "",
+ "LAY_TABLE_INDEX": 0
+ }]
+ };
+ },
+ computed: {
+ containerHeight: {
+ get() {
+ return this.btnTop - this.tabsBottom - 5
+ }
+ },
+ },
+ methods: {
+ // 鏄剧ず婧愬崟鍗曟嵁鍒楄〃寮圭獥
+ showBillList() {
+ this.$refs.billList.showPopup();
+ },
- },
- handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
- console.log('file: ', res);
- let fileInfo = res.data[0]
- this.attachmentInfo.push({
- fileName: fileInfo.name,
- size: fileInfo.size,
- status: '绛夊緟涓婁紶',
- filePath: fileInfo.tempFilePath
- })
- },
- // 涓婁紶鏂囦欢
- fileUpload() {
- this.$refs.XeUpload.upload('file', {});
- },
- //鑾峰彇鐝鏁版嵁
- async getShiftList() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: '/Web/GetGy_ShiftsList_Json',
- data: {
- Shifts: "",
- }
- })
+ // 鎵弿缁翠慨璁板綍鍗曞彿
+ toScanHMainSourceBillNo() {
+ MpaasScan.scanCode(cb => {
+ this.hform.HMainSourceBillNo = cb;
+ this.GetMessageByHMainSourceBillNo(cb);
+ });
+ },
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- this.HShiftsList = data
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: Message
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: err
- })
- }
- },
- //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
- async getHDeptList() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: '/Gy_Department/list',
- data: {
- sWhere: ` and HUSEORGID = ${uni.getStorageSync('OrganizationID')}`,
- user: uni.getStorageSync('HUserName'),
- Organization: uni.getStorageSync('Organization')
- }
- })
+ // 鏍规嵁缁翠慨璁板綍鍗曞彿鑾峰彇淇℃伅
+ async GetMessageByHMainSourceBillNo(HSouceBillNo) {
+ try {
+ let url = "/Sb_EqpRepairWorkBill/GetEqpRepairWorkBillListPage";
+ let dataField = {
+ sWhere: ` and 鍗曟嵁鍙� = '${HSouceBillNo}'`,
+ user: getUserInfo()["Czymc"],
+ page: 1,
+ size: 1,
+ };
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- this.HDeptList = data
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: Message
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: err
- })
- }
- },
- // 鑾峰彇鑱屽憳鏁版嵁
- async getEmpList() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: '/PublicPageMethod/UserList',
- data: {
- sWhere: " where 1=1",
- }
- })
+ let res = await CommonUtils.doRequest2Async({
+ url: url,
+ data: dataField
+ });
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- this.HEmpList = data
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: Message
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: err
- })
- }
- },
- // 鑾峰彇楠岃瘉椤圭洰鏁版嵁
- async getCheckProjList() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: '/Gy_RepairCheck/GetRepairCheckList',
- data: {
- sWhere: "",
- user: uni.getStorageSync('HUserName'),
- }
- })
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
+ if (count == 1) {
+ this.hform.HMainSourceBillNo = data[0]["鍗曟嵁鍙�"];
+ this.hform.HMainSourceInterID = data[0]["hmainid"];
+ this.hform.HMainSourceEntryID = data[0]["hsubid"];
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- this.HRepairCheckList = data
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: Message
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: err
- })
- }
- },
- toScanCode() {
- MpaasScan.scanCode(cb => {
- this.hfrom.HBarCode = cb
- this.GetMessageByBarCode(cb)
- })
- },
- async GetMessageByBarCode(HBarCode) {
- try {
- let res = await CommonUtils.doRequest2Sync({
- url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_List",
- data: {
- HBarCode: HBarCode,
- },
- })
+ // 濡傛灉婧愬崟鏈夎澶囦俊鎭紝鍙互鑷姩濉厖
+ if (data[0].HEquipID) {
+ this.hform.HEquipID = data[0].HEquipID;
+ this.getEquipFileMain(data[0].HEquipID);
+ }
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇缁翠慨璁板綍鍗曞け璐�: ${Message}`
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇缁翠慨璁板綍鍗曞け璐�: ${err}`
+ });
+ }
+ },
- if (!res) {
- return
- }
+ // 鏍规嵁璁惧ID鑾峰彇璁惧淇℃伅
+ async getEquipFileMain(HInterID) {
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_ListByHEquipID",
+ data: {
+ HEquipID: HInterID,
+ },
+ });
- let {
- data,
- count,
- Message
- } = res.data
+ if (!res) {
+ return;
+ }
- if (count == 1) {
- console.log('data: ', data);
- this.hform.HEquipID = data[0].hmainid
- this.hform.HBarName = data[0].璁惧鍚嶇О
- this.hform.HBarSpec = data[0].璁惧瑙勬牸
- this.hform.HBarModel = data[0].璁惧鍨嬪彿
- this.hform.HQty = 1
+ let {
+ data,
+ count,
+ Message
+ } = res.data;
- this.enableEdit = false
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: Message
- })
- }
+ if (count == 1) {
+ this.hform.HEquipID = data[0].hmainid;
+ this.hform.HBarName = data[0].璁惧鍚嶇О;
+ this.hform.HBarSpec = data[0].璁惧瑙勬牸;
+ this.hform.HBarModel = data[0].璁惧鍨嬪彿;
+ this.hform.HBarCode = data[0].璁惧鏉＄爜 || "";
+ this.enableEdit = false;
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: Message
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: err
+ });
+ }
+ },
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: err
- })
- }
- },
- async GetItemByEquipFile() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Web/GetItemByEquipFile",
- data: {
- "EquipProjectID": this.hform.HEquipID,
- "Type": "DJ",
- "HDate": this.hform.HBeginDate
- }
- })
+ // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
+ ValidCheck() {
+ if (this.hform.HEquipID == 0) {
+ return {
+ Message: "鏈綍鍏ヨ澶囦俊鎭紝璇峰厛褰曞叆璁惧淇℃伅!",
+ state: false
+ }
+ }
+ if (this.hform.HDeptID == 0) {
+ return {
+ Message: "閮ㄩ棬涓嶅緱涓虹┖!",
+ state: false
+ }
+ }
+ if (this.hform.HEmpID == 0) {
+ return {
+ Message: "楠屾敹浜轰笉寰椾负绌�!",
+ state: false
+ }
+ }
+ if (this.hform.HRepairCheckID == 0) {
+ return {
+ Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
+ state: false
+ }
+ }
+ if (this.hform.HManagerID == 0) {
+ return {
+ Message: "璐熻矗浜轰笉寰椾负绌�!",
+ state: false
+ }
+ }
+ // 鏂板锛氱淮淇褰曟牎楠�
+ if (!this.hform.HMainSourceBillNo || this.hform.HMainSourceBillNo.trim() === '') {
+ return {
+ Message: "缁翠慨璁板綍涓嶅緱涓虹┖!",
+ state: false
+ }
+ }
- let {
- data,
- Message,
- count
- } = res.data
- if (count == 1) {
- this.hform.HEquipDotCheckRuleInterID = data[0].鐐规瑙勭▼ID
- this.hform.HEquipDotCheckRuleInterNo = data[0].鐐规瑙勭▼鍗曞彿
- this.hform.HPlanNo = data[0].鐐规璁″垝鍗�
- this.hform.HPlanInterID = (data[0].鐐规璁″垝ID == null ? 0 : data[0].鐐规璁″垝ID) == "" ? 0 : data[0]
- .鐐规璁″垝ID
- this.hform.HPlanEntryID = (data[0].鐐规璁″垝瀛怚D == null ? 0 : data[0].鐐规璁″垝瀛怚D) == "" ? 0 : data[
- 0].鐐规璁″垝瀛怚D
+ return {
+ Message: "",
+ state: true
+ }
+ },
+ addNew() {
+ uni.redirectTo({
+ url: './Sb_EquipRepairCheckBill?operationType=1'
+ })
+ },
+ goBack() {
+ uni.navigateBack()
+ },
+ checkBoxChangeHandler(index, e) {
+ let cr = e.detail.value
+ if (cr.length == 0) {
+ this.HCheckFileList[index]["HDotCheckResult"] = false
+ } else {
+ this.HCheckFileList[index]["HDotCheckResult"] = true
+ }
+ },
+ uploadFile(index) {
+ console.log('filePath: ', this.attachmentInfo[index].filePath);
+ // 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
+ uni.uploadFile({
+ url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
+ filePath: this.attachmentInfo[index].filePath,
+ name: 'file',
+ formData: {
+ HBillNo: this.hform.HBillNo,
+ HRemark: "",
+ HUserName: getUserInfo()["Czymc"]
+ },
+ success: (uploadRes) => {
+ CommonUtils.showTips({
+ message: "涓婁紶鎴愬姛"
+ })
+ this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
+ },
+ fail: (err) => {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `涓婁紶澶辫触: ${err}`
+ })
+ }
+ })
+ },
+ delFile(index) {
+ console.log('attachmentInfo: ', this.attachmentInfo[index]);
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+ success: (res) => {
+ if (res.confirm) {
+ this.attachmentInfo.splice(index, 1)
+ }
+ },
+ })
- this.HCheckFileList = Array.from(data).map(item => {
- return {
- "HDotCheckItemID": item.HDotCheckItemID,
- "HDotCheckCode": item.鐐规椤圭洰浠ｇ爜,
- "HDotCheckItem": item.鐐规椤圭洰,
- "HDotCheckPart": item.鐐规閮ㄤ綅,
- "HClaim": item.鍏蜂綋瑕佹眰,
- "HManagerID": item.璐熻矗浜篒D,
- "HManagerCode": item.璐熻矗浜轰唬鐮�,
- "HManagerName": item.璐熻矗浜哄悕绉�,
- "HSourceInterID": item.鐐规璁″垝ID == null ? 0 : item.鐐规璁″垝ID,
- "HSourceEntryID": item.鐐规璁″垝瀛怚D == null ? 0 : item.鐐规璁″垝瀛怚D,
- "HSourceBillNo": item.鐐规璁″垝鍗�,
- "HDotCheckItemClassID": 0,
- "HDotCheckItemClassName": "",
- "HDotCheckItemMethodID": 0,
- "HDotCheckItemMethodName": "",
- "HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
- }
- })
+ },
+ handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
+ console.log('file: ', res);
+ let fileInfo = res.data[0]
+ this.attachmentInfo.push({
+ fileName: fileInfo.name,
+ size: fileInfo.size,
+ status: '绛夊緟涓婁紶',
+ filePath: fileInfo.tempFilePath
+ })
+ },
+ // 涓婁紶鏂囦欢
+ fileUpload() {
+ this.$refs.XeUpload.upload('file', {});
+ },
+ //鑾峰彇鐝鏁版嵁
+ async getShiftList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Web/GetGy_ShiftsList_Json',
+ data: {
+ Shifts: "",
+ }
+ })
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${Message}`
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${err}`
- })
- }
- },
- radioChange({
- detail: {
- value
- }
- }) {
- this.hform.HCheckResult = value
- },
- async getMaxNum() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Web/GetMAXNum",
- data: {
- "HBillType": this.HBillType
- }
- })
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HShiftsList = data
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: err
+ })
+ }
+ },
+ //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+ async getHDeptList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_Department/list',
+ data: {
+ sWhere: ` and HUSEORGID = ${uni.getStorageSync('OrganizationID')}`,
+ user: uni.getStorageSync('HUserName'),
+ Organization: uni.getStorageSync('Organization')
+ }
+ })
- let {
- count,
- data,
- Message
- } = res.data
- console.log('data: ', data);
- this.hform.HInterID = 0
- this.hform.HBillNo = data[0]["HBillNo"]
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
- })
- }
- },
- async submit() {
- let valid = this.ValidCheck()
- if (!valid.state) {
- CommonUtils.showTips({
- message: valid.Message
- })
- return
- }
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HDeptList = data
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: err
+ })
+ }
+ },
+ // 鑾峰彇鑱屽憳鏁版嵁
+ async getEmpList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/PublicPageMethod/UserList',
+ data: {
+ sWhere: " where 1=1",
+ }
+ })
- try {
- let oMain = JSON.stringify(this.hform);
- let sSubStr = JSON.stringify(this.HBillSub);
- let sMainSub = oMain + ';' + sSubStr + ';' + getUserInfo()['Czymc'];
- let res = await CommonUtils.doRequest2Sync({
- url: "/Sb_EqpRepairWorkBill/SaveGetEqpRepairCheckBillList",
- data: {
- "msg": sMainSub
- },
- method: "POST"
- })
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HEmpList = data
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: err
+ })
+ }
+ },
+ // 鑾峰彇楠岃瘉椤圭洰鏁版嵁
+ async getCheckProjList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_RepairCheck/GetRepairCheckList',
+ data: {
+ sWhere: "",
+ user: uni.getStorageSync('HUserName'),
+ }
+ })
- if (!res) {
- return
- }
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HRepairCheckList = data
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: err
+ })
+ }
+ },
+ toScanCode() {
+ MpaasScan.scanCode(cb => {
+ this.hform.HBarCode = cb; // 淇锛氬師鏉ユ槸 hfrom 搴旇鏄� hform
+ this.GetMessageByBarCode(cb)
+ })
+ },
+ async GetMessageByBarCode(HBarCode) {
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_List",
+ data: {
+ HBarCode: HBarCode,
+ },
+ })
- let {
- count,
- Message
- } = res.data
- if (count == 1) {
- uni.showModal({
- title: '鎻愮ず',
- content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- uni.redirectTo({
- url: '/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill?operationType=1'
- })
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- setTimeout(() => {
- uni.navigateBack();
- }, 50)
- }
- }
- });
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: "鎻愪氦鍗曟嵁澶辫触: " + Message
- })
- }
+ if (!res) {
+ return
+ }
+ let {
+ data,
+ count,
+ Message
+ } = res.data
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: "鎻愪氦鍗曟嵁澶辫触: " + err
- })
- }
- }
- },
- onLoad(e) {
- console.log('e: ', e);
- if (!e.operationType) {
- this.operationType = 1
- } else {
- this.operationType = e.operationType
- }
+ if (count == 1) {
+ console.log('data: ', data);
+ this.hform.HEquipID = data[0].hmainid
+ this.hform.HBarName = data[0].璁惧鍚嶇О
+ this.hform.HBarSpec = data[0].璁惧瑙勬牸
+ this.hform.HBarModel = data[0].璁惧鍨嬪彿
+ this.hform.HBarCode = HBarCode;
+ this.hform.HQty = 1
- if (this.operationType == 1) {
- // 鏂板
- this.getMaxNum()
- } else if (this.operationType == 2) {
- // 澶嶅埗
- } else if (this.operationType == 3) {
- // 缂栬緫
+ this.enableEdit = false
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: Message
+ })
+ }
- } else if (this.operationType == 4) {
- // 娴忚
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: err
+ })
+ }
+ },
+ radioChange({
+ detail: {
+ value
+ }
+ }) {
+ this.hform.HCheckResult = value
+ },
+ async getMaxNum() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Web/GetMAXNum",
+ data: {
+ "HBillType": this.HBillType
+ }
+ })
- }
+ let {
+ count,
+ data,
+ Message
+ } = res.data
+ console.log('data: ', data);
+ this.hform.HInterID = 0
+ this.hform.HBillNo = data[0]["HBillNo"]
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+ })
+ }
+ },
+ async submit() {
+ let valid = this.ValidCheck()
+ if (!valid.state) {
+ CommonUtils.showTips({
+ message: valid.Message
+ })
+ return
+ }
- this.getHDeptList()
- this.getEmpList()
- this.getCheckProjList()
- },
- 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)
- })
- }
- }
+ try {
+ let oMain = JSON.stringify(this.hform);
+ this.HDetailList[0].HManagerID = this.hform.HManagerID
+ this.HDetailList[0].HRepairCheckID = this.hform.HRepairCheckID
+ let sSubStr = JSON.stringify(this.HDetailList);
+ let sMainSub = oMain + ';' + sSubStr + ';' + getUserInfo()['Czymc'];
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sb_EqpRepairWorkBill/SaveGetEqpRepairCheckBillList",
+ data: {
+ "msg": sMainSub
+ },
+ method: "POST"
+ })
+
+ if (!res) {
+ return
+ }
+
+ let {
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url: '/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill?operationType=1'
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ }
+ }
+ });
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+ })
+ }
+
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鎻愪氦鍗曟嵁澶辫触: " + err
+ })
+ }
+ }
+ },
+ onLoad(e) {
+ console.log('e: ', e);
+ if (!e.operationType) {
+ this.operationType = 1
+ } else {
+ this.operationType = e.operationType
+ }
+
+ if (this.operationType == 1) {
+ // 鏂板
+ this.getMaxNum()
+ this.enableEdit = true;
+ this.enableSourceBillEdit = true;
+ } else if (this.operationType == 2) {
+ // 澶嶅埗
+ } else if (this.operationType == 3) {
+ // 缂栬緫
+ } else if (this.operationType == 4) {
+ // 娴忚
+ this.enableEdit = false;
+ this.enableSourceBillEdit = false;
+ }
+
+ this.getHDeptList()
+ this.getEmpList()
+ this.getCheckProjList()
+
+ // 鐩戝惉鍗曟嵁閫夋嫨瀹屾垚浜嬩欢
+ uni.$on('BillSelectComplete', (e) => {
+ console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
+ this.hform.HMainSourceInterID = e.HInterID
+ this.hform.HMainSourceBillNo = e.HBillNo
+ this.hform.HMainSourceEntryID = e.HEntryID
+ this.hform.HMouldRepairWorkID = e.HInterID
+ this.hform.HMouldRepairWorkName = e.HBillNo
+ this.hform.HEquipID = e.HEquipID
+ this.hform.HBarName = e.HEquipName
+ this.hform.HBarSpec = e.HEquipSpec
+ this.hform.HBarModel = e.HEquipModel
+ this.hform.HBarCode = e.HEquipBarCode || ""
+ this.$refs.billList.exit()
+ })
+ },
+ onUnload() {
+ uni.$off('BillSelectComplete')
+ },
+ 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)
+ })
+ }
+ }
</script>
<style lang="scss" scoped>
- @import "@/pages/MJGL/style/MJBillStyle.scss"
+ @import "@/pages/MJGL/style/MJBillStyle.scss"
</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
index bfcf397..7a5e2fb 100644
--- a/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
+++ b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
@@ -2,16 +2,11 @@
<view>
<view class="tabs" id="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 :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view> -->
</view>
<!-- 鍩烘湰淇℃伅 -->
<template v-if="tabs == 0">
- <view class="form" :style="{
- height: containerHeight + 'px',
- overflow: 'auto'
- }">
+ <view class="form" :style="{ height: containerHeight + 'px',overflow: 'auto'}">
<view class="form-item">
<view class="title">璁惧鏉＄爜:</view>
<view :class="enableEdit?'right':'righton'">
@@ -44,6 +39,40 @@
<textarea v-model="hform.HRepairContent" placeholder="璇疯緭鍏ラ獙璇佸唴瀹�" />
</view>
</view>
+ <!-- 婧愬崟绫诲瀷 -->
+ <view class="form-item">
+ <view class="title">婧愬崟绫诲瀷:</view>
+ <view class="right" v-show="showHMainSourceBillType">
+ <picker :range="arrayHMainSourceBillType" @change="HMainSourceBillTypeChange">
+ <input disabled name="HMainSourceBillType" v-model="HMainSourceBillType"
+ placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+ <view class="picker-overlay"></view>
+ </picker>
+ </view>
+ <view class="righton" v-show="!showHMainSourceBillType">
+ <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+ placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+ </view>
+ </view>
+
+ <!-- 婧愬崟鍗曞彿 -->
+ <view class="form-item">
+ <view class="title required">婧愬崟鍗曞彿:</view>
+ <view :class="enableSourceBillEdit?'right':'righton'">
+ <input v-model="hform.HMainSourceBillNo" :disabled="!enableSourceBillEdit"
+ @confirm="GetMessageByHMainSourceBillNo(hform.HMainSourceBillNo)"
+ placeholder="璇疯緭鍏�(鎴栨壂鎻�)婧愬崟鍗曞彿" />
+ </view>
+ <!-- 鏀惧ぇ闀滃浘鏍囷紝褰撴簮鍗曠被鍨嬩笉鏄�"鎵嬪伐褰曞叆"鏃舵樉绀� -->
+ <view class="icon-wrapper" v-if="hform.HMainSourceBillType != '鎵嬪伐褰曞叆'">
+ <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+ </view>
+ <!-- 鎵弿鍥炬爣 -->
+ <view class="icon-wrapper">
+ <uni-icons type="scan" size="20" @click="toScanHMainSourceBillNo"></uni-icons>
+ </view>
+ </view>
+
<view class="form-item">
<view class="title">鍗曟嵁鍙�:</view>
<view class="righton">
@@ -75,33 +104,25 @@
<view class="title required">缁翠慨閮ㄩ棬:</view>
<zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
dataValue="HItemID" v-model="hform.HDeptID">
-
</zxz-uni-data-select>
- <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
</view>
<view class="form-item">
<view class="title required">缁翠慨浜�:</view>
<zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
dataValue="HItemID" v-model="hform.HEmpID">
-
</zxz-uni-data-select>
- <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
</view>
<view class="form-item">
<view class="title required">缁翠慨椤圭洰:</view>
<zxz-uni-data-select required class="right" :localdata="HRepairList" dataKey="缁翠慨椤圭洰"
dataValue="hitemid" v-model="hform.HRepairID">
-
</zxz-uni-data-select>
- <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
</view>
<view class="form-item">
<view class="title required">璐熻矗浜�:</view>
<zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
dataValue="HItemID" v-model="hform.HManagerID">
-
</zxz-uni-data-select>
- <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
</view>
<view class="form-item">
<view class="title">璁惧鍚嶇О:</view>
@@ -201,6 +222,10 @@
<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
</view>
<!-- <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload> -->
+ <!-- 婧愬崟鍗曟嵁鍒楄〃寮圭獥 -->
+ <BillListPopupEquipConkBookBillVue ref="billList" :HBillType="hform.HBillType"
+ :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
+ </BillListPopupEquipConkBookBillVue>
</view>
</template>
@@ -215,13 +240,19 @@
import {
getUserInfo
} from "../../../utils/auth";
+ // 寮曞叆婧愬崟鍗曟嵁鍒楄〃寮圭獥缁勪欢
+ import BillListPopupEquipConkBookBillVue from '../../../components/BillListPopup/BillListPopupEquipConkBookBill.vue';
+
export default {
// 璁惧缁翠慨娲惧伐鍗�
name: 'Sb_EquipRepairSendWorkBill',
+ components: {
+ BillListPopupEquipConkBookBillVue
+ },
data() {
return {
tabs: 0,
- HMainSourceBillType: "",
+ HMainSourceBillType: "", // 鐢ㄤ簬鏄剧ず鐨勬簮鍗曠被鍨�
btnTop: 0,
tabsBottom: 0,
HModName: "Sb_EquipRepairSendWorkBill",
@@ -229,6 +260,12 @@
operationType: 1,
uploadOptions: {},
enableEdit: true,
+ enableSourceBillEdit: true, // 淇锛氭坊鍔犺繖涓睘鎬�
+
+ // 婧愬崟绫诲瀷鐩稿叧
+ arrayHMainSourceBillType: ['璁惧缁翠慨鐧昏鍗�', '鎵嬪伐褰曞叆'], // 鍙�夌殑婧愬崟绫诲瀷
+ arrayHMainSourceBillTypeID: ['璁惧缁翠慨鐧昏鍗�', '鎵嬪伐褰曞叆'], // 瀵瑰簲鐨勫崟鎹被鍨婭D
+ showHMainSourceBillType: true,
HDeptList: [],
HRepairCheckList: [],
@@ -267,7 +304,13 @@
HCloseDate: '',
HUpDateDate: '',
HDeleteMan: '',
- HDeleteDate: ''
+ HDeleteDate: '',
+ // 鏂板鐨勬簮鍗曠浉鍏冲瓧娈�
+ HMainSourceBillType: '璁惧缁翠慨鐧昏鍗�', // 榛樿涓鸿澶囩淮淇櫥璁板崟
+ HMainSourceBillNo: '',
+ HMainSourceInterID: 0,
+ HMainSourceEntryID: 0,
+ HStockOrgID: uni.getStorageSync("OrganizationID"), // 鏂板搴撳瓨缁勭粐ID
},
HDetailList: [{ // 鍚庣鎺ュ彛鎻愪氦闇�瑕� 鏄庣粏淇℃伅
"瀛愮淮淇」鐩�": "",
@@ -289,6 +332,168 @@
},
},
methods: {
+ // 鏄剧ず婧愬崟鍗曟嵁鍒楄〃寮圭獥
+ showBillList() {
+ if (this.hform.HMainSourceBillType === '鎵嬪伐褰曞叆') {
+ CommonUtils.showTips({
+ title: '鎻愮ず',
+ message: '鎵嬪伐褰曞叆妯″紡涓嬩笉鑳介�夋嫨婧愬崟'
+ });
+ return;
+ }
+ this.$refs.billList.showPopup();
+ },
+
+ // 閫夋嫨婧愬崟绫诲瀷
+ HMainSourceBillTypeChange(e) {
+ if (e.detail.value == -1 || e.detail.value == NaN) {
+ this.HMainSourceBillType = '鎵嬪伐褰曞叆';
+ this.hform.HMainSourceBillType = '鎵嬪伐褰曞叆';
+ return;
+ }
+
+ this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value];
+ this.hform.HMainSourceBillType = this.arrayHMainSourceBillTypeID[e.detail.value];
+
+ // 濡傛灉鏄墜宸ュ綍鍏ワ紝娓呯┖婧愬崟淇℃伅
+ if (this.hform.HMainSourceBillType === '鎵嬪伐褰曞叆') {
+ this.hform.HMainSourceBillNo = '';
+ this.hform.HMainSourceInterID = 0;
+ this.hform.HMainSourceEntryID = 0;
+ this.enableSourceBillEdit = false; // 鎵嬪伐褰曞叆鏃剁鐢ㄦ簮鍗曞崟鍙风紪杈�
+ } else {
+ this.enableSourceBillEdit = true; // 闈炴墜宸ュ綍鍏ユ椂鍙紪杈�
+ }
+
+ // 缂撳瓨褰撳墠椤甸潰閫夋嫨
+ const pages = getCurrentPages();
+ const currentPage = pages[pages.length - 1];
+ uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
+ HSourceBillTypeName: this.HMainSourceBillType,
+ HSourceBillType: this.hform.HMainSourceBillType
+ });
+ },
+
+ // 璇诲彇缂撳瓨
+ loadCache() {
+ const pages = getCurrentPages();
+ const currentPage = pages[pages.length - 1];
+ let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`);
+ if (HBillTypeCache) {
+ this.HMainSourceBillType = HBillTypeCache.HSourceBillTypeName;
+ this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType;
+
+ // 鏍规嵁缂撳瓨鐨勬簮鍗曠被鍨嬭缃紪杈戠姸鎬�
+ if (this.hform.HMainSourceBillType === '鎵嬪伐褰曞叆') {
+ this.enableSourceBillEdit = false;
+ } else {
+ this.enableSourceBillEdit = true;
+ }
+ }
+ },
+
+ // 鎵弿婧愬崟鍗曞彿
+ toScanHMainSourceBillNo() {
+ MpaasScan.scanCode(cb => {
+ this.hform.HMainSourceBillNo = cb;
+ this.GetMessageByHMainSourceBillNo(cb);
+ });
+ },
+
+ // 鏍规嵁婧愬崟鍗曞彿鑾峰彇淇℃伅
+ async GetMessageByHMainSourceBillNo(HSouceBillNo) {
+ try {
+ let url, dataField;
+
+ // 鏍规嵁婧愬崟绫诲瀷閫夋嫨涓嶅悓鐨勬帴鍙�
+ if (this.hform.HMainSourceBillType === '璁惧缁翠慨鐧昏鍗�') {
+ url = "/Sb_EqpRepairWorkBill/GetEqpConkBookBillListPage";
+ dataField = {
+ sWhere: ` and 鍗曟嵁鍙� = '${HSouceBillNo}'`,
+ user: getUserInfo()["Czymc"],
+ page: 1,
+ size: 1,
+ };
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鏆備笉鏀寔璇ユ簮鍗曠被鍨嬶細${this.hform.HMainSourceBillType}`
+ });
+ return;
+ }
+
+ let res = await CommonUtils.doRequest2Async({
+ url: url,
+ data: dataField
+ });
+
+ let { count, Message, data } = res.data;
+ if (count == 1) {
+ this.hform.HMainSourceBillNo = data[0]["鍗曟嵁鍙�"];
+ this.hform.HMainSourceInterID = data[0]["hmainid"];
+ this.hform.HMainSourceEntryID = data[0]["hsubid"];
+
+ // 濡傛灉婧愬崟鏈夎澶囦俊鎭紝鍙互鑷姩濉厖
+ if (data[0].HEquipID) {
+ this.hform.HEquipID = data[0].HEquipID;
+ this.getEquipFileMain(data[0].HEquipID);
+ }
+
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇婧愬崟鍗曞彿澶辫触: ${Message}`
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇婧愬崟鍗曞彿澶辫触: ${err}`
+ });
+ }
+ },
+
+ // 鏍规嵁璁惧ID鑾峰彇璁惧淇℃伅
+ async getEquipFileMain(HInterID) {
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_ListByHEquipID",
+ data: {
+ HEquipID: HInterID,
+ },
+ });
+
+ if (!res) {
+ return;
+ }
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data;
+
+ if (count == 1) {
+ this.hform.HEquipID = data[0].hmainid;
+ this.hform.HBarName = data[0].璁惧鍚嶇О;
+ this.hform.HBarSpec = data[0].璁惧瑙勬牸;
+ this.hform.HBarModel = data[0].璁惧鍨嬪彿;
+ this.hform.HBarCode = data[0].璁惧鏉＄爜 || "";
+ this.enableEdit = false;
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: Message
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: err
+ });
+ }
+ },
+
// 缁翠慨椤圭洰
async getRepairList() {
try{
@@ -336,13 +541,13 @@
}
if (this.hform.HEmpID == 0) {
return {
- Message: "楠屾敹浜轰笉寰椾负绌�!",
+ Message: "缁翠慨浜轰笉寰椾负绌�!",
state: false
}
}
- if (this.hform.HRepairCheckMainID == 0) {
+ if (this.hform.HRepairID == 0) {
return {
- Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
+ Message: "缁翠慨椤圭洰涓嶅緱涓虹┖!",
state: false
}
}
@@ -350,6 +555,15 @@
return {
Message: "璐熻矗浜轰笉寰椾负绌�!",
state: false
+ }
+ }
+ // 娣诲姞婧愬崟鏍￠獙锛堝鏋滀笉鏄墜宸ュ綍鍏ワ紝鍒欏繀椤婚�夋嫨婧愬崟锛�
+ if (this.hform.HMainSourceBillType !== '鎵嬪伐褰曞叆') {
+ if (!this.hform.HMainSourceBillNo || this.hform.HMainSourceBillNo.trim() === '') {
+ return {
+ Message: "婧愬崟绫诲瀷闈炴墜宸ュ綍鍏ワ紝蹇呴』閫夋嫨婧愬崟锛�",
+ state: false
+ }
}
}
@@ -552,7 +766,7 @@
},
toScanCode() {
MpaasScan.scanCode(cb => {
- this.hfrom.HBarCode = cb
+ this.hform.HBarCode = cb; // 淇锛氬師鏉ユ槸 hfrom 搴旇鏄� hform
this.GetMessageByBarCode(cb)
})
},
@@ -564,7 +778,6 @@
HBarCode: HBarCode,
},
})
-
if (!res) {
return
@@ -582,6 +795,7 @@
this.hform.HBarName = data[0].璁惧鍚嶇О
this.hform.HBarSpec = data[0].璁惧瑙勬牸
this.hform.HBarModel = data[0].璁惧鍨嬪彿
+ this.hform.HBarCode = HBarCode; // 纭繚鏉＄爜姝ｇ‘鏄剧ず
this.hform.HQty = 1
this.enableEdit = false
@@ -598,66 +812,7 @@
message: err
})
}
- },
- async GetItemByEquipFile() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Web/GetItemByEquipFile",
- data: {
- "EquipProjectID": this.hform.HEquipID,
- "Type": "DJ",
- "HDate": this.hform.HBeginDate
- }
- })
-
- let {
- data,
- Message,
- count
- } = res.data
- if (count == 1) {
- this.hform.HEquipDotCheckRuleInterID = data[0].鐐规瑙勭▼ID
- this.hform.HEquipDotCheckRuleInterNo = data[0].鐐规瑙勭▼鍗曞彿
- this.hform.HPlanNo = data[0].鐐规璁″垝鍗�
- this.hform.HPlanInterID = (data[0].鐐规璁″垝ID == null ? 0 : data[0].鐐规璁″垝ID) == "" ? 0 : data[0]
- .鐐规璁″垝ID
- this.hform.HPlanEntryID = (data[0].鐐规璁″垝瀛怚D == null ? 0 : data[0].鐐规璁″垝瀛怚D) == "" ? 0 : data[
- 0].鐐规璁″垝瀛怚D
-
- this.HCheckFileList = Array.from(data).map(item => {
- return {
- "HDotCheckItemID": item.HDotCheckItemID,
- "HDotCheckCode": item.鐐规椤圭洰浠ｇ爜,
- "HDotCheckItem": item.鐐规椤圭洰,
- "HDotCheckPart": item.鐐规閮ㄤ綅,
- "HClaim": item.鍏蜂綋瑕佹眰,
- "HManagerID": item.璐熻矗浜篒D,
- "HManagerCode": item.璐熻矗浜轰唬鐮�,
- "HManagerName": item.璐熻矗浜哄悕绉�,
- "HSourceInterID": item.鐐规璁″垝ID == null ? 0 : item.鐐规璁″垝ID,
- "HSourceEntryID": item.鐐规璁″垝瀛怚D == null ? 0 : item.鐐规璁″垝瀛怚D,
- "HSourceBillNo": item.鐐规璁″垝鍗�,
- "HDotCheckItemClassID": 0,
- "HDotCheckItemClassName": "",
- "HDotCheckItemMethodID": 0,
- "HDotCheckItemMethodName": "",
- "HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
- }
- })
-
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${Message}`
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${err}`
- })
- }
- },
+ },
radioChange({
detail: {
value
@@ -746,7 +901,6 @@
})
}
-
} catch (err) {
CommonUtils.showTips({
title: "娓╅Θ鎻愮ず",
@@ -770,16 +924,35 @@
// 澶嶅埗
} else if (this.operationType == 3) {
// 缂栬緫
-
} else if (this.operationType == 4) {
// 娴忚
-
+ this.enableEdit = false;
+ this.enableSourceBillEdit = false;
+ this.showHMainSourceBillType = false;
}
this.getHDeptList()
this.getEmpList()
this.getCheckProjList()
this.getRepairList()
+ this.loadCache()
+
+ // 鐩戝惉鍗曟嵁閫夋嫨瀹屾垚浜嬩欢
+ uni.$on('BillSelectComplete', (e) => {
+ console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
+ this.hform.HMainSourceInterID = e.HInterID
+ this.hform.HMainSourceBillNo = e.HBillNo
+ this.hform.HMainSourceEntryID = e.HEntryID
+ this.hform.HEquipID = e.HEquipID
+ this.hform.HBarName = e.HEquipName
+ this.hform.HBarSpec = e.HEquipSpec
+ this.hform.HBarModel = e.HEquipModel
+ this.hform.HBarCode = e.HEquipBarCode || ""
+ this.$refs.billList.exit()
+ })
+ },
+ onUnload() {
+ uni.$off('BillSelectComplete')
},
onReady() {
const query = uni.createSelectorQuery().in(this)
@@ -796,5 +969,14 @@
</script>
<style lang="scss" scoped>
- @import "@/pages/MJGL/style/MJBillStyle.scss"
+ @import "@/pages/MJGL/style/MJBillStyle.scss";
+
+ .picker-overlay {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ z-index: 1;
+ }
</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue b/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
index 6fe1e66..6145ffa 100644
--- a/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
+++ b/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
@@ -12,6 +12,8 @@
height: containerHeight + 'px',
overflow: 'auto'
}">
+
+ <!-- 鍘熷唴瀹逛繚鎸佷笉鍙� -->
<view class="form-item">
<view class="title">鍣ㄥ叿鏉＄爜:</view>
<view :class="enableEdit?'right':'righton'">
@@ -38,46 +40,54 @@
</uni-datetime-picker>
</view>
</view>
+ <!-- 鏂板婧愬崟绫诲瀷鍜屾晠闅滅櫥璁板崟閫夋嫨 -->
<view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
- <view class="righton">
- <input disabled v-model="hform.HBillNo" />
+ <view class="title">婧愬崟绫诲瀷</view>
+ <view class="right" v-show="showHMainSourceBillType">
+ <picker :range="arrayHMainSourceBillType" @change="HMainSourceBillTypeChange">
+
+ <input disabled name="HMainSourceBillType" v-model="HMainSourceBillType"
+ placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+ <view class="picker-overlay"></view>
+ </picker>
+ </view>
+ <view class="righton" v-show="!showHMainSourceBillType">
+ <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+ placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title required">鏁呴殰鐧昏鍗�</view>
+ <view class="right" v-show="hform.HMainSourceBillType != 1">
+ <input type="text" name="HBarCode" v-model="hform.HMainSourceBillNo" />
+ </view>
+ <view class="icon-wrapper" v-show="hform.HMainSourceBillType != 1"
+ :disabled="hform.HMainSourceBillType == -1">
+ <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+ </view>
+ <view class="righton" v-show="hform.HMainSourceBillType == 1">
+ <input type="text" disabled name="HBarCode" v-model="hform.HMainSourceBillNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙�:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HBillNo" />
</view>
</view>
<view class="form-item">
- <view class="title">鍗曟嵁鏃ユ湡:</view>
- <view class="righton">
- <input disabled v-model="hform.HDate" />
+ <view class="title">鍗曟嵁鏃ユ湡:</view>
+ <view class="righton">
+ <input disabled v-model="hform.HDate" />
</view>
</view>
- <view class="form-item">
- <view class="title">鏃堕棿鍗曚綅:</view>
- <zxz-uni-data-select class="right" :localdata="[
- {key: '灏忔椂', value: '灏忔椂'},
- {key: '澶�', value: '澶�'},
- {key: '鏈�', value: '鏈�'},
- ]" dataKey="key" dataValue="value" v-model="hform.HCycleUnit">
- </zxz-uni-data-select>
- </view>
- <view class="form-item">
- <view class="title required">璁″垝缁翠慨宸ユ椂:</view>
- <view class="right">
- <input type="number" v-model="hform.HPlanTimes" />
- </view>
- </view>
- <view class="form-item">
- <view class="title required">瀹為檯缁翠慨宸ユ椂:</view>
- <view class="right">
- <input type="number" v-model="hform.HTimes" />
- </view>
- </view>
+
<view class="form-item">
<view class="title required">缁翠慨閮ㄩ棬:</view>
<zxz-uni-data-select required class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О"
dataValue="HItemID" v-model="hform.HDeptID">
</zxz-uni-data-select>
- <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
</view>
<view class="form-item">
<view class="title required">缁翠慨浜�:</view>
@@ -85,7 +95,6 @@
dataValue="HItemID" v-model="hform.HEmpID">
</zxz-uni-data-select>
- <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
</view>
<view class="form-item">
<view class="title required">缁翠慨椤圭洰:</view>
@@ -93,7 +102,6 @@
dataValue="hitemid" v-model="hform.HRepairID">
</zxz-uni-data-select>
- <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
</view>
<view class="form-item">
<view class="title required">涓荤:</view>
@@ -101,7 +109,6 @@
dataValue="HItemID" v-model="hform.HManagerID">
</zxz-uni-data-select>
- <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
</view>
<view class="form-item">
<view class="title">鍣ㄥ叿鍚嶇О:</view>
@@ -130,6 +137,27 @@
overflow: 'auto'
}">
<view class="form-item">
+ <view class="title">鏃堕棿鍗曚綅:</view>
+ <zxz-uni-data-select class="right" :localdata="[
+ {key: '灏忔椂', value: '灏忔椂'},
+ {key: '澶�', value: '澶�'},
+ {key: '鏈�', value: '鏈�'},
+ ]" dataKey="key" dataValue="value" v-model="hform.HCycleUnit">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title">璁″垝缁翠慨宸ユ椂:</view>
+ <view class="right">
+ <input type="number" v-model="hform.HPlanTimes" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹為檯缁翠慨宸ユ椂:</view>
+ <view class="right">
+ <input type="number" v-model="hform.HTimes" />
+ </view>
+ </view>
+ <view class="form-item">
<view class="title">渚涘簲鍟�:</view>
<view class="right">
<input v-model="hform.HSupID" placeholder="" />
@@ -242,8 +270,8 @@
</view>
</view>
</view>
+ </template>
- </template>
<!-- 鎿嶄綔鎸夐挳 -->
<view class="buttons" id="buttons">
<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
@@ -251,6 +279,11 @@
<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
</view>
+
+ <!-- 鏂板寮圭獥缁勪欢 -->
+ <BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType"
+ :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
+ </BillListPopupMouldConkBookBillVue>
</view>
</template>
@@ -265,13 +298,22 @@
import {
getUserInfo
} from "../../../utils/auth";
+ // 鏂板寮曞叆缁勪欢
+ import BillListPopupMouldConkBookBillVue from '../../../components/BillListPopup/BillListPopupMouldConkBookBill.vue';
+
export default {
// 鍣ㄥ叿缁翠慨娲惧伐鍗�
name: 'Sc_MouldRepairSendWorkBill',
+ components: {
+ BillListPopupMouldConkBookBillVue,
+ },
data() {
return {
tabs: 0,
- HMainSourceBillType: "",
+ HMainSourceBillType: '妯″叿鏁呴殰鐧昏鍗�', // 鏂板
+ showHMainSourceBillType: true, // 鏂板
+ arrayHMainSourceBillType: ['妯″叿鏁呴殰鐧昏鍗�'], // 鏂板
+ arrayHMainSourceBillTypeID: ['3815'], // 鏂板
btnTop: 0,
tabsBottom: 0,
HModName: "Sc_MouldRepairSendWorkBill",
@@ -305,13 +347,13 @@
"HManagerName": getUserInfo().HSecManager,
"HManagerID": getUserInfo().HSecManagerID,
"HRepairBeginDate": dayjs(new Date()).format('YYYY-MM-DD'),
- "HMainSourceBillType": "",
- "HMainSourceInterID": "0",
- "HMainSourceEntryID": "0",
+ "HMainSourceBillType": 3815, // 鏂板锛氶粯璁ゆā鍏锋晠闅滅櫥璁板崟
+ "HMainSourceInterID": "0", // 鏂板
+ "HMainSourceEntryID": "0", // 鏂板
"HPlanTimes": "0",
"HTimes": "0",
"HRepairEndDate": dayjs(new Date()).format('YYYY-MM-DD'),
- "HMainSourceBillNo": "",
+ "HMainSourceBillNo": "", // 鏂板
"HSupIDName": "",
"HSupID": "0",
"HRepairType": "鍐呴儴缁翠慨",
@@ -336,6 +378,7 @@
HMouldName: "",
HMouldSpec: "",
HMouldModel: "",
+ "HStockOrgID": uni.getStorageSync("OrganizationID") || "0" // 鏂板
},
HDetailList: [{ // 鍚庣鎺ュ彛鎻愪氦闇�瑕� 鏄庣粏淇℃伅
"瀛愮淮淇」鐩�": "",
@@ -358,6 +401,43 @@
},
},
methods: {
+ // 鏂板锛氶�夋嫨婧愬崟绫诲瀷
+ HMainSourceBillTypeChange(e) {
+ if (e.detail.value == -1 || e.detail.value == NaN) {
+ this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+ this.hform.HMainSourceBillType = -1
+ return
+ }
+ console.log(e.detail.value)
+ console.log(e)
+ this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+ this.hform.HMainSourceBillType = this.arrayHMainSourceBillTypeID[e.detail.value]
+
+ // 缂撳瓨褰撳墠椤甸潰閫夋嫨
+ const pages = getCurrentPages()
+ const currentPage = pages[pages.length - 1]
+ uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
+ HSourceBillTypeName: this.HMainSourceBillType,
+ HSourceBillType: this.hform.HMainSourceBillType
+ })
+ },
+
+ // 鏂板锛氭樉绀哄崟鎹垪琛ㄥ脊绐�
+ showBillList() {
+ this.$refs.billList.showPopup()
+ },
+
+ // 鏂板锛氳鍙栫紦瀛�
+ loadCache() {
+ const pages = getCurrentPages()
+ const currentPage = pages[pages.length - 1]
+ let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`)
+ if (HBillTypeCache) {
+ this.HMainSourceBillType = HBillTypeCache.HSourceBillTypeName
+ this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType
+ }
+ },
+
// 缁翠慨椤圭洰
async getRepairList() {
try {
@@ -395,6 +475,14 @@
},
// 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
ValidCheck() {
+ // 鏂板锛氭鏌ユ晠闅滅櫥璁板崟
+ if (this.hform.HMainSourceBillType != 1 && !this.hform.HMainSourceBillNo) {
+ return {
+ Message: "鏁呴殰鐧昏鍗曚笉寰椾负绌�!",
+ state: false
+ }
+ }
+
if (this.hform.HMouldID == 0) {
return {
Message: "鏈綍鍏ュ櫒鍏蜂俊鎭紝璇峰厛褰曞叆鍣ㄥ叿淇℃伅!",
@@ -409,19 +497,19 @@
}
if (this.hform.HEmpID == 0) {
return {
- Message: "楠屾敹浜轰笉寰椾负绌�!",
+ Message: "缁翠慨浜轰笉寰椾负绌�!",
state: false
}
}
- if (this.hform.HRepairCheckMainID == 0) {
+ if (this.hform.HRepairID == 0) {
return {
- Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
+ Message: "缁翠慨椤圭洰涓嶅緱涓虹┖!",
state: false
}
}
if (this.hform.HManagerID == 0) {
return {
- Message: "璐熻矗浜轰笉寰椾负绌�!",
+ Message: "涓荤涓嶅緱涓虹┖!",
state: false
}
}
@@ -437,7 +525,6 @@
state: false
}
}
-
return {
Message: "",
@@ -555,7 +642,7 @@
},
toScanCode() {
MpaasScan.scanCode(cb => {
- this.hform.HBarCode = cb
+ // this.hform.HBarCode = cb
this.GetMessageByBarCode(cb)
})
},
@@ -567,7 +654,6 @@
HBarCode: HBarCode,
},
})
-
if (!res) {
return
@@ -732,7 +818,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: './Sb_EquipRepairSendWorkBill?operationType=1'
+ // url: './Sc_MouldRepairSendWorkBill?operationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -748,7 +834,6 @@
message: "鎻愪氦鍗曟嵁澶辫触: " + Message
})
}
-
} catch (err) {
CommonUtils.showTips({
@@ -783,7 +868,28 @@
this.getEmpList()
this.getCheckProjList()
this.getRepairList()
+ this.loadCache() // 鏂板锛氬姞杞界紦瀛�
+
+ // 鏂板锛氱洃鍚崟鎹�夋嫨瀹屾垚浜嬩欢
+ uni.$on('BillSelectComplete', (e) => {
+ console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
+ this.hform.HMainSourceInterID = e.HInterID
+ this.hform.HMainSourceBillNo = e.HBillNo
+ this.hform.HMainSourceEntryID = e.HEntryID
+ this.hform.HMouldID = e.HMouldID
+ this.hform.HMouldName = e.HMouldName
+ this.hform.HMouldSpec = e.HMouldSpec
+ this.hform.HMouldModel = e.HMouldModel
+ // 濡傛灉閫夋嫨鍗曟嵁鏃跺甫浜嗘潯鐮侊紝涔熻缃潯鐮�
+ if (e.HBarCode) {
+ this.hform.HBarCode = e.HBarCode
+ }
+ this.$refs.billList.exit()
+ })
},
+ onUnload() {
+ uni.$off('BillSelectComplete') // 鏂板锛氱Щ闄や簨浠剁洃鍚�
+ },
onReady() {
const query = uni.createSelectorQuery().in(this)
query.select("#buttons")
@@ -799,5 +905,47 @@
</script>
<style lang="scss" scoped>
- @import "@/pages/MJGL/style/MJBillStyle.scss"
+ // @import "@/pages/MJGL/style/MJBillStyle.scss";
+
+ .picker-overlay {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ z-index: 1;
+ }
+
+ .icon-wrapper {
+ background-color: #3A78FF;
+ width: 52rpx;
+ height: 52rpx;
+ border-radius: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ .uni-icons {
+ color: #fff !important;
+ }
+ }
+
+ .icon-wrapper[disabled] {
+ background-color: rgba(228, 228, 228, 1);
+ pointer-events: none;
+ touch-action: none;
+ }
+
+ .required {
+ position: relative;
+ }
+
+ .required::after {
+ content: "*";
+ position: relative;
+ color: red;
+ left: 0;
+ top: 0;
+ font-size: inherit;
+ }
</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue b/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
index cf7c276..6d8ca18 100644
--- a/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
+++ b/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
@@ -342,7 +342,7 @@
hform: {
"HBillType": 3807,
"HBarCode": "",
- "HMainSourceBillType": "1",
+ "HMainSourceBillType": 3815,
"HMainSourceBillNo": "",
"HMainSourceInterID": "0",
"HMainSourceEntryID": "0",
diff --git a/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue b/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue
index bd217f6..dc6f68a 100644
--- a/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue
+++ b/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue
@@ -563,8 +563,10 @@
this.hform.HMouldDotCheckRuleNo = data[0].HBillNo
this.hform.HMouldDotCheckRuleID = data[0].HInterID
this.hform.HPlanNo = data[0].鍗曟嵁鍙�
- this.hform.HPlanInterID = (data[0].hmainid == null ? 0 : data[0].hmainid) == "" ? 0 : data[0].hmainid
- this.hform.HPlanEntryID = (data[0].HEntryID == null ? 0 : data[0].HEntryID) == "" ? 0 : data[0].HEntryID
+ this.hform.HPlanInterID = (data[0].hmainid == null ? 0 : data[0].hmainid) == "" ? 0 : data[0]
+ .hmainid
+ this.hform.HPlanEntryID = (data[0].HEntryID == null ? 0 : data[0].HEntryID) == "" ? 0 : data[0]
+ .HEntryID
this.HCheckFileList = Array.from(data).map(item => {
return {
@@ -584,7 +586,7 @@
"HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
}
})
-
+ this.tabs = 1
} else {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
@@ -671,8 +673,10 @@
"HSourceInterID": (item.鐐规璁″垝ID == null ? 0 : item.鐐规璁″垝ID) || 0,
"HSourceEntryID": (item.鐐规璁″垝瀛怚D == null ? 0 : item.鐐规璁″垝瀛怚D) || 0,
"HSourceBillNo": (item.鐐规璁″垝鍗� == null ? '' : item.鐐规璁″垝鍗�) || '',
- "HDotCheckItemClassID": (item.HDotCheckItemClassID == null ? 0 : item.HDotCheckItemClassID) || 0,
- "HDotCheckItemClassName": (item.鐐规椤圭洰鍒嗙被鍚嶇О == null ? '' : item.鐐规椤圭洰鍒嗙被鍚嶇О) ||'',
+ "HDotCheckItemClassID": (item.HDotCheckItemClassID == null ? 0 : item
+ .HDotCheckItemClassID) || 0,
+ "HDotCheckItemClassName": (item.鐐规椤圭洰鍒嗙被鍚嶇О == null ? '' : item.鐐规椤圭洰鍒嗙被鍚嶇О) ||
+ '',
"HDotCheckItemMethodID": (item.鐐规鏂规硶id == null ? 0 : item.鐐规鏂规硶id) || 0,
"HDotCheckItemMethodName": (item.鐐规鏂规硶 == null ? '' : item.鐐规鏂规硶) || '',
"HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
@@ -819,11 +823,11 @@
"HDotCheckItemClassID": item.HDotCheckItemClassID || 0,
"HDotCheckItemClassName": item.鐐规椤圭洰鍒嗙被鍚嶇О || "",
"HDotCheckItemMethodID": item.HDotCheckItemMethodID || 0,
- "HDotCheckItemMethodName": item.鐐规鏂规硶鍚嶇О || "",
+ "HDotCheckItemMethodName": item.鐐规鏂规硶鍚嶇О || "",
"HDotCheckResult": isChecked,
- "HRemark":item.瀛愬娉�2|| ""
+ "HRemark": item.瀛愬娉�2 || ""
};
- });
+ });
} else {
console.log('瀛愯〃鏁版嵁涓虹┖鎴栬幏鍙栧け璐�:', res.data.Message);
this.HCheckFileList = [];
@@ -952,5 +956,5 @@
</script>
<style lang="scss">
- @import "@/pages/MJGL/style/MJBillStyle.scss"
+ @import "@/pages/MJGL/style/MJBillStyle.scss"
</style>
\ No newline at end of file
diff --git a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
index 0b76675..0734c9f 100644
--- a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
+++ b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
@@ -21,14 +21,14 @@
size="20"></uni-icons>
</view>
<view class="form-item">
- <view class="title">浠撳簱:</view>
+ <view class="title"><text>*</text>浠撳簱:</view>
<view class="right">
<uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
@input="HWHNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">浠撲綅:</view>
+ <view class="title"><text>*</text>浠撲綅:</view>
<view class="right" v-show="showHStockPlaceName">
<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
@@ -38,21 +38,21 @@
</view>
</view>
<view class="form-item">
- <view class="title">鍙戝嚭浜�:</view>
+ <view class="title"><text>*</text>鍙戝嚭浜�:</view>
<view class="right">
<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍙戝嚭浜�" v-model="hform.HKeeperName"
@input="HScatterUserChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">棰嗙敤浜�:</view>
+ <view class="title"><text>*</text>棰嗙敤浜�:</view>
<view class="right">
<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)棰嗙敤浜�" v-model="hform.HSecManagerName"
@input="HCollectUserChange"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">閮ㄩ棬:</view>
+ <view class="title"><text>*</text>閮ㄩ棬:</view>
<view class="right">
<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
@input="HDeptNameChange"></uni-combox>
@@ -502,7 +502,7 @@
/* #region 浠撳簱浠撲綅鑾峰彇涓嬫媺妗� */
getHBaseList() {
CommonUtils.doRequest(
- "/Web/GetWarehouseList_Json_New", {
+ "/Web/GetWarehouseList_Json_MJ", {
Warehouse: "",
HOrgID: uni.getStorageSync('OrganizationID')
},
diff --git a/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue b/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
index 2dec658..4b5060a 100644
--- a/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
+++ b/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
@@ -1,1055 +1,1066 @@
<template>
- <view>
- <view class="form">
- <view class="form-item">
- <view class="title">鏉＄爜</view>
- <view class="right" style="width: 350rpx;">
- <input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" @confirm="getCode(hform.HBarCode)"
- @blur="getCode(hform.HBarCode)" />
- </view>
- <uni-icons type="scan"
- style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
- size="20" @click="toScanCode"></uni-icons>
- </view>
- <view class="form-item" @click="searchModule">
- <view class="title">鍣ㄥ叿</view>
- <view class="righton" style="width: 350rpx;">
- <input placeholder="璇烽�夋嫨鍣ㄥ叿" />
- </view>
- <uni-icons type="search"
- style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
- size="20"></uni-icons>
- </view>
- <view class="form-item">
- <view class="title">浠撳簱:</view>
- <view class="right">
- <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
- @input="HWHNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">浠撲綅:</view>
- <view class="right" v-show="showHStockPlaceName">
- <uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
- v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
- </view>
- <view class="righton" v-show="!showHStockPlaceName">
- <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="涓嶅彲鎿嶄綔" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍙戝嚭浜�:</view>
- <view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍙戝嚭浜�" v-model="hform.HKeeperName"
- @input="HScatterUserChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">棰嗙敤浜�:</view>
- <view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)棰嗙敤浜�" v-model="hform.HSecManagerName"
- @input="HCollectUserChange"></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="['渚涘簲鍟�','瀹㈡埛','閮ㄩ棬']" placeholder="璇烽�夋嫨绫诲瀷" v-model="hform.TypeName"
- @input="HSelectTypeChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">寰�鏉ュ崟浣�:</view>
- <view class="right">
- <uni-combox :candidates="arrayHSelectType" placeholder="璇烽�夋嫨" v-model="hform.HSupName"
- @input="HSupNameChange"></uni-combox>
- </view>
- </view>
- <view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">琛ㄥご淇℃伅</view>
- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">妯″叿淇℃伅</view>
- </view>
- <view v-if="tabs == 0">
- <view class="form-item">
- <view class="title">鏃ユ湡:</view>
- <view class="right">
- <picker mode="date" v-model="hform.HDate" @change="HDateChange">
- <view class="picker-overlay"></view>
- <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
- </picker>
- </view>
- </view>
- <view class="form-item">
- <view class="title">婧愬崟绫诲瀷:</view>
- <view class="right" v-show="showHMainSourceBillType">
- <picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
- >
- <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
- placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
- <view class="picker-overlay"></view>
- </picker>
- </view>
- <view class="righton" v-show="!showHMainSourceBillType">
- <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
- placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">婧愬崟鍗曞彿:</view>
- <view class="right" v-show="showHSourceBillNo">
- <!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
+ <view>
+ <view class="form">
+ <view class="form-item">
+ <view class="title">鏉＄爜</view>
+ <view class="right" style="width: 350rpx;">
+ <input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" @confirm="getCode(hform.HBarCode)"
+ @blur="getCode(hform.HBarCode)" />
+ </view>
+ <uni-icons type="scan"
+ style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+ size="20" @click="toScanCode"></uni-icons>
+ </view>
+ <view class="form-item" @click="searchModule">
+ <view class="title">鍣ㄥ叿</view>
+ <view class="righton" style="width: 350rpx;">
+ <input placeholder="璇烽�夋嫨鍣ㄥ叿" />
+ </view>
+ <uni-icons type="search"
+ style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+ size="20"></uni-icons>
+ </view>
+ <view class="form-item">
+ <view class="title"><text>*</text>浠撳簱:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+ @input="HWHNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title"><text>*</text>浠撲綅:</view>
+ <view class="right" v-show="showHStockPlaceName">
+ <uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+ v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
+ </view>
+ <view class="righton" v-show="!showHStockPlaceName">
+ <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="涓嶅彲鎿嶄綔" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title"><text>*</text>鍙戝嚭浜�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍙戝嚭浜�" v-model="hform.HKeeperName"
+ @input="HScatterUserChange"></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.HSecManagerName"
+ @input="HCollectUserChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title"><text>*</text>閮ㄩ棬:</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"><text>*</text>寰�鏉ョ被鍨�:</view>
+ <view class="right">
+ <uni-combox :candidates="['渚涘簲鍟�','瀹㈡埛','閮ㄩ棬']" placeholder="璇烽�夋嫨绫诲瀷" v-model="hform.TypeName"
+ @input="HSelectTypeChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title"><text>*</text>寰�鏉ュ崟浣�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHSelectType" placeholder="璇烽�夋嫨" v-model="hform.HSupName"
+ @input="HSupNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="tabs">
+ <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">琛ㄥご淇℃伅</view>
+ <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">妯″叿淇℃伅</view>
+ </view>
+ <view v-if="tabs == 0">
+ <view class="form-item">
+ <view class="title">鏃ユ湡:</view>
+ <view class="right">
+ <picker mode="date" v-model="hform.HDate" @change="HDateChange">
+ <view class="picker-overlay"></view>
+ <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+ </picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">婧愬崟绫诲瀷:</view>
+ <view class="right" v-show="showHMainSourceBillType">
+ <picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType">
+ <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+ placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+ <view class="picker-overlay"></view>
+ </picker>
+ </view>
+ <view class="righton" v-show="!showHMainSourceBillType">
+ <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+ placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">婧愬崟鍗曞彿:</view>
+ <view class="right" v-show="showHSourceBillNo">
+ <!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
- <input :focus="HSourceBillNoFocus" type="text" name="HSourceBillNo"
- v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ <input :focus="HSourceBillNoFocus" type="text" name="HSourceBillNo"
+ v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
- </view>
- <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
- <uni-icons type="search" size="20" ></uni-icons>
- </view>
+ </view>
+ <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+ <uni-icons type="search" size="20"></uni-icons>
+ </view>
- <view class="righton" v-show="!showHSourceBillNo">
- <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍒跺崟浜�:</view>
- <view class="righton">
- <input name="HMaker" disabled v-model="hform.HMaker" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
- <view class="righton">
- <input name="HBillNo" disabled v-model="hform.HBillNo" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曟嵁ID:</view>
- <view class="righton">
- <input name="HInterID" disabled v-model="hform.HInterID" />
- </view>
- </view>
- </view>
- <view v-if="tabs==1">
- <view class="list" v-for="(item,index) in HMouldList" :key="index">
- <uni-card :title="item.鍣ㄥ叿鍚嶇О" style="margin: 10px;" @tap="delMater(item, $event)">
- <!-- 鍣ㄥ叿浠ｇ爜浣滀负鍙偣鍑婚摼鎺� -->
- <view class="card-header">
- <text class="link-text">鍣ㄥ叿鍙凤細{{item.鍣ㄥ叿鍙穧}</text>
- </view>
+ <view class="righton" v-show="!showHSourceBillNo">
+ <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍒跺崟浜�:</view>
+ <view class="righton">
+ <input name="HMaker" disabled v-model="hform.HMaker" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁鍙�:</view>
+ <view class="righton">
+ <input name="HBillNo" disabled v-model="hform.HBillNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍗曟嵁ID:</view>
+ <view class="righton">
+ <input name="HInterID" disabled v-model="hform.HInterID" />
+ </view>
+ </view>
+ </view>
+ <view v-if="tabs==1">
+ <view class="list" v-for="(item,index) in HMouldList" :key="index">
+ <uni-card :title="item.鍣ㄥ叿鍚嶇О" style="margin: 10px;" @tap="delMater(item, $event)">
+ <!-- 鍣ㄥ叿浠ｇ爜浣滀负鍙偣鍑婚摼鎺� -->
+ <view class="card-header">
+ <text class="link-text">鍣ㄥ叿鍙凤細{{item.鍣ㄥ叿鍙穧}</text>
+ </view>
- <view class="card-detail">
- <view class="detail">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
- </view>
- <view class="detail">
- <text>鍣ㄥ叿鏉＄爜锛�</text>{{item.鍣ㄥ叿鏉＄爜}}
- </view>
- </view>
- </uni-card>
- </view>
- <view class="over" v-if="HMouldList.length == 0">鏆傛棤鏁版嵁</view>
- </view>
- <view class="bottom-btn">
- <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
- <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
- </view>
- </view>
- <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
- :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
- <BillListPopupMouldVue @BillSelectComplete="MouldBillHandler" ref="billListMould"></BillListPopupMouldVue>
- </view>
+ <view class="card-detail">
+ <view class="detail">
+ <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ </view>
+ <view class="detail">
+ <text>鍣ㄥ叿鏉＄爜锛�</text>{{item.鍣ㄥ叿鏉＄爜}}
+ </view>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="HMouldList.length == 0">鏆傛棤鏁版嵁</view>
+ </view>
+ <view class="bottom-btn">
+ <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ </view>
+ </view>
+ <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
+ :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
+ <BillListPopupMouldVue @BillSelectComplete="MouldBillHandler" ref="billListMould"></BillListPopupMouldVue>
+ </view>
</template>
<script>
- import getDateTime from '@/utils/getdateTime.js';
- import {
- getUserInfo
- } from "@/utils/auth.js";
- import {
- CommonUtils
- } from '@/utils/common';
- import BillListPopupVue from '../../../components/BillListPopup/BillListPopup.vue';
- import BillListPopupMouldVue from '../../../components/BillListPopup/BillListPopup_Mould.vue';
+ import getDateTime from '@/utils/getdateTime.js';
+ import {
+ getUserInfo
+ } from "@/utils/auth.js";
+ import {
+ CommonUtils
+ } from '@/utils/common';
+ import BillListPopupVue from '../../../components/BillListPopup/BillListPopup.vue';
+ import BillListPopupMouldVue from '../../../components/BillListPopup/BillListPopup_Mould.vue';
- export default {
- components: {
- BillListPopupVue,
- BillListPopupMouldVue
- },
- data() {
- return {
- HSourceBillNoFocus: false,
- barCodeFocus: true, //鏉＄爜鍏夋爣
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- tabs: 0,
- arrayHEmpName: [],
- HEmpNameList: [],
- arrayHWHName: [], //浠撳簱
- HWHNameList: [],
- arrayHStockPlaceName: [], //浠撲綅
- HStockPlaceNameList: [],
- arrayHDeptName: [], //閮ㄩ棬
- HDeptNameList: [],
- arrayHCusName: [],//瀹㈡埛
- HCusNameList: [],
- arrayHSupplierName: [], //渚涘簲鍟�
- HSuplierList: [],
- linterid: '',
- HBillNo: '',
- arrayHSelectType: [], // 寰�鏉ュ崟浣嶄笅鎷夊垪琛�
- HSelectTypeList: [], // 寰�鏉ュ崟浣嶅畬鏁存暟鎹垪琛�
- showHStockPlaceName: true,
- HMouldList: [],
- isEdit: false,
+ export default {
+ components: {
+ BillListPopupVue,
+ BillListPopupMouldVue
+ },
+ data() {
+ return {
+ HSourceBillNoFocus: false,
+ barCodeFocus: true, //鏉＄爜鍏夋爣
+ userInfo: getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ tabs: 0,
+ arrayHEmpName: [],
+ HEmpNameList: [],
+ arrayHWHName: [], //浠撳簱
+ HWHNameList: [],
+ arrayHStockPlaceName: [], //浠撲綅
+ HStockPlaceNameList: [],
+ arrayHDeptName: [], //閮ㄩ棬
+ HDeptNameList: [],
+ arrayHCusName: [], //瀹㈡埛
+ HCusNameList: [],
+ arrayHSupplierName: [], //渚涘簲鍟�
+ HSuplierList: [],
+ linterid: '',
+ HBillNo: '',
+ arrayHSelectType: [], // 寰�鏉ュ崟浣嶄笅鎷夊垪琛�
+ HSelectTypeList: [], // 寰�鏉ュ崟浣嶅畬鏁存暟鎹垪琛�
+ showHStockPlaceName: true,
+ HMouldList: [],
+ isEdit: false,
- showHMainSourceBillType: true,
- showHSourceBillNo: true,
- HMainSourceBillType: uni.getStorageSync('billTypeName_3803') ? uni.getStorageSync('billTypeName_3803') :
- '鎵嬪伐褰曞叆',
- arrayHMainSourceBillType: ['鎵嬪伐褰曞叆'],
- arrayHMainSourceBillValue: ['-1'],
+ showHMainSourceBillType: true,
+ showHSourceBillNo: true,
+ HMainSourceBillType: uni.getStorageSync('billTypeName_3803') ? uni.getStorageSync('billTypeName_3803') :
+ '鎵嬪伐褰曞叆',
+ arrayHMainSourceBillType: ['鎵嬪伐褰曞叆'],
+ arrayHMainSourceBillValue: ['-1'],
- hform: {
- HBarCode: '',
- HInterID: '',
- HBillType: 3803,
- HWHName: getUserInfo().HWhName,
- HWHID: getUserInfo().HWhID,
- HStockPlaceName: getUserInfo().HSPName,
- HStockPlaceID: getUserInfo().HSPID,
-
- HDeptName: getUserInfo().HDeptName,
- HDeptID: getUserInfo().HDeptID,
- HSecManagerID: getUserInfo().HEmpID,
- HSecManagerName: getUserInfo().HEmpName,
- HKeeperName: getUserInfo().HKeeperName,
- HKeeperID: getUserInfo().HKeeperID,//鍙戞枡浜�
- //婧愬崟淇℃伅
- HMainSourceBillType: uni.getStorageSync('billType_3803') ? uni.getStorageSync('billType_3803') :
- 3849,
- HSourceBillNo: '', //CGDD000200
+ hform: {
+ HBarCode: '',
+ HInterID: '',
+ HBillType: 3803,
+ HWHName: getUserInfo().HWhName,
+ HWHID: getUserInfo().HWhID,
+ HStockPlaceName: getUserInfo().HSPName,
+ HStockPlaceID: getUserInfo().HSPID,
- //寰�鏉ョ被鍨�
- TypeName: uni.getStorageSync('typeName_3803'),
- HSupName: '', // 寰�鏉ュ崟浣嶉�変腑鐨勫��
- HSupID: '', // 寰�鏉ュ崟浣嶅搴旂殑ID
- HSupTypeID: uni.getStorageSync('typeID_3803') ? uni.getStorageSync('typeID_3803') : 0,
- HDate: getDateTime.dateTimeStr('y-m-d'),
- HMaker: uni.getStorageSync('HUserName'),
+ HDeptName: getUserInfo().HDeptName,
+ HDeptID: getUserInfo().HDeptID,
+ HSecManagerID: getUserInfo().HEmpID,
+ HSecManagerName: getUserInfo().HEmpName,
+ HKeeperName: getUserInfo().HEmpName,
+ HKeeperID: getUserInfo().HEmpID, //鍙戞枡浜�
+ // HKeeperName: getUserInfo().HKeeperName,
+ // HKeeperID: getUserInfo().HKeeperID,//鍙戞枡浜�
+ //婧愬崟淇℃伅
+ HMainSourceBillType: uni.getStorageSync('billType_3803') ? uni.getStorageSync('billType_3803') : 3849,
+ HSourceBillNo: '', //CGDD000200
- HRedBlueFlag: 'false',
- HStockOrgName: uni.getStorageSync('Organization'),
- HStockOrgID: uni.getStorageSync('OrganizationID'),
- HStockOutOrgID: uni.getStorageSync('OrganizationID'),
- HBarCode_B: '',
- HMouldName_B: '',
- HMouldID_B: '',
- HMouldCount_B: ''
- }
- }
- },
- methods: {
- searchModule() {
- this.$refs['billListMould'].showPopup()
- },
- MouldBillHandler(mould) {
- if (!mould.enableMultiSourceBill) {
- let val = mould.val[0]
- this.hform.HBarCode = val['鏉＄爜缂栧彿']
- this.getCode(this.hform.HBarCode)
- }
- this.$refs['billListMould'].exit()
- },
- HSupNameChange(e) {
- let index = this.arrayHSelectType.findIndex(el => el == e)
- let HSupInfo = this.HSelectTypeList[index]
- console.log('HSupInfo: ', HSupInfo);
+ //寰�鏉ョ被鍨�
+ TypeName: uni.getStorageSync('typeName_3803'),
+ HSupName: '', // 寰�鏉ュ崟浣嶉�変腑鐨勫��
+ HSupID: '', // 寰�鏉ュ崟浣嶅搴旂殑ID
+ HSupTypeID: uni.getStorageSync('typeID_3803') ? uni.getStorageSync('typeID_3803') : 0,
+ HDate: getDateTime.dateTimeStr('y-m-d'),
+ HMaker: uni.getStorageSync('HUserName'),
- this.hform.HSupID = HSupInfo.HItemID
- this.hform.HSupName = HSupInfo['閮ㄩ棬鍚嶇О'] || HSupInfo['瀹㈡埛鍚嶇О'] || HSupInfo['渚涘簲鍟嗗悕绉�']
+ HRedBlueFlag: 'false',
+ HStockOrgName: uni.getStorageSync('Organization'),
+ HStockOrgID: uni.getStorageSync('OrganizationID'),
+ HStockOutOrgID: uni.getStorageSync('OrganizationID'),
+ HBarCode_B: '',
+ HMouldName_B: '',
+ HMouldID_B: '',
+ HMouldCount_B: ''
+ }
+ }
+ },
+ methods: {
+ searchModule() {
+ this.$refs['billListMould'].showPopup()
+ },
+ MouldBillHandler(mould) {
+ if (!mould.enableMultiSourceBill) {
+ let val = mould.val[0]
+ this.hform.HBarCode = val['鏉＄爜缂栧彿']
+ this.getCode(this.hform.HBarCode)
+ }
+ this.$refs['billListMould'].exit()
+ },
+ HSupNameChange(e) {
+ let index = this.arrayHSelectType.findIndex(el => el == e)
+ let HSupInfo = this.HSelectTypeList[index]
+ console.log('HSupInfo: ', HSupInfo);
- const pages = getCurrentPages()
- // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
- const currentPage = pages[pages.length - 1]
- // 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
- uni.setStorageSync(`${currentPage.route.split("/").pop()}_${this.hform.HBillType}`, {
- HSupName: HSupInfo['閮ㄩ棬鍚嶇О'] || HSupInfo['瀹㈡埛鍚嶇О'] || HSupInfo['渚涘簲鍟嗗悕绉�'],
- HSupID: HSupInfo.HItemID
- })
- },
- loadCache() {
- const pages = getCurrentPages()
- // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
- const currentPage = pages[pages.length - 1]
- // 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
- let cache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_${this.hform.HBillType}`)
+ this.hform.HSupID = HSupInfo.HItemID
+ this.hform.HSupName = HSupInfo['閮ㄩ棬鍚嶇О'] || HSupInfo['瀹㈡埛鍚嶇О'] || HSupInfo['渚涘簲鍟嗗悕绉�']
- this.hform.HSupID = cache.HSupID
- this.hform.HSupName = cache.HSupName
- },
- //鎵爜
- toScanCode() {
- var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
- mpaasScanModule.mpaasScan({
- 'hideAlbum': true,
- 'timeoutInterval': '10', //瓒呮椂鏃堕棿
- 'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
- }, (ret) => {
- console.log(ret.resp_result)
- if (this.hform.HBarCode == '*') {
- this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
- } else {
- this.hform.HBarCode = ret.resp_result
- }
+ const pages = getCurrentPages()
+ // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+ const currentPage = pages[pages.length - 1]
+ // 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
+ uni.setStorageSync(`${currentPage.route.split("/").pop()}_${this.hform.HBillType}`, {
+ HSupName: HSupInfo['閮ㄩ棬鍚嶇О'] || HSupInfo['瀹㈡埛鍚嶇О'] || HSupInfo['渚涘簲鍟嗗悕绉�'],
+ HSupID: HSupInfo.HItemID
+ })
+ },
+ loadCache() {
+ const pages = getCurrentPages()
+ // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+ const currentPage = pages[pages.length - 1]
+ // 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
+ let cache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_${this.hform.HBillType}`)
- this.getCode(this.hform.HBarCode)
- })
- },
- getNewData() {
- CommonUtils.doRequest("/WEBSController/GetMaxBillNoAndID_Json", {
- HBillType: this.hform.HBillType
- },
- (res) => {
- let res1 = res.data;
- let {
- data,
- count
- } = res1
- if (count == 1) {
- this.hform.HInterID = data[0].HInterID
- this.hform.HBillNo = data[0].HBillNo
- } else {
- uni.showToast({
- title: data.Message,
- icon: 'none'
- })
- }
- })
- },
- getCode(HBarCode) {
- //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
- if (!this.hform.HWHName) {
- this.hform.HWHID = 0
- }
- if (!this.hform.HStockPlaceName) {
- this.hform.HStockPlaceID = 0
- }
- var sHWHID = this.hform.HWHID
- var sHSPID = this.hform.HStockPlaceID
- var sOldBarCode = HBarCode;
- var HDeleteFlag = sOldBarCode.substring(0, 1); //鍙栨潯鐮佺涓�涓瓧绗�
- var sBarCode = sOldBarCode.slice(1); //鑾峰彇绗竴涓瓧绗︿互澶栫殑鍏ㄩ儴瀛楃
- var sSourceBillNo = ""
- var sSourceBillType = "-1"
- if (HDeleteFlag == '*') {
- if (sBarCode == "") {
- uni.showToast({
- title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
- icon: 'none'
- });
- } else {
- uni.request({
- url: this.serverUrl + '/MouldController/set_DelMouldStockBillMain_Temp_Json',
- data: {
- HInterID: this.hform.HInterID,
- HBillType: this.hform.HBillType,
- HBarCode: sBarCode
- },
- success: (res) => {
- console.log('鍒犻櫎鏉＄爜', res.data);
- this.hform.HBarCode = '';
- if (res.data.count == 1) {
- this.hform.HQty = ''
- } else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- },
- });
- }
- } else {
- var sBarCode = this.hform.HBarCode
- uni.request({
- url: this.serverUrl + '/MouldController/Get_CheckTypeByMouldBarCode_Json',
- data: {
- sBarCode: sBarCode,
- HInterID: this.hform.HInterID,
- HBillType: this.hform.HBillType,
- HBillNo: this.hform.HBillNo,
- HMaker: this.hform.HMaker,
- HWhID: sHWHID,
- HSPID: sHSPID,
- HSCWhID: 0,
- HSCSPID: 0,
- HRedBlueFlag: this.hform.HRedBlueFlag,
- HSourceBillNo: sSourceBillNo,
- HSourceBillType: sSourceBillType,
- HStockOrgID: this.hform.HStockOrgID,
- HStockOutOrgID: this.hform.HStockOutOrgID,
- },
- success: (res) => {
- console.log('妫�鏌ユ壂鐮佽繑鍥炵殑鏁版嵁', res.data);
- this.hform.HBarCode = ''
- if (res.data.count == 1) {
- this.tabs = 1
- this.DisBillEntryList()
- } else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- },
- })
- }
- },
- //浠撳簱鐩戝惉浜嬩欢
- HWHNameChange(e) {
- for (var i = 0; i < this.HWHNameList.length; i++) {
- if (this.HWHNameList[i]["HName"] == e) {
- this.hform.HWHName = this.HWHNameList[i]["HName"]
- this.hform.HWHID = this.HWHNameList[i].HItemID
+ this.hform.HSupID = cache.HSupID
+ this.hform.HSupName = cache.HSupName
+ },
+ //鎵爜
+ toScanCode() {
+ var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+ mpaasScanModule.mpaasScan({
+ 'hideAlbum': true,
+ 'timeoutInterval': '10', //瓒呮椂鏃堕棿
+ 'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ }, (ret) => {
+ console.log(ret.resp_result)
+ if (this.hform.HBarCode == '*') {
+ this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
+ } else {
+ this.hform.HBarCode = ret.resp_result
+ }
- this.showHStockPlaceName = this.HWHNameList[i].HIsStockMgr
- }
- }
- },
- HStockPlaceNameChange(e) {
- for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
- if (this.HStockPlaceNameList[i]["HWhName"] == e) {
- this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
- this.hform.HStockPlaceName = this.HStockPlaceNameList[i]["HWhName"]
- }
- }
- },
- HScatterUserChange(e) {
- for (var i = 0; i < this.HEmpNameList.length; i++) {
- if (this.HEmpNameList[i].HName == e) {
- this.hform.HKeeperID = this.HEmpNameList[i].HItemID
- this.hform.HKeeperName = this.HEmpNameList[i].HName
- }
- }
- },
- HCollectUserChange(e) {
- for (var i = 0; i < this.HEmpNameList.length; i++) {
- if (this.HEmpNameList[i].HName == e) {
- this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
- this.hform.HSecManagerName = this.HEmpNameList[i].HName
- }
- }
- },
- /* #region 浠撳簱浠撲綅鑾峰彇涓嬫媺妗� */
- getHBaseList() {
- CommonUtils.doRequest(
- "/Web/GetWarehouseList_Json_New", {
- Warehouse: "",
- HOrgID: uni.getStorageSync('OrganizationID')
- },
- (res) => {
- let res1 = res.data
- let {
- data,
- count
- } = res1
- if (count == 1) {
- this.HWHNameList = data
- for (var i = 0; i < data.length; i++) {
- this.arrayHWHName[i] = data[i]["HName"]
- }
- } else {
- uni.showToast({
- title: '浠撳簱鏁版嵁璇锋眰澶辫触',
- icon: 'none'
- })
- }
- },
- )
- CommonUtils.doRequest(
- "/WEBSController/GetStockPlaceList_Json", {
- StockPlace: '',
- HWhID: this.hform.HWHID,
- HStockOrgID: uni.getStorageSync('OrganizationID')
- },
- (res) => {
- let res1 = res.data
- console.log(res1)
- let {
- data,
- count
- } = res1
- if (count == 1) {
- this.HStockPlaceNameList = data
- for (var i = 0; i < data.length; i++) {
- this.arrayHStockPlaceName[i] = data[i]["HWhName"]
- }
- }
- },
- )
- },
- /* #endregion */
- getHEmpList() {
- CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
- Employee: '',
- HGroupID: 0
- },
- (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();
- } else {
- uni.showToast({
- title: '浜哄憳鏁版嵁璇锋眰澶辫触',
- icon: 'none'
- })
- }
- },
- )
- },
- //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
- getHDeptList() {
- 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();
- } else {
- uni.showToast({
- title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
- icon: 'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- },
- });
- },
- getHSupList() {
- CommonUtils.doRequest(
- "/Gy_Supplier/list", {
- sWhere: "",
- user: uni.getStorageSync('HUserName'),
- Organization: uni.getStorageSync('Organization')
- },
- (res) => {
- let res1 = res.data
- let {
- data,
- count
- } = res1
- if (count == 1) {
- this.HSuplierList = data
- for (var i = 0; i < data.length; i++) {
- this.arrayHSupplierName[i] = data[i].渚涘簲鍟嗗悕绉�
- }
- this.$forceUpdate();
- } else {
- uni.showToast({
- title: data.Message,
- icon: 'none'
- })
- }
- }
- )
- },
-
- //閫夋嫨浣跨敤閮ㄩ棬
- HDeptNameChange(e) {
- for (var i = 0; i < this.HDeptNameList.length; i++) {
- if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
- this.hform.HDeptID = this.HDeptNameList[i].HItemID
- this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
- }
- }
- },
- //閫夋嫨瀹㈡埛
- // HSupNameChange(e) {
- // for (var i = 0; i < this.HSupNameList.length; i++) {
- // if (this.HSupNameList[i].瀹㈡埛鍚嶇О == e) {
- // this.hform.HSupID = this.HSupNameList[i].HItemID
- // this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
- // }
- // }
- // },
- HDateChange(e) {
- console.log(e.detail.value)
- this.hform.HDate = e.detail.value
- },
- HSelectTypeChange(e) {
- this.hform.TypeName=e;
- this.hform.HSupName = ''; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
- this.hform.HSupID = '';
- uni.setStorageSync("typeName_3803",e);
- if(e=='閮ㄩ棬')
- {
- this.hform.HSupTypeID=3;
- uni.setStorageSync("typeID_3803",3);
- this.arrayHSelectType = this.arrayHDeptName;
- this.HSelectTypeList = this.HDeptNameList;
- }
- else if(e === '渚涘簲鍟�') {
- this.hform.HSupTypeID=1;
- uni.setStorageSync("typeID_3803",1);
- this.arrayHSelectType = this.arrayHSupplierName;
- this.HSelectTypeList = this.HSuplierList;
- } else if(e === '瀹㈡埛') {
- // 瀹㈡埛鏁版嵁 - 杩欓噷鐣欑┖锛屽悗缁坊鍔犺幏鍙栧鎴锋暟鎹殑閫昏緫
- this.hform.HSupTypeID=2;
- uni.setStorageSync("typeID_3803",2);
- this.arrayHSelectType =this.arrayHCusName;
- this.HSelectTypeList = this.HCusNameList;
- } else {
- uni.setStorageSync("typeID_3803",0);
- this.arrayHSelectType = [];
- this.HSelectTypeList = [];
- }
- },
- //鍣ㄥ叿淇℃伅
- DisBillEntryList() {
- CommonUtils.doRequest(
- "/MouldController/GetMouldBillEntryTmpList_Json", {
- HInterID: this.hform.HInterID,
- HBillNo: this.hform.HBillNo,
- HBillType: this.hform.HBillType
- },
- (res) => {
- console.log('鍣ㄥ叿', res.data)
- var data = res.data.data
- this.HMouldList = data;
- if (res.data.count == 0) {
- this.HMouldList = [];
- this.hform.HMouldCount_B = ''
- this.hform.HMouldID_B = ''
- this.hform.HMouldName_B = ''
+ this.getCode(this.hform.HBarCode)
+ })
+ },
+ getNewData() {
+ CommonUtils.doRequest("/WEBSController/GetMaxBillNoAndID_Json", {
+ HBillType: this.hform.HBillType
+ },
+ (res) => {
+ let res1 = res.data;
+ let {
+ data,
+ count
+ } = res1
+ if (count == 1) {
+ this.hform.HInterID = data[0].HInterID
+ this.hform.HBillNo = data[0].HBillNo
+ } else {
+ uni.showToast({
+ title: data.Message,
+ icon: 'none'
+ })
+ }
+ })
+ },
+ getCode(HBarCode) {
+ //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+ if (!this.hform.HWHName) {
+ this.hform.HWHID = 0
+ }
+ if (!this.hform.HStockPlaceName) {
+ this.hform.HStockPlaceID = 0
+ }
+ var sHWHID = this.hform.HWHID
+ var sHSPID = this.hform.HStockPlaceID
+ var sOldBarCode = HBarCode;
+ var HDeleteFlag = sOldBarCode.substring(0, 1); //鍙栨潯鐮佺涓�涓瓧绗�
+ var sBarCode = sOldBarCode.slice(1); //鑾峰彇绗竴涓瓧绗︿互澶栫殑鍏ㄩ儴瀛楃
+ var sSourceBillNo = ""
+ var sSourceBillType = "-1"
+ if (HDeleteFlag == '*') {
+ if (sBarCode == "") {
+ uni.showToast({
+ title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
+ icon: 'none'
+ });
+ } else {
+ uni.request({
+ url: this.serverUrl + '/MouldController/set_DelMouldStockBillMain_Temp_Json',
+ data: {
+ HInterID: this.hform.HInterID,
+ HBillType: this.hform.HBillType,
+ HBarCode: sBarCode
+ },
+ success: (res) => {
+ console.log('鍒犻櫎鏉＄爜', res.data);
+ this.hform.HBarCode = '';
+ if (res.data.count == 1) {
+ this.hform.HQty = ''
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ }
+ } else {
+ var sBarCode = this.hform.HBarCode
+ uni.request({
+ url: this.serverUrl + '/MouldController/Get_CheckTypeByMouldBarCode_Json',
+ data: {
+ sBarCode: sBarCode,
+ HInterID: this.hform.HInterID,
+ HBillType: this.hform.HBillType,
+ HBillNo: this.hform.HBillNo,
+ HMaker: this.hform.HMaker,
+ HWhID: sHWHID,
+ HSPID: sHSPID,
+ HSCWhID: 0,
+ HSCSPID: 0,
+ HRedBlueFlag: this.hform.HRedBlueFlag,
+ HSourceBillNo: sSourceBillNo,
+ HSourceBillType: sSourceBillType,
+ HStockOrgID: this.hform.HStockOrgID,
+ HStockOutOrgID: this.hform.HStockOutOrgID,
+ },
+ success: (res) => {
+ console.log('妫�鏌ユ壂鐮佽繑鍥炵殑鏁版嵁', res.data);
+ this.hform.HBarCode = ''
+ if (res.data.count == 1) {
+ this.tabs = 1
+ this.DisBillEntryList()
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ })
+ }
+ },
+ //浠撳簱鐩戝惉浜嬩欢
+ HWHNameChange(e) {
+ for (var i = 0; i < this.HWHNameList.length; i++) {
+ if (this.HWHNameList[i]["HName"] == e) {
+ this.hform.HWHName = this.HWHNameList[i]["HName"]
+ this.hform.HWHID = this.HWHNameList[i].HItemID
- } else {
- this.hform.HMouldCount_B = data[0].HQty
- this.hform.HMouldID_B = data[0].HMouldID
- this.hform.HMouldName_B = data[0].HMouldName
- this.hform.HBarCode_B = data[0].HBarCode
- }
- },
+ this.showHStockPlaceName = this.HWHNameList[i].HIsStockMgr
+ }
+ }
+ },
+ HStockPlaceNameChange(e) {
+ for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+ if (this.HStockPlaceNameList[i]["HWhName"] == e) {
+ this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+ this.hform.HStockPlaceName = this.HStockPlaceNameList[i]["HWhName"]
+ }
+ }
+ },
+ HScatterUserChange(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+ this.hform.HKeeperID = this.HEmpNameList[i].HItemID
+ this.hform.HKeeperName = this.HEmpNameList[i].HName
+ }
+ }
+ },
+ HCollectUserChange(e) {
+ for (var i = 0; i < this.HEmpNameList.length; i++) {
+ if (this.HEmpNameList[i].HName == e) {
+ this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
+ this.hform.HSecManagerName = this.HEmpNameList[i].HName
+ }
+ }
+ },
+ /* #region 浠撳簱浠撲綅鑾峰彇涓嬫媺妗� */
+ getHBaseList() {
+ CommonUtils.doRequest(
+ "/Web/GetWarehouseList_Json_MJ", {
+ Warehouse: "",
+ HOrgID: uni.getStorageSync('OrganizationID')
+ },
+ (res) => {
+ let res1 = res.data
+ let {
+ data,
+ count
+ } = res1
+ if (count == 1) {
+ this.HWHNameList = data
+ for (var i = 0; i < data.length; i++) {
+ this.arrayHWHName[i] = data[i]["HName"]
+ }
+ if (!this.hform.HWHName && this.arrayHWHName.length > 0) {
+ this.hform.HWHName = this.arrayHWHName[0];
+ // 鍚屾椂璁剧疆瀵瑰簲鐨勪粨搴揑D
+ for (var j = 0; j < this.HWHNameList.length; j++) {
+ if (this.HWHNameList[j]["HName"] == this.hform.HWHName) {
+ this.hform.HWHID = this.HWHNameList[j].HItemID;
+ this.showHStockPlaceName = this.HWHNameList[j].HIsStockMgr;
+ break;
+ }
+ }
+ // 瑙﹀彂浠撳簱鍙樻洿浜嬩欢锛屼互鏇存柊鐩稿叧渚濊禆锛堝浠撲綅锛�
+ this.HWHNameChange(this.hform.HWHName);
+ }
+ } else {
+ uni.showToast({
+ title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ )
+ CommonUtils.doRequest(
+ "/WEBSController/GetStockPlaceList_Json", {
+ StockPlace: '',
+ HWhID: this.hform.HWHID,
+ HStockOrgID: uni.getStorageSync('OrganizationID')
+ },
+ (res) => {
+ let res1 = res.data
+ console.log(res1)
+ let {
+ data,
+ count
+ } = res1
+ if (count == 1) {
+ this.HStockPlaceNameList = data
+ for (var i = 0; i < data.length; i++) {
+ this.arrayHStockPlaceName[i] = data[i]["HWhName"]
+ }
+ }
+ },
+ )
+ },
+ /* #endregion */
+ getHEmpList() {
+ CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
+ Employee: '',
+ HGroupID: 0
+ },
+ (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();
+ } else {
+ uni.showToast({
+ title: '浜哄憳鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ )
+ },
+ //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+ getHDeptList() {
+ 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();
+ } else {
+ uni.showToast({
+ title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ getHSupList() {
+ CommonUtils.doRequest(
+ "/Gy_Supplier/list", {
+ sWhere: "",
+ user: uni.getStorageSync('HUserName'),
+ Organization: uni.getStorageSync('Organization')
+ },
+ (res) => {
+ let res1 = res.data
+ let {
+ data,
+ count
+ } = res1
+ if (count == 1) {
+ this.HSuplierList = data
+ for (var i = 0; i < data.length; i++) {
+ this.arrayHSupplierName[i] = data[i].渚涘簲鍟嗗悕绉�
+ }
+ this.$forceUpdate();
+ } else {
+ uni.showToast({
+ title: data.Message,
+ icon: 'none'
+ })
+ }
+ }
+ )
+ },
- )
- },
- goBack() {
- uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- uni.redirectTo({
- url: '/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList'
- })
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- }
- }
- });
- },
- submit() {
- //浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
- if (!this.hform.HWHName) {
- this.hform.HWHID = 0
- }
- if (!this.hform.HStockPlaceName) {
- this.hform.HStockPlaceID = 0
- }
-
- if (!this.hform.HDeptName) {
- this.hform.HDeptID = 0
- }
- if (!this.hform.HSupName) {
- this.hform.HSupID = 0
- }
- if (this.hform.HInterID == 0 || !this.hform.HInterID) {
- uni.showToast({
- title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
- icon: 'none'
- })
- } else if (!this.hform.HBillNo) {
- uni.showToast({
- title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
- icon: 'none'
- })
- } else {
- if (this.hform.HMouldID_B == 0 || this.hform.HMouldID_B == null) {
- uni.showToast({
- title: '娌℃湁鎵弿鍣ㄥ叿鏉＄爜锛岃鍏堟壂鎻忓櫒鍏锋潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
- icon: 'none'
- })
- } else {
- uni.showLoading({
- title: '璇风◢鍊�'
- })
+ //閫夋嫨浣跨敤閮ㄩ棬
+ HDeptNameChange(e) {
+ for (var i = 0; i < this.HDeptNameList.length; i++) {
+ if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+ this.hform.HDeptID = this.HDeptNameList[i].HItemID
+ this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
+ }
+ }
+ },
+ //閫夋嫨瀹㈡埛
+ // HSupNameChange(e) {
+ // for (var i = 0; i < this.HSupNameList.length; i++) {
+ // if (this.HSupNameList[i].瀹㈡埛鍚嶇О == e) {
+ // this.hform.HSupID = this.HSupNameList[i].HItemID
+ // this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
+ // }
+ // }
+ // },
+ HDateChange(e) {
+ console.log(e.detail.value)
+ this.hform.HDate = e.detail.value
+ },
+ HSelectTypeChange(e) {
+ this.hform.TypeName = e;
+ this.hform.HSupName = ''; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
+ this.hform.HSupID = '';
+ uni.setStorageSync("typeName_3803", e);
+ if (e == '閮ㄩ棬') {
+ this.hform.HSupTypeID = 3;
+ uni.setStorageSync("typeID_3803", 3);
+ this.arrayHSelectType = this.arrayHDeptName;
+ this.HSelectTypeList = this.HDeptNameList;
+ } else if (e === '渚涘簲鍟�') {
+ this.hform.HSupTypeID = 1;
+ uni.setStorageSync("typeID_3803", 1);
+ this.arrayHSelectType = this.arrayHSupplierName;
+ this.HSelectTypeList = this.HSuplierList;
+ } else if (e === '瀹㈡埛') {
+ // 瀹㈡埛鏁版嵁 - 杩欓噷鐣欑┖锛屽悗缁坊鍔犺幏鍙栧鎴锋暟鎹殑閫昏緫
+ this.hform.HSupTypeID = 2;
+ uni.setStorageSync("typeID_3803", 2);
+ this.arrayHSelectType = this.arrayHCusName;
+ this.HSelectTypeList = this.HCusNameList;
+ } else {
+ uni.setStorageSync("typeID_3803", 0);
+ this.arrayHSelectType = [];
+ this.HSelectTypeList = [];
+ }
+ },
+ //鍣ㄥ叿淇℃伅
+ DisBillEntryList() {
+ CommonUtils.doRequest(
+ "/MouldController/GetMouldBillEntryTmpList_Json", {
+ HInterID: this.hform.HInterID,
+ HBillNo: this.hform.HBillNo,
+ HBillType: this.hform.HBillType
+ },
+ (res) => {
+ console.log('鍣ㄥ叿', res.data)
+ var data = res.data.data
+ this.HMouldList = data;
+ if (res.data.count == 0) {
+ this.HMouldList = [];
+ this.hform.HMouldCount_B = ''
+ this.hform.HMouldID_B = ''
+ this.hform.HMouldName_B = ''
+
+ } else {
+ this.hform.HMouldCount_B = data[0].HQty
+ this.hform.HMouldID_B = data[0].HMouldID
+ this.hform.HMouldName_B = data[0].HMouldName
+ this.hform.HBarCode_B = data[0].HBarCode
+ }
+ },
+
+ )
+ },
+ goBack() {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url: '/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList'
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
+ });
+ },
+ submit() {
+ //浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ if (!this.hform.HWHName) {
+ this.hform.HWHID = 0
+ }
+ if (!this.hform.HStockPlaceName) {
+ this.hform.HStockPlaceID = 0
+ }
+
+ if (!this.hform.HDeptName) {
+ this.hform.HDeptID = 0
+ }
+ if (!this.hform.HSupName) {
+ this.hform.HSupID = 0
+ }
+ if (this.hform.HInterID == 0 || !this.hform.HInterID) {
+ uni.showToast({
+ title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+ icon: 'none'
+ })
+ } else if (!this.hform.HBillNo) {
+ uni.showToast({
+ title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+ icon: 'none'
+ })
+ } else {
+ if (this.hform.HMouldID_B == 0 || this.hform.HMouldID_B == null) {
+ uni.showToast({
+ title: '娌℃湁鎵弿鍣ㄥ叿鏉＄爜锛岃鍏堟壂鎻忓櫒鍏锋潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+ icon: 'none'
+ })
+ } else {
+ uni.showLoading({
+ title: '璇风◢鍊�'
+ })
- let sMainStr = JSON.stringify(this.hform);
- console.log("涓昏〃锛�" + sMainStr)
+ let sMainStr = JSON.stringify(this.hform);
+ console.log("涓昏〃锛�" + sMainStr)
- CommonUtils.doRequest(
- '/MouldController/set_SaveMouldProdBackBill_Json', {
- oMain: sMainStr
- },
- (res) => {
- console.log(1, res);
- uni.hideLoading()
- if (res.data.count == 1) {
- uni.showModal({
- title: '鎻愮ず',
- content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- uni.redirectTo({
- url: '/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill'
- })
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- setTimeout(() => {
- uni.navigateBack();
- }, 50)
- }
- }
- });
- } else {
- // uni.showToast({
- // title: res.data.Message,
- // icon: 'none'
- // })
- uni.showModal({
- content: res.data.Message,
- showCancel: false,
- complete() {
- uni.hideLoading()
- }
- })
- }
- },
- null,
- "POST"
- )
- }
- }
- },
- getHCusList() {
- CommonUtils.doRequest(
- "/Gy_Customer/list", {
- sWhere: "",
- user: uni.getStorageSync('HUserName'),
- Organization: uni.getStorageSync('Organization')
- },
- (res) => {
- let res1 = res.data
- let {
- data,
- count
- } = res1
- if (count == 1) {
- this.HCusNameList = data
- for (var i = 0; i < data.length; i++) {
- this.arrayHCusName[i] = data[i].瀹㈡埛鍚嶇О
- }
- this.$forceUpdate();
- } else {
- uni.showToast({
- title: data.Message,
- icon: 'none'
- })
- }
- }
- )
- },
- },
- onLoad(e) {
- console.log(e, this.userInfo)
+ CommonUtils.doRequest(
+ '/MouldController/set_SaveMouldProdBackBill_Json', {
+ oMain: sMainStr
+ },
+ (res) => {
+ console.log(1, res);
+ uni.hideLoading()
+ if (res.data.count == 1) {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url: '/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill'
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ }
+ }
+ });
+ } else {
+ // uni.showToast({
+ // title: res.data.Message,
+ // icon: 'none'
+ // })
+ uni.showModal({
+ content: res.data.Message,
+ showCancel: false,
+ complete() {
+ uni.hideLoading()
+ }
+ })
+ }
+ },
+ null,
+ "POST"
+ )
+ }
+ }
+ },
+ getHCusList() {
+ CommonUtils.doRequest(
+ "/Gy_Customer/list", {
+ sWhere: "",
+ user: uni.getStorageSync('HUserName'),
+ Organization: uni.getStorageSync('Organization')
+ },
+ (res) => {
+ let res1 = res.data
+ let {
+ data,
+ count
+ } = res1
+ if (count == 1) {
+ this.HCusNameList = data
+ for (var i = 0; i < data.length; i++) {
+ this.arrayHCusName[i] = data[i].瀹㈡埛鍚嶇О
+ }
+ this.$forceUpdate();
+ } else {
+ uni.showToast({
+ title: data.Message,
+ icon: 'none'
+ })
+ }
+ }
+ )
+ },
+ },
+ onLoad(e) {
+ console.log(e, this.userInfo)
- if (e.HInterID) {
- // this.HInterID_Temp = e.HInterID
- // this.btnType = 1
- this.RoadBillMain(e.HInterID)
- } else {
- this.getNewData()
- }
- this.getHBaseList()
- this.getHCusList()
- this.getHEmpList()
- this.getHDeptList()
- this.getHSupList()
+ if (e.HInterID) {
+ // this.HInterID_Temp = e.HInterID
+ // this.btnType = 1
+ this.RoadBillMain(e.HInterID)
+ } else {
+ this.getNewData()
+ }
+ this.getHBaseList()
+ this.getHCusList()
+ this.getHEmpList()
+ this.getHDeptList()
+ this.getHSupList()
- setTimeout(() => {
- this.HSelectTypeChange(this.hform.TypeName)
- //鍒濆鍖栧線鏉ュ崟浣�
- if (this.hform.TypeName == '閮ㄩ棬') {
- this.hform.HSupName = getUserInfo().HDept; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
- this.hform.HSupID = getUserInfo().HDeptID;
- } else if (this.hform.TypeName === '渚涘簲鍟�') {
- this.hform.HSupName = getUserInfo().HSupName; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
- this.hform.HSupID = getUserInfo().HSupID;
- } else if (this.hform.TypeName === '瀹㈡埛') {
+ setTimeout(() => {
+ this.HSelectTypeChange(this.hform.TypeName)
+ //鍒濆鍖栧線鏉ュ崟浣�
+ if (this.hform.TypeName == '閮ㄩ棬') {
+ this.hform.HSupName = getUserInfo().HDept; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
+ this.hform.HSupID = getUserInfo().HDeptID;
+ } else if (this.hform.TypeName === '渚涘簲鍟�') {
+ this.hform.HSupName = getUserInfo().HSupName; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
+ this.hform.HSupID = getUserInfo().HSupID;
+ } else if (this.hform.TypeName === '瀹㈡埛') {
- }
- this.$nextTick(() => {
- this.loadCache()
- })
+ }
+ this.$nextTick(() => {
+ this.loadCache()
+ })
- }, 300);
- uni.$on('BillSelectComplete', (e) => {
- console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
- this.getHBarCodeData(e.HBillNo)
- this.$refs.billList.exit()
- })
+ }, 300);
+ uni.$on('BillSelectComplete', (e) => {
+ console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
+ this.getHBarCodeData(e.HBillNo)
+ this.$refs.billList.exit()
+ })
- this.loadCache()
- //this.getHEmpList()
- },
- //閲嶈閫夋嫨婧愬崟蹇呴』娣诲姞杩欎釜鍚﹀垯鍑虹幇涓ラ噸bug
- onUnload() {
- uni.$off('BillSelectComplete')
- },
- }
+ this.loadCache()
+ //this.getHEmpList()
+ },
+ //閲嶈閫夋嫨婧愬崟蹇呴』娣诲姞杩欎釜鍚﹀垯鍑虹幇涓ラ噸bug
+ onUnload() {
+ uni.$off('BillSelectComplete')
+ },
+ }
</script>
<style lang="scss" scoped>
- .form {
- width: 668rpx;
- margin: 20rpx auto;
- padding-bottom: 240rpx;
- }
+ .form {
+ width: 668rpx;
+ margin: 20rpx auto;
+ padding-bottom: 240rpx;
+ }
- .tab_area {
- width: 100%;
- height: 50rpx;
- }
+ .tab_area {
+ width: 100%;
+ height: 50rpx;
+ }
- .other {
- margin-top: 8rpx;
- text-align: center;
- font-size: 28rpx;
- padding: 4rpx 18rpx;
- color: #1890FF;
- }
+ .other {
+ margin-top: 8rpx;
+ text-align: center;
+ font-size: 28rpx;
+ padding: 4rpx 18rpx;
+ color: #1890FF;
+ }
- .tabs {
- width: 100%;
- display: flex;
- border-bottom: 1px solid #ddd;
- margin: 20rpx 0;
+ .tabs {
+ width: 100%;
+ display: flex;
+ border-bottom: 1px solid #ddd;
+ margin: 20rpx 0;
- view {
- width: 25%;
- font-size: 30rpx;
- color: #555;
- text-align: center;
- padding: 16rpx 0;
- }
+ view {
+ width: 25%;
+ font-size: 30rpx;
+ color: #555;
+ text-align: center;
+ padding: 16rpx 0;
+ }
- .on {
- color: #3a78ff;
- font-weight: bold;
- border-bottom: 3px solid #3a78ff;
- }
- }
+ .on {
+ color: #3a78ff;
+ font-weight: bold;
+ border-bottom: 3px solid #3a78ff;
+ }
+ }
- .form-item {
- display: flex;
- align-items: center;
- font-size: 30rpx;
- padding: 6rpx 0;
- gap: 12rpx;
+ .form-item {
+ display: flex;
+ align-items: center;
+ font-size: 30rpx;
+ padding: 6rpx 0;
+ gap: 12rpx;
- .title {
- width: 208rpx;
- flex-shrink: 0;
+ .title {
+ width: 208rpx;
+ flex-shrink: 0;
- text {
- color: red;
- font-weight: bold;
- }
- }
+ text {
+ color: red;
+ font-weight: bold;
+ }
+ }
- .right {
- // width: 450rpx;
- flex: 1;
- border-radius: 22rpx;
- border: 1px solid #acacac;
- position: relative;
- display: flex;
+ .right {
+ // width: 450rpx;
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ position: relative;
+ display: flex;
- picker {
- width: 100%;
- }
+ picker {
+ width: 100%;
+ }
- .uni-combox {
- width: 100%;
- }
- }
+ .uni-combox {
+ width: 100%;
+ }
+ }
- .righton {
- border-radius: 22rpx;
- border: 1px solid #e4e4e4;
- background-color: #e4e4e4;
- flex: 1;
- position: relative;
- display: flex;
+ .righton {
+ border-radius: 22rpx;
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ flex: 1;
+ position: relative;
+ display: flex;
- }
+ }
- input {
- width: 100%;
- padding: 8rpx 20rpx;
- font-size: 30rpx;
- }
+ input {
+ width: 100%;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
- textarea {
- width: 98%;
- padding: 8rpx 20rpx;
- font-size: 30rpx;
- }
+ textarea {
+ width: 98%;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
- .icon-wrapper {
- background-color: #3A78FF;
- border-radius: 100%;
- width: 52rpx;
- height: 52rpx;
- display: flex;
- justify-content: center;
- align-items: center;
- flex-shrink: 0;
+ .icon-wrapper {
+ background-color: #3A78FF;
+ border-radius: 100%;
+ width: 52rpx;
+ height: 52rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-shrink: 0;
- .uni-icons {
- color: #fff !important;
- }
- }
+ .uni-icons {
+ color: #fff !important;
+ }
+ }
- .icon-wrapper[disabled] {
- background-color: rgba(228, 228, 228, 1);
- pointer-events: none;
- touch-action: none;
- }
- }
+ .icon-wrapper[disabled] {
+ background-color: rgba(228, 228, 228, 1);
+ pointer-events: none;
+ touch-action: none;
+ }
+ }
- .bottom-btn {
- width: 100%;
- box-sizing: border-box;
- // 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;
- display: flex;
- flex-direction: row;
- gap: 10rpx;
+ .bottom-btn {
+ width: 100%;
+ box-sizing: border-box;
+ // 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;
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
- button {
- border-radius: 50rpx;
- width: 180rpx;
- height: 66rpx;
- line-height: 66rpx;
- font-size: 28rpx;
- }
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
- .btn-a {
- background-color: #3A78FF;
- color: #fff;
- }
+ .btn-a {
+ background-color: #3A78FF;
+ color: #fff;
+ }
- .btn-b {
- background-color: #41a863;
- color: #fff;
- }
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
- .btn-c {
- background-color: #acacac;
- color: #fff;
- // position: absolute;
- // right: 120rpx;
- }
+ .btn-c {
+ background-color: #acacac;
+ color: #fff;
+ // position: absolute;
+ // right: 120rpx;
+ }
- .btn-d {
- background-color: #ff8901;
- color: #fff;
- }
- }
+ .btn-d {
+ background-color: #ff8901;
+ color: #fff;
+ }
+ }
- .list {
- width: 100%;
+ .list {
+ width: 100%;
- .card-detail {
- width: 100%;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
- line-height: 120%;
+ .card-detail {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ line-height: 120%;
- .detail {
- // width: 50%;
- font-size: 26rpx;
- margin-bottom: 12rpx;
- color: #555;
- margin-right: 20rpx;
+ .detail {
+ // width: 50%;
+ font-size: 26rpx;
+ margin-bottom: 12rpx;
+ color: #555;
+ margin-right: 20rpx;
- text {
- color: #999;
- font-size: 26rpx;
- }
- }
- }
+ text {
+ color: #999;
+ font-size: 26rpx;
+ }
+ }
+ }
- .more {
- color: #888;
- font-size: 24rpx;
- display: flex;
- border-top: 1px solid #eee;
- padding-top: 20rpx;
+ .more {
+ color: #888;
+ font-size: 24rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
- .part {
- width: 50%;
- text-align: center;
- }
- }
- }
+ .part {
+ width: 50%;
+ text-align: center;
+ }
+ }
+ }
</style>
\ No newline at end of file
diff --git a/pages/MJGL/shangmudan/MouldUpperBill.vue b/pages/MJGL/shangmudan/MouldUpperBill.vue
index ee9a34a..514dd2e 100644
--- a/pages/MJGL/shangmudan/MouldUpperBill.vue
+++ b/pages/MJGL/shangmudan/MouldUpperBill.vue
@@ -14,6 +14,7 @@
<view class="tabs">
<view :class="tabs == 0 ? 'on':''" @tap="() => { tabs = 0; reFocusBarCode(); }">鍗曟嵁淇℃伅</view>
<view :class="tabs == 1 ? 'on':''" @tap="() => { tabs = 1; reFocusBarCode(); }">妯″叿淇℃伅</view>
+ <view :class="tabs == 2 ? 'on':''" @tap="() => { tabs = 2; reFocusBarCode(); }">鍒跺崟淇℃伅</view>
</view>
<!-- 鍗曟嵁淇℃伅 -->
@@ -89,15 +90,44 @@
</view>
<!-- 妯″叿淇℃伅 -->
<view v-if="tabs == 1">
- <zb-table id="list-table" :checked-highlight="true" :fit="true"
- :style="{height: `${listTableHeight}px`}" :columns="columns" :data="listData" :show-header="true"
- :border="true" :row-key="row => row.index" @toggleRowSelection="handleSelect"
- @toggleAllSelection="handleSelectAll" @rowClick="onTableRowClickHandler" />
+ <view class="card-list" :style="{height: `${listTableHeight}px`, overflow: 'auto'}">
+ <!-- 鍗＄墖鍒楄〃 -->
+ <view v-for="(item, index) in listData" :key="index" class="card-item">
+ <uni-card style="margin: 10rpx 0;">
+ <view class="card-content">
+ <view class="card-row">
+ <text class="label">搴忓彿锛�</text>
+ <text class="value">{{ index + 1 }}</text>
+ </view>
+ <view class="card-row">
+ <text class="label">鍣ㄥ叿缂栫爜锛�</text>
+ <text class="value">{{ item.鍣ㄥ叿缂栫爜 }}</text>
+ </view>
+ <view class="card-row">
+ <text class="label">鍣ㄥ叿鍚嶇О锛�</text>
+ <text class="value">{{ item.鍣ㄥ叿鍚嶇О }}</text>
+ </view>
+ <view class="card-row">
+ <text class="label">鍣ㄥ叿鍨嬪彿锛�</text>
+ <text class="value">{{ item.鍣ㄥ叿鍨嬪彿 }}</text>
+ </view>
+ <view class="card-row">
+ <text class="label">鍣ㄥ叿鏉＄爜锛�</text>
+ <text class="value">{{ item.鍣ㄥ叿鏉＄爜 }}</text>
+ </view>
+ <view class="card-row">
+ <text class="label">鍣ㄥ叿鏁伴噺锛�</text>
+ <text class="value">{{ item.鍣ㄥ叿鏁伴噺 }}</text>
+ </view>
+ </view>
+ </uni-card>
+ </view>
+
+ <view class="over" v-if="listData.length == 0">鏆傛棤妯″叿鏁版嵁</view>
+ </view>
</view>
- <view class="tab_area"></view>
-
- <view v-if="showmore">
+ <view v-if="tabs == 2">
<view class="form-item">
<view class="title">鍒跺崟浜�:</view>
<view class="righton">
@@ -139,16 +169,6 @@
</view>
</view>
- <view class="other">
- <view v-if="!showmore" @tap="showmore = true">
- 灞曞紑鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
- </view>
- <view v-if="showmore" @tap="showmore = false">
- 鎶樺彔鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
- </view>
- </view>
-
- <view class="tab_area"></view>
<view class="bottom-btn">
<button v-if="btnType == 1 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
@@ -193,51 +213,6 @@
listOption: [], // 鍒楄〃閫夐」
listData: [], // 琛ㄦ牸鏁版嵁
selectedRows: [], // 琛ㄦ牸閫変腑鐨勬暟鎹�
- // 鍦╟olumns閰嶇疆涓坊鍔犳搷浣滃垪
- columns: [ // 琛ㄦ牸鍒楅厤缃�
- {
- type: 'selection',
- fixed: true,
- width: 50
- },
- {
- name: 'index',
- label: '搴忓彿',
- width: 60,
- hidden: true
- },
- {
- name: 'HMouldID',
- label: 'HMouldID',
- width: 100,
- hidden: true
- },
- {
- name: '鍣ㄥ叿鏁伴噺',
- label: '鍣ㄥ叿鏁伴噺',
- width: 120
- },
- {
- name: '鍣ㄥ叿缂栫爜',
- label: '鍣ㄥ叿缂栫爜',
- width: 150
- },
- {
- name: '鍣ㄥ叿鍚嶇О',
- label: '鍣ㄥ叿鍚嶇О',
- width: 120
- },
- {
- name: '鍣ㄥ叿鍨嬪彿',
- label: '鍣ㄥ叿鍨嬪彿',
- width: 120
- },
- {
- name: '鍣ㄥ叿鏉＄爜',
- label: '鍣ㄥ叿鏉＄爜',
- width: 120
- }
- ],
hform: {
HInterID: '',
@@ -336,75 +311,16 @@
this.HBarCodeFocus = true;
});
},
- // 琛ㄦ牸琛岀偣鍑诲鐞�
- onTableRowClickHandler(row, index) {
- if (!this.listData[index].checked) {
- this.$set(this.listData[index], 'checked', true)
- } else {
- this.listData[index].checked = !this.listData[index].checked
- }
- },
-
- // 琛ㄦ牸閫夋嫨澶勭悊
- handleSelect(selected, array) {
- this.selectedRows = array
- },
-
- // 琛ㄦ牸鍏ㄩ�夊鐞�
- handleSelectAll(selected, array) {
- this.selectedRows = array
- },
- // 琛ㄦ牸琛屽垹闄�
- deleteSelected() {
- if (this.selectedRows.length === 0) {
- uni.showToast({
- title: '璇峰厛閫夋嫨瑕佸垹闄ょ殑妯″叿',
- icon: 'none'
- })
- return
- }
-
- // 鏄剧ず纭瀵硅瘽妗�
- uni.showModal({
- title: '纭鍒犻櫎',
- content: `纭畾瑕佸垹闄ら�変腑鐨�${this.selectedRows.length}鏉℃暟鎹悧锛焋,
- success: (res) => {
- if (res.confirm) {
- // 鑾峰彇閫変腑琛岀殑HMouldID闆嗗悎
- const selectedIds = this.selectedRows.map(row => row.HMouldID)
-
- // 杩囨护鎺夐�変腑鐨勬暟鎹�
- this.listData = this.listData.filter(item =>
- !selectedIds.includes(item.HMouldID)
- )
-
- // 閲嶆柊璁＄畻搴忓彿
- this.listData.forEach((item, index) => {
- item.index = index + 1
- })
-
- // 娓呯┖閫変腑鐘舵��
- this.selectedRows = []
-
- uni.showToast({
- title: '鍒犻櫎鎴愬姛',
- icon: 'success'
- })
- }
- }
- })
- },
-
//鏃ユ湡
HDateChange(e) {
console.log(e.detail.value)
this.hform.HDate = e.detail.value
},
getHBarCodeData(HBarCode) {
- if (uni.getStorageSync('Organization') == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�") {
+ if (uni.getStorageSync('Organization') != "浜嬩笟涓�澶�") {
if (!this.hform.HSourceName) {
uni.showToast({
- title: '璇峰厛閫夋嫨鐢熶骇璧勬簮',
+ title: '璇峰厛閫夋嫨鎴栨壂鎻忕敓浜ц祫婧�',
icon: 'none'
});
return;
@@ -954,25 +870,25 @@
})
}
// 濡傛灉鏄簨涓氫竴澶勭粍缁囷紝鏍￠獙鍣ㄥ叿鏁伴噺
- // if (uni.getStorageSync('OrganizationID') === "100007" && uni.getStorageSync('Organization') === "浜嬩笟涓�澶�") {
- // const zeroQtyItem = this.listData.find(item => {
- // // 鑰冭檻0銆乶ull銆乽ndefined绛夊紓甯告儏鍐�
- // const qty = Number(item.鍣ㄥ叿鏁伴噺) || 0;
- // return qty <= 0;
- // });
+ if (uni.getStorageSync('OrganizationID') === "100007" && uni.getStorageSync('Organization') === "浜嬩笟涓�澶�") {
+ const zeroQtyItem = this.listData.find(item => {
+ // 鑰冭檻0銆乶ull銆乽ndefined绛夊紓甯告儏鍐�
+ const qty = Number(item.鍣ㄥ叿鏁伴噺) || 0;
+ return qty <= 0;
+ });
- // if (zeroQtyItem) {
- // // 鎵惧埌绗竴涓暟閲忓紓甯搁」鐨勪綅缃紙绱㈠紩+1锛�
- // const index = this.listData.indexOf(zeroQtyItem) + 1;
- // const code = zeroQtyItem.鍣ㄥ叿缂栫爜 || '鏈煡缂栫爜';
- // uni.showToast({
- // title: `绗�${index}琛屻��${code}銆戝櫒鍏锋暟閲忎负0锛岃妫�鏌,
- // icon: 'none',
- // duration: 3000
- // });
- // return;
- // }
- // }
+ if (zeroQtyItem) {
+ // 鎵惧埌绗竴涓暟閲忓紓甯搁」鐨勪綅缃紙绱㈠紩+1锛�
+ const index = this.listData.indexOf(zeroQtyItem) + 1;
+ const code = zeroQtyItem.鍣ㄥ叿缂栫爜 || '鏈煡缂栫爜';
+ uni.showToast({
+ title: `绗�${index}琛屻��${code}銆戝櫒鍏锋暟閲忎负0锛岃妫�鏌,
+ icon: 'none',
+ duration: 3000
+ });
+ return;
+ }
+ }
if (!this.hform.HEmpName) {
uni.showToast({
title: '璇烽�夋嫨鎿嶄綔鍛�',
@@ -1202,7 +1118,7 @@
}
.btn-c {
- background-color: #acacac;
+ background-color: #FFA500;
color: #fff;
position: absolute;
right: 120rpx;
@@ -1234,4 +1150,5 @@
border-bottom: 3px solid #3a78ff;
}
}
+
</style>
\ No newline at end of file
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue
index cad1a85..3598e8f 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill.vue
@@ -44,36 +44,36 @@
</view>
<view class="form-item">
<view class="title">涓婚:</view>
- <view class="right">
- <input name="HContext" v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
+ <view class="righton">
+ <input name="HContext" disabled 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;">
+ <view class="righton" style="min-height: 150rpx;">
<textarea name="HDescription" v-model="hform.HDescription" auto-height maxlength="-1"
- placeholder="璇疯緭鍏ヨ缁嗗唴瀹�"></textarea>
+ placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" disabled ></textarea>
</view>
</view>
<view class="form-item">
<view class="title">寮傚父绫诲瀷:</view>
- <view class="right">
+ <view class="righton">
<uni-combox :candidates="arrayHErrMsgBackTypeName" placeholder="璇烽�夋嫨"
- v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange"></uni-combox>
+ v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange" disabled ></uni-combox>
</view>
</view>
<view class="form-item">
<view class="title">鍙戦�侀儴闂�:</view>
- <view class="right">
+ <view class="righton">
<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
- @input="HDeptNameChange"></uni-combox>
+ @input="HDeptNameChange" disabled ></uni-combox>
</view>
</view>
<view class="form-item">
<view class="title">鍙戦�佷汉:</view>
- <view class="right">
+ <view class="righton">
<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鍙戦�佷汉" v-model="hform.HSendMan"
- @input="HSendManChange"></uni-combox>
+ @input="HSendManChange" disabled ></uni-combox>
</view>
</view>
<view class="form-item">
@@ -92,28 +92,28 @@
</view>
<view class="form-item">
<view class="title">鐩稿叧璁惧:</view>
- <view class="right">
+ <view class="righton">
<uni-combox :candidates="arrayHEquipName" placeholder="璇烽�夋嫨璁惧" v-model="hform.HEquipName"
- @input="HEquipNameChange"></uni-combox>
+ @input="HEquipNameChange" disabled ></uni-combox>
</view>
</view>
<view class="form-item">
<view class="title">鐩稿叧妯″叿:</view>
- <view class="right">
+ <view class="righton">
<uni-combox :candidates="arrayHMouldName" placeholder="璇烽�夋嫨妯″叿" v-model="hform.HMouldName"
- @input="HMouldIDNameChange"></uni-combox>
+ @input="HMouldIDNameChange" disabled ></uni-combox>
</view>
</view>
<view class="form-item">
<view class="title">浜у搧鍚嶇О:</view>
- <view class="right">
- <input name="HMaterName" v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+ <view class="righton">
+ <input name="HMaterName" disabled 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 class="righton">
+ <input name="HMaterModel" disabled v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
</view>
</view>
<view class="form-item">
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue
index 1eb2a83..2593f59 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill.vue
@@ -44,36 +44,36 @@
</view>
<view class="form-item">
<view class="title">涓婚:</view>
- <view class="right">
- <input name="HContext" v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
+ <view class="righton">
+ <input name="HContext" disabled 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;">
+ <view class="righton" style="min-height: 150rpx;">
<textarea name="HDescription" v-model="hform.HDescription" auto-height maxlength="-1"
- placeholder="璇疯緭鍏ヨ缁嗗唴瀹�"></textarea>
+ placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" disabled ></textarea>
</view>
</view>
<view class="form-item">
<view class="title">寮傚父绫诲瀷:</view>
- <view class="right">
+ <view class="righton">
<uni-combox :candidates="arrayHErrMsgBackTypeName" placeholder="璇烽�夋嫨"
- v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange"></uni-combox>
+ v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange" disabled ></uni-combox>
</view>
</view>
<view class="form-item">
<view class="title">鍙戦�侀儴闂�:</view>
- <view class="right">
+ <view class="righton">
<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
- @input="HDeptNameChange"></uni-combox>
+ @input="HDeptNameChange" disabled ></uni-combox>
</view>
</view>
<view class="form-item">
<view class="title">鍙戦�佷汉:</view>
- <view class="right">
+ <view class="righton">
<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鍙戦�佷汉" v-model="hform.HSendMan"
- @input="HSendManChange"></uni-combox>
+ @input="HSendManChange" disabled ></uni-combox>
</view>
</view>
<view class="form-item">
@@ -99,28 +99,28 @@
</view>
<view class="form-item">
<view class="title">鐩稿叧璁惧:</view>
- <view class="right">
+ <view class="righton">
<uni-combox :candidates="arrayHEquipName" placeholder="璇烽�夋嫨璁惧" v-model="hform.HEquipName"
- @input="HEquipNameChange"></uni-combox>
+ @input="HEquipNameChange" disabled ></uni-combox>
</view>
</view>
<view class="form-item">
<view class="title">鐩稿叧妯″叿:</view>
- <view class="right">
+ <view class="righton">
<uni-combox :candidates="arrayHMouldName" placeholder="璇烽�夋嫨妯″叿" v-model="hform.HMouldName"
- @input="HMouldIDNameChange"></uni-combox>
+ @input="HMouldIDNameChange" disabled ></uni-combox>
</view>
</view>
<view class="form-item">
<view class="title">浜у搧鍚嶇О:</view>
- <view class="right">
- <input name="HMaterName" v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+ <view class="righton">
+ <input name="HMaterName" disabled 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 class="righton">
+ <input name="HMaterModel" disabled v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
</view>
</view>
<view class="form-item">
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill.vue
index 1d9f27f..bebc62f 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackReceiveBill/OA_ErrMsgBackReceiveBill.vue
@@ -43,36 +43,36 @@
</view>
<view class="form-item">
<view class="title">涓婚:</view>
- <view class="right">
- <input name="HContext" v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
+ <view class="righton">
+ <input name="HContext" disabled 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;">
+ <view class="righton" style="min-height: 150rpx;">
<textarea name="HDescription" v-model="hform.HDescription" auto-height maxlength="-1"
- placeholder="璇疯緭鍏ヨ缁嗗唴瀹�"></textarea>
+ placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" disabled ></textarea>
</view>
</view>
<view class="form-item">
<view class="title">寮傚父绫诲瀷:</view>
- <view class="right">
+ <view class="righton">
<uni-combox :candidates="arrayHErrMsgBackTypeName" placeholder="璇烽�夋嫨"
- v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange"></uni-combox>
+ v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange" disabled ></uni-combox>
</view>
</view>
<view class="form-item">
<view class="title">鍙戦�侀儴闂�:</view>
- <view class="right">
+ <view class="righton">
<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
- @input="HDeptNameChange"></uni-combox>
+ @input="HDeptNameChange" disabled ></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>
+ @input="HSendManChange" disabled ></uni-combox>
</view>
</view>
@@ -99,28 +99,28 @@
</view>
<view class="form-item">
<view class="title">鐩稿叧璁惧:</view>
- <view class="right">
+ <view class="righton">
<uni-combox :candidates="arrayHEquipName" placeholder="璇烽�夋嫨" v-model="hform.HEquipName"
- @input="HEquipNameChange"></uni-combox>
+ @input="HEquipNameChange" disabled ></uni-combox>
</view>
</view>
<view class="form-item">
<view class="title">鐩稿叧妯″叿:</view>
- <view class="right">
+ <view class="righton">
<uni-combox :candidates="arrayHMouldName" placeholder="璇烽�夋嫨" v-model="hform.HMouldName"
- @input="HMouldIDNameChange"></uni-combox>
+ @input="HMouldIDNameChange" disabled ></uni-combox>
</view>
</view>
<view class="form-item">
<view class="title">浜у搧鍚嶇О:</view>
- <view class="right">
- <input name="HMaterName" v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+ <view class="righton">
+ <input name="HMaterName" disabled 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 class="righton">
+ <input name="HMaterModel" disabled v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
</view>
</view>
<view class="form-item">
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue
index 1025f80..647d145 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill.vue
@@ -37,36 +37,36 @@
</view>
<view class="form-item">
<view class="title">涓婚:</view>
- <view class="right">
- <input name="HContext" v-model="hform.HContext" placeholder="璇疯緭鍏ヤ富棰�" />
+ <view class="righton">
+ <input name="HContext" disabled 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"
+ <view class="righton" style="min-height: 150rpx;">
+ <textarea name="HDescription" disabled v-model="hform.HDescription" auto-height maxlength="-1"
placeholder="璇疯緭鍏ヨ缁嗗唴瀹�"></textarea>
</view>
</view>
<view class="form-item">
<view class="title">寮傚父绫诲瀷:</view>
- <view class="right">
+ <view class="righton">
<uni-combox :candidates="arrayHErrMsgBackTypeName" placeholder="璇烽�夋嫨"
- v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange"></uni-combox>
+ v-model="hform.HErrMsgBackTypeName" @input="HErrMsgBackTypeNameChange" disabled></uni-combox>
</view>
</view>
<view class="form-item">
<view class="title">鍙戦�侀儴闂�:</view>
- <view class="right">
+ <view class="righton">
<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
- @input="HDeptNameChange"></uni-combox>
+ @input="HDeptNameChange" disabled></uni-combox>
</view>
</view>
<view class="form-item">
<view class="title">鍙戦�佷汉:</view>
- <view class="right">
+ <view class="righton">
<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鍙戦�佷汉" v-model="hform.HSendMan"
- @input="HSendManChange"></uni-combox>
+ @input="HSendManChange" disabled></uni-combox>
</view>
</view>
@@ -86,28 +86,28 @@
</view>
<view class="form-item">
<view class="title">鐩稿叧璁惧:</view>
- <view class="right">
+ <view class="righton">
<uni-combox :candidates="arrayHEquipName" placeholder="璇烽�夋嫨" v-model="hform.HEquipName"
- @input="HEquipNameChange"></uni-combox>
+ @input="HEquipNameChange" disabled></uni-combox>
</view>
</view>
<view class="form-item">
<view class="title">鐩稿叧妯″叿:</view>
- <view class="right">
+ <view class="righton">
<uni-combox :candidates="arrayHMouldName" placeholder="璇烽�夋嫨" v-model="hform.HMouldName"
- @input="HMouldIDNameChange"></uni-combox>
+ @input="HMouldIDNameChange" disabled></uni-combox>
</view>
</view>
<view class="form-item">
<view class="title">浜у搧鍚嶇О:</view>
- <view class="right">
- <input name="HMaterName" v-model="hform.HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+ <view class="righton">
+ <input name="HMaterName" v-model="hform.HMaterName" disabled placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
</view>
</view>
<view class="form-item">
<view class="title">瑙勬牸鍨嬪彿:</view>
- <view class="right">
- <input name="HMaterModel" v-model="hform.HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
+ <view class="righton">
+ <input name="HMaterModel" v-model="hform.HMaterModel" disabled placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
</view>
</view>
<view class="form-item">
@@ -985,5 +985,5 @@
</script>
<style lang="scss">
- @import "@/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss"
+ @import "@/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss";
</style>
\ No newline at end of file
diff --git a/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss b/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss
index ecd24bd..ad8329d 100644
--- a/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss
+++ b/pages/ZLGL/AanDengHujiao/style/OA_ErrMsgStyle.scss
@@ -27,7 +27,7 @@
color: #fff;
}
.btn-c {
- background-color: #acacac;
+ background-color: #FFA500;
color: #fff;
// position: absolute;
// right: 120rpx;
@@ -268,4 +268,37 @@
justify-content: flex-start;
gap: 6rpx;
- }
\ No newline at end of file
+ }
+ .uni-combox.disabled,
+ .uni-combox[disabled] {
+ opacity: 0.6;
+ pointer-events: none;
+
+ .uni-combox__selector {
+ background-color: #f5f5f5 !important;
+ color: #999 !important;
+ }
+
+ .uni-combox__input {
+ background-color: #f5f5f5 !important;
+ color: #999 !important;
+ -webkit-text-fill-color: #999 !important;
+ }
+ }
+
+ /* 閽堝 righton 绫讳腑鐨� uni-combox */
+ .righton {
+ .uni-combox.disabled,
+ .uni-combox[disabled] {
+ .uni-combox__selector {
+ background-color: #f5f5f5 !important;
+ border-color: #e0e0e0 !important;
+ }
+
+ .uni-combox__input {
+ background-color: #f5f5f5 !important;
+ color: #999 !important;
+ -webkit-text-fill-color: #999 !important;
+ }
+ }
+ }
\ No newline at end of file
diff --git a/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue b/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
index 805c203..099c58f 100644
--- a/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
+++ b/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
@@ -60,7 +60,7 @@
<view class="form-item">
<view class="title required">鐢熶骇鐝粍:</view>
<view class="right">
- <uni-combox :candidates="HGroupNameArray" name="HShiftsName" id="HShiftsName" placeholder="璇烽�夋嫨鐢熶骇鐝粍"
+ <uni-combox :candidates="HGroupNameArray" name="HGroupName" id="HGroupName" placeholder="璇烽�夋嫨鐢熶骇鐝粍"
v-model="hform.HGroupName" @input="HGroupNameChangeHandler"></uni-combox>
</view>
</view>
@@ -368,7 +368,7 @@
url: '/Web/GetEmployeeList_Json',
data: {
Employee: '',
- HGroupID:0
+ HGroupID: 0
},
resFunction: (res) => {
let {
@@ -495,9 +495,10 @@
Message,
count
} = res.data
-
- this.hform.HShiftsID = data[0]['HInterID']
- this.hform.HShiftsName = data[0]['鐝']
+ if (count && data && data.length > 0) {
+ this.hform.HShiftsID = data[0]['HInterID']
+ this.hform.HShiftsName = data[0]['鐝']
+ }
}
})
},
@@ -626,8 +627,22 @@
"HICMOBillNo": data1[0].浠诲姟鍗曞彿, //鐢熶骇璁㈠崟
"HDeptID": data1[0].HWorkShopID, //杞﹂棿ID
"HDeptName": data1[0].鐢熶骇杞﹂棿, //杞﹂棿
-
+
})
+ if (data1 && data1.length === 1) {
+ // 鑾峰彇宸ュ簭ID
+ let procId = data1[0].HProcID
+ // 鍦ㄥ伐搴忔暟缁勪腑鏌ユ壘瀵瑰簲鐨勫伐搴忓悕绉�
+ let procIndex = this.HProcNameArraySource.findIndex(item => item.HItemID ==
+ procId)
+
+ if (procIndex !== -1) {
+ // 鑷姩璁剧疆宸ュ簭
+ this.hform.HProcName = this.HProcNameArraySource[procIndex].HName
+ this.hform.HProcID = procId
+ this.onHProcNameChangeHandler(this.hform.HProcName)
+ }
+ }
uni.showToast({
icon: 'none',
@@ -652,7 +667,13 @@
if (this.hform.HQty == '') {
return uni.showToast({
icon: 'none',
- title: '鍙栨牱鏁伴噺涓虹┖'
+ title: '鍙栨牱鏁伴噺涓嶈兘涓虹┖'
+ })
+ }
+ if (this.hform.HSampleDamageQty == '') {
+ return uni.showToast({
+ icon: 'none',
+ title: '鐮村潖鎬у疄楠屾暟閲忎笉鑳戒负绌�'
})
}
if (this.hform.HProcID == 0) {
@@ -709,21 +730,21 @@
} = res.data
if (count == 1) {
uni.showModal({
- title: '鎻愮ず',
- content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- uni.redirectTo({
- url: '/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill?operationType=1'
- })
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- setTimeout(() => {
- uni.navigateBack();
- }, 50)
- }
- }
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url: '/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill?operationType=1'
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ }
+ }
});
} else {
return uni.showToast({
diff --git a/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue b/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
index fad9bf8..6b5a7e6 100644
--- a/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
+++ b/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
@@ -737,7 +737,7 @@
let res = await CommonUtils.doRequest2Async({
url: "/Gy_Employee/list",
data: {
- sWhere: ` and 绂佺敤鏍囪 = '' order by 閮ㄩ棬浠ｇ爜`,
+ sWhere: ` and 绂佺敤鏍囪 = '' `,
user: getUserInfo()["Czymc"],
Organization: uni.getStorageSync("Organization"),
},
diff --git a/pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBill.vue b/pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBill.vue
index ef5d0a5..8f6b8f9 100644
--- a/pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBill.vue
+++ b/pages/ZLGL/WorkSelfCheckBill/WorkSelfCheckBill.vue
@@ -954,7 +954,7 @@
data: {
sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync(
"Organization"
- )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' order by 閮ㄩ棬浠ｇ爜`,
+ )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' `,
user: getUserInfo()["Czymc"],
Organization: uni.getStorageSync("Organization"),
},
diff --git a/pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue b/pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue
index 456e57f..bf4ee68 100644
--- a/pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue
+++ b/pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue
@@ -71,7 +71,7 @@
<button class="op3" size="mini" plain @tap.stop="audit(item, 1)">鍙嶅鏍�</button>
<button class="op3" size="mini" plain @tap.stop="fileUpload(item)">鏂囦欢涓婁紶</button>
<button class="op3" size="mini" plain @tap.stop="getImage(item)">棰勮鍥剧墖</button>
- <!-- <button class="op3" size="mini" plain @tap.stop="Reject(item)">椹冲洖</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>
@@ -271,11 +271,13 @@
})
if(mode==1){
this.showDialog(item["hmainid"]);
+ }else{
+ setTimeout(() => {
+ this.cmdSearch()
+ }, 2000)
}
this.$forceUpdate()
- setTimeout(() => {
- this.cmdSearch()
- }, 2000)
+
}else {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
@@ -352,15 +354,15 @@
},
//鍙嶅鏍告彁浜ゆ剰瑙�
- showDialog(HInterID) {
+ async showDialog(HInterID) {
uni.showModal({
title: '璇锋彁浜ゅ弽瀹℃牳鎰忚',
editable: true,
placeholderText: '璇疯緭鍏ュ唴瀹�',
- success: (result) => {
+ success: async (result) => {
if (result.confirm) {
try {
- let res = CommonUtils.doRequest2Sync({
+ let res = await CommonUtils.doRequest2Sync({
url: '/LMES/AuditFlowOpinion',
data: {
"sWhere": result.content,
@@ -381,9 +383,9 @@
if (count > 0) {
uni.showToast({
icon: 'none',
- title: Message
+ title: "鎰忚鎻愪氦鎴愬姛"
})
-
+ this.cmdSearch();
} else {
uni.showToast({
icon: 'none',
@@ -442,6 +444,7 @@
} = res.data
if (count > 0) {
if(data.length>0){
+
const imageUrl = res.data.data[0]["url"];
//姝ｅ垯琛ㄨ揪寮忚幏鍙栨湇鍔″櫒璺緞鍊掓暟绗簩涓唴瀹�
const regex = /^(.*\/)[^\/]+\/[^\/]*\/?$/;
diff --git a/pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill.vue b/pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill.vue
index d222463..cdb7f20 100644
--- a/pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill.vue
+++ b/pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill.vue
@@ -1231,7 +1231,7 @@
data: {
sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync(
"Organization"
- )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' order by 閮ㄩ棬浠ｇ爜`,
+ )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' `,
user: getUserInfo()["Czymc"],
Organization: uni.getStorageSync("Organization"),
},
diff --git a/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue b/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
index 883975e..215a9d3 100644
--- a/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
+++ b/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
@@ -1231,7 +1231,7 @@
data: {
sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync(
"Organization"
- )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' order by 閮ㄩ棬浠ｇ爜`,
+ )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' `,
user: getUserInfo()["Czymc"],
Organization: uni.getStorageSync("Organization"),
},
diff --git a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
index fe55fbd..dbc28dd 100644
--- a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
+++ b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -51,9 +51,7 @@
<view class="right disabled">
<input type="text" :value="hform.HICMOBillNo" disabled />
</view>
- <view class="icon-wrapper-big"><uni-icons type="search" size="20"
- :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
- :disabled="hasSourceBill" @click="showSelectorModule(hform, 5)"></uni-icons></view>
+
</view>
<view class="form-item">
@@ -61,9 +59,7 @@
<view class="right disabled">
<input type="text" :value="hform.HProcExchBillNo" disabled />
</view>
- <view class="icon-wrapper-big"><uni-icons type="search" size="20"
- :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
- :disabled="hasSourceBill" @click="showSelectorModule(hform, 6)"></uni-icons></view>
+
</view>
<view class="form-item">
<view class="left">鍙栨牱鍗曞彿</view>
@@ -78,8 +74,7 @@
<input type="text" disabled :value="hform.HMaterNumber" />
</view>
<view class="icon-wrapper-big">
- <uni-icons type="search" size="20"
- :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
+
:disabled="hasSourceBill" @click="showSelectorModule(hform, 4)"></uni-icons>
</view>
</view>
@@ -1183,7 +1178,7 @@
let res = await CommonUtils.doRequest2Async({
url: "/Gy_Employee/list",
data: {
- sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' order by 閮ㄩ棬浠ｇ爜`,
+
user: getUserInfo()["Czymc"],
Organization: uni.getStorageSync("Organization"),
},
@@ -1771,6 +1766,7 @@
CheckProjectID: this.hform.HQCSchemeID || 0,
HBatchQty: this.hform.HProcExchQty || 0,
HMaterID: this.hform.HMaterID,
+
HBillType: '宸℃鏂规'
},
});
@@ -1963,8 +1959,7 @@
try {
console.log('this.$refs: ', this.$refs);
// 妫�鏌ユ槸鍚︽湁鏈垏鎹㈢殑妫�楠屽�兼ā鍧�(鏄惁鍖呭惈set_SaveValue鏂规硶),濡傛灉鏈夛紝鍒欒繍琛屼竴娆′繚瀛樻楠屽�肩殑鏂规硶锛屾牴鎹楠屽�兼槸鍚︿繚瀛樻垚鍔熷啀鎵ц涓嬩竴姝�
- if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules
- .length >
+ if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules.length >
0) {
// 鍔犺浇鏈夋楠屽�兼ā鍧�
await this.$refs.InspectValueModules[0].set_SaveValue();
@@ -1987,8 +1982,7 @@
checkItemsArray.push(checkItem);
}
console.log('checkItemsArray: ', checkItemsArray);
- let sMainSub =
- `${JSON.stringify(this.hform)};${JSON.stringify(checkItemsArray)};${this.operationType};${getUserInfo()["Czymc"]};${InspectValuesTrans[0]}`;
+
console.log("this.checkItems: ", this.checkItems);
let res = await CommonUtils.doRequest2Sync({
@@ -2020,9 +2014,9 @@
});
} else if (res.cancel) {
console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
- // setTimeout(() => {
- // uni.navigateBack();
- // }, 50)
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
}
},
});
@@ -2421,7 +2415,7 @@
}
.btn-c {
- background-color: #acacac;
+ background-color: #FFA500;
color: #fff;
// position: absolute;
// right: 120rpx;
diff --git a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
index d4af174..bf5b74c 100644
--- a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
+++ b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -1264,7 +1264,7 @@
let res = await CommonUtils.doRequest2Async({
url: "/Gy_Employee/list",
data: {
- sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' order by 閮ㄩ棬浠ｇ爜`,
+ sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' `,
user: getUserInfo()["Czymc"],
Organization: uni.getStorageSync("Organization"),
},
@@ -2082,9 +2082,9 @@
});
} else if (res.cancel) {
console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
- // setTimeout(() => {
- // uni.navigateBack();
- // }, 50)
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
}
},
});
@@ -2425,7 +2425,7 @@
}
.btn-c {
- background-color: #acacac;
+ background-color: #FFA500;
color: #fff;
// position: absolute;
// right: 120rpx;
diff --git a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
index 1924052..943a9b2 100644
--- a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
+++ b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
@@ -79,6 +79,7 @@
</view>
</view>
<view class="form-item">
+
<view class="left required">妫�楠屾暟閲�</view>
<view class="right">
<input type="number" v-model="hform.HCheckQty" />
@@ -1770,9 +1771,9 @@
});
} else if (res.cancel) {
console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
- // setTimeout(() => {
- // uni.navigateBack();
- // }, 50)
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
}
},
});
@@ -2040,6 +2041,7 @@
this.HSourceBillType = "宸ュ簭娴佽浆鍗�"; // 鏄剧ず鍚嶇О
this.hform.HSourceBillType = "3772"; // 瀵瑰簲鐨勫��
}
+
},
};
</script>
@@ -2174,7 +2176,8 @@
}
.btn-c {
- background-color: #acacac;
+ // background-color: #acacac;
+ background-color: #FFA500;
color: #fff;
// position: absolute;
// right: 120rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c486320..3809d50 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -337,7 +337,13 @@
"id": 26,
"hidden": false
},
-
+ {
+ "img": "../../static/icon/icon21.png",
+ "text": "鏉＄爜鎷嗙爜",
+ "url": "/pages/tiaomachaima/tiaomachaimaCopy",
+ "id": 25,
+ "hidden": false
+ },
],
}
diff --git a/pages/tiaomachaima/tiaomachaimaCopy.vue b/pages/tiaomachaima/tiaomachaimaCopy.vue
new file mode 100644
index 0000000..d861e04
--- /dev/null
+++ b/pages/tiaomachaima/tiaomachaimaCopy.vue
@@ -0,0 +1,703 @@
+<template>
+ <view class="container">
+ <view class="header">
+ <view class="item">
+ <view class="left">鏉＄爜缂栧彿锛�</view>
+ <view class="right">
+ <input :focus="HBarCodeFocus" v-model="barCodeInfoMeta.barCodeNo" placeholder="璇锋壂鎻忔潯鐮�"
+ @confirm="searchbarCodeInfo" />
+ </view>
+ <view>
+ <uni-icons type="scan"
+ style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;font-weight: 500;"
+ size="20" @click="toScanCode"></uni-icons>
+ </view>
+ </view>
+ <view class="item">
+ <view class="left">鎷嗙爜鏁伴噺锛�</view>
+ <view class="right">
+ <input type="number" name="HSplitNum" v-model="barCodeInfoMeta.splitNum" placeholder="璇疯緭鍏ユ媶鐮佹暟閲�" />
+ </view>
+ </view>
+ <view class="item">
+ <view class="left">鍒跺崟浜猴細</view>
+ <view class="right">
+ <input type="text" disabled name="HMaker" v-model="barCodeInfoMeta.billMaker"
+ style="background-color: #e4e4e4;" placeholder="璇疯緭鍏ュ埗鍗曚汉" />
+ </view>
+ </view>
+ <view class="operation-zone">
+ <button :class="cantSplit ? 'btn-disabled' : 'btn-c'" @click="searchbarCodeInfoMeta"
+ :disabled="cantSplit">鎷嗙爜</button>
+ <button type="default" :class="cantGenerate ? 'btn-disabled' : 'btn-c'" @click="SaveBarCodeCreate"
+ :disabled="cantGenerate">鐢熸垚</button>
+ <button type="default" :class="cantPrint ? 'btn-disabled' : 'btn-c'" @click="PrintHBarCode"
+ :disabled="cantPrint">鎵撳嵃</button>
+ <button type="primary" @click="printerLabel">娴嬭瘯鎵撳嵃</button>
+ <button type="primary" @click="printTest">鍥炵焊璺濈</button>
+ </view>
+ </view>
+ <view class="divide"></view>
+ <view class="content">
+ <view class="barcode-detail" v-show="CommonUtils.isEmpty(Object.assign(barCodeInfo, {})) === false">
+ <view class="title">鏉＄爜淇℃伅</view>
+ <uni-card>
+ <view class="detail" style="display: none;">
+ <text>鏉＄爜ID锛�</text>{{barCodeInfo['HItemID'] || '0'}}
+ </view>
+ <view class="detail">
+ <text>鏉＄爜缂栧彿锛�</text>{{barCodeInfo['鏉＄爜缂栧彿'] || ''}}
+ </view>
+ <view class="detail">
+ <text>鏉＄爜鍘熸暟閲忥細</text>{{barCodeInfo['鏁伴噺'] || '0'}}
+ </view>
+ <view class="detail">
+ <text>鍓╀綑鏁伴噺锛�</text>{{barCodeInfo['鍓╀綑鏁伴噺'] || '0'}}
+ </view>
+ <view class="dWetail">
+ <text>鐗╂枡缂栫爜锛�</text>{{barCodeInfo['鐗╂枡浠ｇ爜'] || ''}}
+ </view>
+ <view class="detail">
+ <text>鐗╂枡鍚嶇О锛�</text>{{barCodeInfo['鐗╂枡鍚嶇О'] || ''}}
+ </view>
+ <view class="detail">
+ <text>瑙勬牸鍨嬪彿锛�</text>{{barCodeInfo['瑙勬牸鍨嬪彿'] || ''}}
+ </view>
+ <view class="detail">
+ <text>璁￠噺鍗曚綅锛�</text>{{barCodeInfo['璁￠噺鍗曚綅'] || ''}}
+ </view>
+ </uni-card>
+ </view>
+ <view class="divide"></view>
+ <view class="barcode-split" v-show="barCodeSplitInfo.length>0">
+ <view class="title">鏉＄爜鎷嗙爜</view>
+ <view class="barcode-split-list" v-for="(item,index) in barCodeSplitInfo" :key="index">
+ <uni-card @tap="ModityHQty(item)">
+ <view class="detail">
+ <text>鏉＄爜缂栧彿锛�</text>{{item['HBarCode'] || ''}}
+ </view>
+ <view class="detail split-num">
+ <text>鎷嗗垎鏁伴噺锛�</text>{{item['HSplitNum'] || '0'}}
+ </view>
+ <view class="detail">
+ <text>鐗╂枡浠ｇ爜锛�</text>{{item['HNumber'] || ''}}
+ </view>
+ <view class="detail">
+ <text>鐗╂枡鍚嶇О锛�</text>{{item['HName'] || ''}}
+ </view>
+ <view class="detail">
+ <text>瑙勬牸鍨嬪彿锛�</text>{{item['HModel'] || ''}}
+ </view>
+ <view class="detail">
+ <text>璁￠噺鍗曚綅锛�</text>{{barCodeInfo['璁￠噺鍗曚綅'] || ''}}
+ </view>
+ </uni-card>
+ </view>
+ </view>
+ </view>
+ <view class="over" v-if="barCodeSplitInfo.length == 0">鏆傛棤鏁版嵁</view>
+ <view class="over" v-if="barCodeSplitInfo.length != 0">宸插埌搴�</view>
+
+ </view>
+</template>
+
+<script>
+ const printer = uni.requireNativePlugin('LcPrinter');
+ const modal = uni.requireNativePlugin('modal');
+ var globalEvent = uni.requireNativePlugin('globalEvent');
+
+ // 鍦ㄥ叏灞�瀹氫箟涓�涓彉閲忔潵鏍囪瘑鏄惁宸茬粡鍒濆鍖�
+ var isPrinterInitialized = false;
+
+ import {
+ getUserInfo
+ } from "@/utils/auth.js";
+ import {
+ CommonUtils
+ } from "@/utils/common.js"
+ export default {
+ data() {
+ return {
+ CommonUtils,
+ userInfo: getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ barCodeInfoMeta: {
+ barCodeNo: "",
+ splitNum: "",
+ billMaker: getUserInfo().Czymc,
+ },
+ base64:"",
+ barCodeInfo: {//鍘熸潯鐮佷俊鎭�
+
+ },
+ barCodeSplitInfo: [],//鎷嗙爜淇℃伅
+ cantGenerate: true, // 鐢熸垚鎸夐挳鍒濆绂佺敤
+ cantPrint: true, // 鎵撳嵃鎸夐挳鍒濆绂佺敤
+ cantSplit: false, // 鎷嗙爜鎸夐挳鍒濆鍙敤
+ HBarCodeFocus: false,
+ isPrinting:false,
+ printInfo: "" //鎵撳嵃
+ };
+ },
+ methods: {
+
+ //鎵撳嵃鏈哄垵濮嬪寲
+ initPrinter() {
+ // 璋冪敤寮傛鏂规硶
+ console.log('鏂扮増鍒濆鍖�');
+ var ret = printer.initPrinter({});
+ modal.toast({
+ message: ret,
+ duration: 1.5
+ });
+ printer.printEnableMark({
+ enable: true
+ });
+ printer.setConcentration({ //璁剧疆鎵撳嵃娴撳害銆俧ont_level 鍙栧�艰寖鍥达細1~39銆�
+ level: 39
+ });
+ printer.setLineSpacing({
+ spacing: 1
+ });
+ //add by ljh
+ printer.setFontSize({
+ fontSize: 8
+ });
+ //add end
+ printer.getsupportprint();
+
+ },
+ printTest() {
+ printer.printEnableMark({enable: false});
+ console.log('娴嬭瘯鍥炵焊璺濈');
+ printer.printBarcode({
+ text: 1234567890123456789,
+ height: 80,
+ barcodeType: 73
+ });
+ printer.setFeedPaperSpace({ space: 1000});
+ printer.setUnwindPaperLen({ length: 60 });
+ printer.printLine({
+ line_length: 5
+ });
+
+ printer.printGoToNextMark();//鏍囩鎵撳嵃浣跨敤,寮�濮嬭蛋绾�
+ //printer.start();//鐑晱鎵撳嵃浣跨敤,寮�濮嬭蛋绾�
+ },
+ printerLabel(item) {
+ console.log('娴嬭瘯鎵撳嵃');
+ printer.setUnwindPaperLen({ length: 60 });
+ printer.setFontSize({
+ fontSize: 1
+ });
+ printer.printText2({
+ offset: 1,
+ fontSize: 2,
+ isBold: false,
+ isUnderLine: false,
+ content: '鍑哄簱鍗曞彿锛歁ATO00049684\r\n',
+ });
+
+ printer.printText2({
+ offset: 1,
+ fontSize: 2,
+ isBold: false,
+ isUnderLine: false,
+ content: '渚涘簲鍟嗗悕绉帮細鎱堟邯鐟炵泭鐢靛瓙鏈夐檺鍏徃\r\n'
+ });
+
+ printer.printText2({
+ offset: 1,
+ fontSize:2,
+ isBold: false,
+ isUnderLine: false,
+ content: '鐗╂枡浠ｇ爜锛歊.06.17.02.18002\r\n'
+ });
+ printer.printText2({
+ offset: 1,
+ fontSize: 2,
+ isBold: false,
+ isUnderLine: false,
+ content: '鐗╂枡绠�绉帮細12SH 鍑洪缃� 娉ㄥ鐏�011(鍚孏E鐏�)\r\n'
+ });
+ printer.printText2({
+ offset: 1,
+ fontSize:2,
+ isBold: false,
+ isUnderLine: false,
+ content: '鐗╂枡鍚嶇О锛�12SH 鍑洪缃� 娉ㄥ鐏�011(鍚孏E鐏�)\r\n'
+ });
+
+ printer.printText2({
+ offset: 1,
+ fontSize:2,
+ isBold: false,
+ isUnderLine: false,
+ content: '鏁伴噺锛�1\r\n'
+ });
+ printer.printText2({
+ offset: 1,
+ fontSize: 2,
+ isBold: false,
+ isUnderLine: false,
+ content: '宸ュ彿锛�1\r\n'
+ });
+ printer.printText2({
+ offset: 1,
+ fontSize: 2,
+ isBold: false,
+ isUnderLine: false,
+ content: '鐢熶骇鏃ユ湡锛�2025-8-13\r\n'
+ });
+ printer.printText2({
+ offset: 1,
+ fontSize: 2,
+ isBold: false,
+ isUnderLine: false,
+ content: '宸ュ彿锛�000001\r\n'
+ });
+ printer.printQR2({
+ text: 'title',
+ height: 100,
+ offset: 3
+ });
+
+ printer.printGoToNextMark();
+
+ console.log('娴嬭瘯鎵撳嵃QR缁撴潫');
+ },
+ doRequest(url, data, resFunction, errFunction, method) {
+ uni.showLoading({
+ title: '鍔犺浇涓�...'
+ })
+ uni.request({
+ method: method || "GET",
+ url: this.serverUrl + url,
+ data: data || "",
+ success: (res) => {
+ if (typeof resFunction === 'function') {
+ resFunction.call(this, res)
+ } else if (typeof errFunction === 'undefined') {
+ return
+ } else {
+ throw new TypeError("璁块棶鎴愬姛鍥炶皟鍑芥暟绫诲瀷寮傚父!")
+ }
+ },
+ fail: (err) => {
+ uni.showToast({
+ icon: "error",
+ title: "鎺ュ彛璁块棶寮傚父!",
+ duration: 2000
+ })
+ if (typeof errFunction === 'function') {
+ errFunction.call(this, err)
+ } else if (typeof errFunction === 'undefined') {
+ return
+ } else {
+ throw new TypeError("璁块棶澶辫触鍥炶皟鍑芥暟绫诲瀷寮傚父!")
+ }
+ }
+ })
+ uni.hideLoading()
+ },
+ //鍏夋爣
+ async refreshBarCodeState() {
+ this.HBarCodeFocus = false
+ await this.$nextTick(() => {
+ this.HBarCodeFocus = true
+ this.barCodeInfoMeta.barCodeNo = ""
+ })
+ },
+ //鎽勫儚澶磋皟鐢�
+ async searchbarCodeInfo() {
+ await this.$nextTick()
+ let urlEncode =
+ `/Gy_BarCodeBillList/page?sWhere= and 鏉＄爜缂栧彿=''${this.barCodeInfoMeta.barCodeNo}''&user=${getUserInfo()["Czymc"]}&page=1&size=1`
+ .toString()
+ if (CommonUtils.isEmpty(this.barCodeInfoMeta.barCodeNo) == true) {
+ return uni.showToast({
+ icon: "fail",
+ title: "鏉＄爜缂栧彿涓嶈兘涓虹┖!"
+ })
+ }
+ this.doRequest(
+ urlEncode, {},
+ (res) => {
+ console.log(res)
+ let res1 = res.data
+ let {
+ data,
+ count
+ } = res1
+ if (count > 0) {
+
+ this.barCodeInfo = data[0]
+ this.barCodeSplitInfo = []
+ // 鎵弿鏉＄爜鍚庨噸缃寜閽姸鎬�
+ this.resetButtonState();
+
+ }else{
+ CommonUtils.showTips({
+ message: "璇ユ潯鐮佷笉瀛樺湪锛�"+this.barCodeInfoMeta.barCodeNo,
+ })
+ this.barCodeInfoMeta.barCodeNo="";
+ }
+ },
+ (err) => {
+ console.err(err)
+ uni.showToast({
+ icon: "fail",
+ title: err
+ })
+ }
+ )
+ },
+ //鎷嗙爜鎸夐挳璋冪敤
+ async searchbarCodeInfoMeta() {
+ this.cantGenerate = true
+ this.cantPrint = true
+ this.cantSplit = false // 鎷嗙爜鍓嶇‘淇濇媶鐮佹寜閽彲鐢�
+ if (CommonUtils.isEmpty(this.barCodeInfoMeta.barCodeNo) === true) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鏉＄爜缂栧彿涓嶅緱涓虹┖!'
+ });
+ }
+ if (CommonUtils.isEmpty(this.barCodeInfoMeta.splitNum, true) === true) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鎷嗗垎鏁伴噺涓嶅緱涓虹┖!'
+ });
+ }
+ if (CommonUtils.isEmpty(this.barCodeInfoMeta.splitNum, true) === true) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鎷嗗垎鏁伴噺涓嶅緱涓虹┖!'
+ });
+ }
+ if (parseFloat(this.barCodeInfoMeta.splitNum) > parseFloat(this.barCodeInfo['鏁伴噺'])) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鎷嗗垎鏁伴噺涓嶈兘澶т簬鏉＄爜鍘熸暟閲�!'
+ });
+ }
+ this.doRequest(
+ "/Sc_BarCode/SplitBarCode_Sub", {
+ HBarCodeNo: this.barCodeInfoMeta.barCodeNo,
+ },
+ (res) => {
+ this.barCodeSplitInfo = []
+ if (res.data.count > 0) {
+
+ if (res.data.data.length < 1) {
+ return uni.showToast({
+ icon: 'none',
+ title: Message
+ });
+ }
+
+ //鎷嗗垎鏉＄爜锛氭暟閲忎负 splitNum
+ let barCodeItem1 = JSON.parse(JSON.stringify(res.data.data.SubBarCodes[0]));
+ let HSplitNum = this.barCodeInfoMeta.splitNum;
+ this.barCodeSplitInfo.push({
+ HSplitNum: this.barCodeInfoMeta.splitNum,
+ HBarCode: res.data.data.NextBarCode,
+ HNumber: barCodeItem1.HNumber,
+ HName: barCodeItem1.HName,
+ HModel: barCodeItem1.HModel
+ });
+
+ //鏇存柊鍘熷厛鏉＄爜鏁伴噺
+ this.barCodeInfo['鍓╀綑鏁伴噺'] = this.barCodeInfo['鏁伴噺'] - this.barCodeInfoMeta.splitNum;
+
+ // 鎷嗙爜鎴愬姛锛岀鐢ㄦ媶鐮佹寜閽紝鏀惧紑鐢熸垚鎸夐挳
+ this.cantSplit = true;
+ this.cantGenerate = false;
+ this.cantPrint = true;
+ //鐢熸垚
+ this.SaveBarCodeCreate();
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: '娌℃湁鎵惧埌瀵瑰簲鐨勫崟鎹�'
+ });
+ }
+ },
+ (err) => {
+ CommonUtils.showTips({
+ message: "鏉＄爜鎷嗙爜鍑虹幇閿欒"+err,
+ })
+ console.error(err)
+ }
+ )
+ },
+ //淇濆瓨鏂规硶
+ SaveBarCodeCreate() {
+ // 鏍￠獙鎷嗙爜鏁伴噺
+ let sum = this.barCodeSplitInfo.reduce((acc, obj) => {
+ return acc + obj["HSplitNum"]
+ }, 0)
+
+ if (sum > this.barCodeInfo["HQty"]) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鎷嗙爜鏁伴噺鍜屼笉寰楀ぇ浜庢潯鐮佹暟閲�'
+ });
+ }
+ let msg =
+ `${this.barCodeInfoMeta["barCodeNo"]};${this.barCodeInfoMeta["splitNum"]};${JSON.stringify(this.barCodeSplitInfo)};${this.billMaker}`
+ this.doRequest(
+ "/Sc_BarCode/SplitBarCode_Save", {
+ msg: msg
+ },
+ (res) => {
+ if (res.data.code == 1) {
+ // 鐢熸垚鎴愬姛锛岀鐢ㄧ敓鎴愭寜閽紝鏀惧紑鎵撳嵃鎸夐挳
+ this.cantGenerate = true;
+ this.cantPrint = false;
+ this.cantSplit = true;
+ this.barCodeInfoMeta.barCodeNo="";//娓呯┖杈撳叆妗�
+ uni.showToast({
+ title: '鐢熸垚鎴愬姛!'
+ });
+ } else {
+ this.cantGenerate = false;
+ uni.showToast({
+ title: res.data.Message
+ });
+ }
+
+ },
+ (err) => {
+ console.log(err)
+ CommonUtils.showTips({
+ message: "鏉＄爜鐢熸垚鍑虹幇閿欒"+err,
+ })
+
+ },
+ "POST"
+ )
+
+ },
+ //鎵撳嵃鎸夐挳
+ // 鐖剁粍浠朵腑鐨勬墦鍗版柟娉�
+ async PrintHBarCode() {
+ // 闃叉閲嶅鐐瑰嚮
+ if (this.isPrinting) {
+ uni.showToast({
+ title: '鎵撳嵃涓紝璇风◢鍊�...',
+ icon: 'none'
+ });
+ return;
+ }
+
+ this.isPrinting = true;
+
+ try {
+ let HBarCodeNoStr = `${this.barCodeSplitInfo[0]['HBarCode']}`;
+ console.log('鑾峰彇鏁版嵁', HBarCodeNoStr);
+
+ // 鏄剧ず鎵撳嵃涓姸鎬�
+ uni.showLoading({
+ title: '鎵撳嵃涓�...',
+ mask: true
+ });
+
+ // 鑾峰彇鎵撳嵃鏁版嵁
+ const printData = await new Promise((resolve, reject) => {
+ uni.request({
+ url: this.serverUrl + '/Sc_BarCode/GetSplitBarCode_SubList',
+ data: {
+ HBarCodeNo: HBarCodeNoStr
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ resolve(res.data.data[0]);
+ } else {
+ reject(new Error(res.data.Message || '鏈壘鍒版墦鍗版暟鎹�'));
+ }
+ },
+ fail: (err) => {
+ reject(new Error('鎺ュ彛璇锋眰澶辫触'));
+ }
+ });
+ });
+
+ const item = printData;
+
+ // 绛夊緟鎵撳嵃缁勪欢鏇存柊
+ await this.$nextTick();
+
+
+ // 鎵撳嵃鎴愬姛鍚庨噸缃姸鎬�
+ uni.hideLoading();
+ //this.printerLabel();//鎵撳嵃
+ } catch (error) {
+ console.error('鎵撳嵃澶辫触:', error);
+ uni.hideLoading();
+ this.isPrinting = false;
+
+ uni.showToast({
+ title: error.message || '鎵撳嵃澶辫触',
+ icon: 'error',
+ duration: 2000
+ });
+ CommonUtils.playSound(0);
+ }
+ },
+ toScanCode() {
+ var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+ mpaasScanModule.mpaasScan({
+ 'hideAlbum': true,
+ 'timeoutInterval': '10', //瓒呮椂鏃堕棿
+ 'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ }, (ret) => {
+ console.log(ret.resp_result)
+ if (this.CommonUtils.isEmpty(ret.resp_result) === false) {
+ console.log('鏉＄爜鍐呭锛�' + ret.resp_result);
+ this.barCodeInfoMeta.barCodeNo = ret.resp_result
+
+ this.searchbarCodeInfo()
+ }
+ })
+ },
+ // 閲嶇疆鎸夐挳鐘舵�佹柟娉�
+ resetButtonState() {
+ this.cantSplit = false; // 鎷嗙爜鎸夐挳鍙敤
+ this.cantGenerate = true; // 鐢熸垚鎸夐挳绂佺敤
+ this.cantPrint = true; // 鎵撳嵃鎸夐挳绂佺敤
+ }
+ },
+ onLoad() {
+ this.HBarCodeFocus = true;
+ // 椤甸潰鍒濆鍖栨椂璁剧疆鎸夐挳鐘舵��
+ this.resetButtonState();
+ // 娣诲姞鎵撳嵃鐘舵�佺洃鍚�
+ if(!isPrinterInitialized){
+ globalEvent.addEventListener('onPrintCallback', function(e) {
+ uni.showToast({
+ title: 'state: ' + JSON.stringify(e),
+ duration: 2000
+ });
+ if (e.key == 0) {
+ uni.showToast({
+ title: '鎵撳嵃鎴愬姛',
+ duration: 2000
+ });
+ //鎴愬姛鍚庤缃姸鎬�
+ this.isPrinting = false;
+ //this.resetButtonState();
+ } else if (e.key == 3) {
+ this.isPrinting = false;
+ uni.showToast({
+ title: '缂虹焊',
+ duration: 2000
+ });
+ }
+ });
+ globalEvent.addEventListener('getsupportprint', function(e) {
+ console.log('key: ' + JSON.stringify(e));
+ uni.showToast({
+ title: 'key: ' + JSON.stringify(e),
+ duration: 2000
+ });
+ });
+ }
+ //鍒濆鍖栨墦鍗�
+ this.initPrinter();
+
+ },
+ onReady() {
+
+ }
+ }
+</script>
+
+<style lang="scss">
+ * {
+ box-sizing: border-box;
+ }
+
+ input {
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ line-height: 30rpx;
+ }
+
+ button {
+ padding: 0;
+ width: 150rpx;
+ font-size: 25rpx;
+ }
+
+ .uni-card {
+ margin: 0 !important;
+ }
+
+ .container {
+ .header {
+ padding: 20rpx 10rpx;
+ display: flex;
+ flex-direction: column;
+ gap: 20rpx;
+
+ .item {
+ display: flex;
+ flex-direction: row;
+ padding: 0 10rpx;
+ gap: 20rpx;
+ font-size: 30rpx;
+ // height: 1.5rem;
+ // justify-content: center;
+ align-items: center;
+
+ .left {
+ text-align: right;
+ width: 5rem;
+ }
+
+ .right {
+ flex: 1;
+ height: 100%;
+ padding: 6rpx 0;
+ border-radius: 22rpx;
+ border: 1px solid #e4e4e4;
+ //background-color: #e4e4e4;
+
+ >input {
+ height: auto;
+ }
+ }
+ }
+
+ .operation-zone {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-evenly;
+
+ .btn-c {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+ }
+ }
+
+ .divide {
+ width: 100%;
+ height: 16rpx;
+ background-color: #e5e5e5;
+ }
+
+ .content {
+ flex: 1;
+
+ .barcode-detail,
+ .barcode-split {
+ padding: 30rpx;
+ display: flex;
+ flex-direction: column;
+ gap: 30rpx;
+ }
+ }
+ }
+</style>
\ No newline at end of file
--
Gitblit v1.9.1