From ddcd1fc431bcf4a3289a47b8dab6403564797461 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 24 十二月 2025 09:01:39 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
utils/common.js | 31
pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue | 2269 ++++++++++++++++++++++++++--------------------------
manifest.json | 4
pages.json | 10
pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList.vue | 5
pages/index/tab2.vue | 4
pages/index/vers.vue | 31
pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue | 0
pages/zhijiediaobo/MoveStockBill.vue | 182 ++--
pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue | 10
10 files changed, 1,322 insertions(+), 1,224 deletions(-)
diff --git a/manifest.json b/manifest.json
index 9454edb..03fa14c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "2.0.37",
- "versionCode" : 237,
+ "versionName" : "2.0.39",
+ "versionCode" : 239,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index 7e8f5a2..13fad90 100644
--- a/pages.json
+++ b/pages.json
@@ -1040,7 +1040,7 @@
}
},
{
- "path": "pages/MJGL/mujulingliaotuikudan/table",
+ "path": "pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
"style": {
"navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟",
"enablePullDownRefresh": true
@@ -1121,13 +1121,19 @@
}
},
{
- "path": "pages/MJGL/mujulingliaotuikudan/table",
+ "path": "pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
"style": {
"navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟",
"enablePullDownRefresh": true
}
},
{
+ "path": "pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill",
+ "style": {
+ "navigationBarTitleText": "妯″叿棰嗘枡閫�搴撳崟"
+ }
+ },
+ {
"path": "pages/MJGL/qijudiaobodan/Sc_MouldMoveStockBillList",
"style": {
"navigationBarTitleText": "妯″叿璋冩嫧鍗�",
diff --git a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
index 4ad6601..7350eae 100644
--- a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
+++ b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
@@ -1,1097 +1,1126 @@
<template>
- <view>
- <view class="form">
- <view class="form-item">
- <view class="title">鏉＄爜</view>
- <view class="right" style="width: 350rpx;">
- <input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" @confirm="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">
- <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" v-show="showHSourceBillNo">
- <uni-combox :candidates="['渚涘簲鍟�','瀹㈡埛','閮ㄩ棬']" placeholder="璇烽�夋嫨绫诲瀷" v-model="hform.TypeName"
- @input="HSelectTypeChange"></uni-combox>
- </view>
- <view class="right" v-show="!showHSourceBillNo">
- <input name="TypeName" disabled v-model="hform.TypeName" placeholder="" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">寰�鏉ュ崟浣�:</view>
- <view class="right" v-show="showHSourceBillNo">
- <uni-combox :candidates="arrayHSelectType" placeholder="璇烽�夋嫨" v-model="hform.HSupName"
- @input="" ></uni-combox>
- </view>
- <view class="right" v-show="!showHSourceBillNo">
- <input name="HSupName" disabled v-model="hform.HSupName" placeholder="" />
- </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"
- @change="HMainSourceBillTypeChange">
- <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" @confirm="onSourceBillBlurHandler" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
-
- </view>
- <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
- <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
- </view>
-
- <view class="righton" v-show="!showHSourceBillNo">
- <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
- </view>
- <!-- <view class="right" v-show="showHSourceBillNo">
- <uni-combox ref="uniComboxSourceBill" :isFocus="HSourceBillNoFocus"
- :confirm-call="onSourceBillBlurHandler" v-if="reHSourceBillNo"
- :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" v-model="hform.HSourceBillNo"
- @input="HSourceBillNoChange"></uni-combox>
- </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-c" size="mini" @tap="goBack">閫�鍑�</button>
- <button v-if="btnType == 1 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
- <!-- <button v-if="btnType != 1 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">淇敼</button> -->
- <button v-if="btnType != 1 " class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
- </view>
- </view>
- <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
- :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
- </view>
+ <view>
+ <view class="form">
+ <view class="form-item">
+ <view class="title">鏉＄爜</view>
+ <view class="right" style="width: 350rpx;">
+ <input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" @confirm="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">
+ <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" v-show="showHSourceBillNo">
+ <uni-combox :candidates="['渚涘簲鍟�','瀹㈡埛','閮ㄩ棬']" placeholder="璇烽�夋嫨绫诲瀷" v-model="hform.TypeName"
+ @input="HSelectTypeChange"></uni-combox>
+ </view>
+ <view class="right" v-show="!showHSourceBillNo">
+ <input name="TypeName" disabled v-model="hform.TypeName" placeholder="" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">寰�鏉ュ崟浣�:</view>
+ <view class="right" v-show="showHSourceBillNo">
+ <uni-combox :candidates="arrayHSelectType" placeholder="璇烽�夋嫨" v-model="hform.HSupName"
+ @input="HSupNameChange" ></uni-combox>
+ </view>
+ <view class="right" v-show="!showHSourceBillNo">
+ <input name="HSupName" disabled v-model="hform.HSupName" placeholder="" />
+ </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"
+ @change="HMainSourceBillTypeChange">
+ <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" @confirm="onSourceBillBlurHandler" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+
+ </view>
+ <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+ <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+ </view>
+
+ <view class="righton" v-show="!showHSourceBillNo">
+ <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ </view>
+ <!-- <view class="right" v-show="showHSourceBillNo">
+ <uni-combox ref="uniComboxSourceBill" :isFocus="HSourceBillNoFocus"
+ :confirm-call="onSourceBillBlurHandler" v-if="reHSourceBillNo"
+ :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" v-model="hform.HSourceBillNo"
+ @input="HSourceBillNoChange"></uni-combox>
+ </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-c" size="mini" @tap="goBack">閫�鍑�</button>
+ <button v-if="btnType == 1 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <!-- <button v-if="btnType != 1 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">淇敼</button> -->
+ <button v-if="btnType != 1 " class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ </view>
+ </view>
+ <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
+ :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
+ </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';
- export default {
- data() {
- return {
- HSourceBillNoFocus: false,
- barCodeFocus: true,//鏉＄爜鍏夋爣
- userInfo: getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
- tabs: 0,
- btnType:1,//1鏂板锛�3淇敼
- linterid:'',
- 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_3802') ? uni.getStorageSync('billTypeName_3802'):'棰嗙敤鐢宠鍗�',
- arrayHMainSourceBillType: ['棰嗙敤鐢宠鍗�', '鎵嬪伐褰曞叆'],
- arrayHMainSourceBillValue: ['3849', '-1'],
-
- hform: {
- HBarCode: '',
- HInterID: '',
- HBillType: 3802,
- HWHName: getUserInfo().HWHName,
- HWHID: getUserInfo().HWhID,
- HStockPlaceName: getUserInfo().HSPName,
- HStockPlaceID: getUserInfo().HSPID,
- HKeeperName: getUserInfo().User,
- HKeeperID: getUserInfo().User,//鍙戞枡浜�
- HSecManagerName: getUserInfo().HEmpName,
- HSecManagerID: getUserInfo().HEmpID,//棰嗘枡浜�
- HDeptName: getUserInfo().HDept,
- HDeptID: getUserInfo().HDeptID,
- //婧愬崟淇℃伅
- HMainSourceBillType: uni.getStorageSync('billType_3802') ? uni.getStorageSync('billType_3802'):3849,
- HSourceBillNo: '', //CGDD000200
- //寰�鏉ョ被鍨�
- TypeName:uni.getStorageSync('typeName_3802'),
- HSupName: '', // 寰�鏉ュ崟浣嶉�変腑鐨勫��
- HSupID: '' ,// 寰�鏉ュ崟浣嶅搴旂殑ID
- HSupTypeID:uni.getStorageSync('typeID_3802')?uni.getStorageSync('typeID_3802'):0,
- HDate: getDateTime.dateTimeStr('y-m-d'),
- HMaker: uni.getStorageSync('HUserName'),
-
- HRedBlueFlag:'false',
- HStockOrgName: uni.getStorageSync('Organization'),
- HStockOrgID: uni.getStorageSync('OrganizationID'),
- HStockOutOrgID:uni.getStorageSync('OrganizationID'),
- HBarCode_B:'',
- HMouldName_B:'',
- HMouldID_B:'',
- HMouldCount_B:'',
- }
- }
- },
- components: {
- BillListPopupVue
- },
- methods: {
-
- //鎵爜
- 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.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'
- })
- }
- })
- },
- async 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 = this.hform.HSourceBillNo
- var sSourceBillType =this.hform.HMainSourceBillType
- if(sSourceBillType != -1&&sSourceBillNo==""){
-
- uni.showToast({
- title: "璇峰厛閫夋嫨婧愬崟",
- icon: 'none'
- })
- return
- }
- if (HDeleteFlag == '*') {
- if (sBarCode == "") {
- uni.showToast({
- title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
- icon: 'none'
- });
- } else {
- try {
- let res = await CommonUtils.doRequest2Sync({
- url: '/MouldController/set_DelMouldStockBillMain_Temp_Json',
- data: {
- HInterID: this.hform.HInterID,
- HBillType: this.hform.HBillType,
- HBarCode: sBarCode
- },
- })
-
- if (!res) {
- return
- }
-
- console.log('鍒犻櫎鏉＄爜', res.data);
- this.hform.HBarCode = '';
- if (res.data.count == 1) {
- this.hform.HQty = ''
- } else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- }
-
-
- } catch (err) {
- console.log(res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- }
- }
- }else
- {
- var sBarCode = this.hform.HBarCode
- try {
- let res = await CommonUtils.doRequest2Sync({
- url: '/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,
- },
- })
-
- if (!res) {
- return
- }
-
- console.log('妫�鏌ユ壂鐮佽繑鍥炵殑鏁版嵁', res.data);
- this.hform.HBarCode=''
- if(res.data.count==1){
- this.tabs = 1
- this.DisBillEntryList()
- this.showHMainSourceBillType = false
- this.showHSourceBillNo = false
- }
- else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- }
-
-
- } catch (err) {
- 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.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"]
- }
- } else {
- uni.showToast({
- title: '浠撲綅鏁版嵁璇锋眰澶辫触',
- icon: 'none'
- })
- }
- },
- )
- },
- /* #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'
- })
- },
- });
- },
- 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'
- })
- }
- }
- )
- },
- 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].閮ㄩ棬鍚嶇О
- }
- }
- },
- 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_3802",e);
- if(e=='閮ㄩ棬')
- {
- this.hform.HSupTypeID=3;
- uni.setStorageSync("typeID_3802",3);
- this.arrayHSelectType = this.arrayHDeptName;
- this.HSelectTypeList = this.HDeptNameList;
- }
- else if(e === '渚涘簲鍟�') {
- this.hform.HSupTypeID=1;
- uni.setStorageSync("typeID_3802",1);
- this.arrayHSelectType = this.arrayHSupplierName;
- this.HSelectTypeList = this.HSuplierList;
- } else if(e === '瀹㈡埛') {
- // 瀹㈡埛鏁版嵁 - 杩欓噷鐣欑┖锛屽悗缁坊鍔犺幏鍙栧鎴锋暟鎹殑閫昏緫
- this.hform.HSupTypeID=2;
- uni.setStorageSync("typeID_3802",2);
- this.arrayHSelectType =this.arrayHCusName;
- this.HSelectTypeList = this.HCusNameList;
- } else {
- uni.setStorageSync("typeID_3802",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('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- }
- }
- });
- },
- ifEdit(){
- this.isEdit = true
- this.hform.eventType = 'Modify'
- },
- //缂栬緫鍥炴樉
- getEditData(linterid,HBillNo){
- //涓昏〃
- var sWhere = " and hmainid='" + linterid + "'";
- uni.request({
- url: this.serverUrl + '/Sc_MouldProdOutBill/list_byPage',
- data: { sWhere: this.sWhere,
- user: uni.getStorageSync('HUserName'),
- Organization: uni.getStorageSync('Organization'),
- page:1,
- size:100 },
- success: (res) => {
- console.log(1,res.data.data[0]);
- if(res.data.code == 1){
- var data = res.data.data[0]
- this.btnType=3
- this.hform.HInterID= data.hmainid
- this.hform.HBillNo= data.鍗曟嵁鍙�
- // this.hform.HBarCode= data.鏉″舰鐮� 瑙嗗浘涓病鏈夎瀛楁
- this.hform.HDeptID= data.HDeptID
- this.hform.HDeptName= data.閮ㄩ棬
- this.hform.HSecManagerName= data.棰嗘枡浜�
- this.hform.HSecManagerID= data.hsecmanagerid
- this.hform.HKeeperID= data.hkeeperid
- this.hform.HKeeperName= data.鍙戞枡浜�
- // this.hform.HRemark= data.琛ㄥご澶囨敞
- this.hform.HDate = data.鏃ユ湡.substr(0,10)
-
- this.hform.HWHID=data.HWHID,
- this.hform.HWHName=data.浠撳簱,
- this.hform.HStockPlaceID=data.HSPID,
- this.hform.HStockPlaceName=data.浠撲綅,
-
- this.hform.HSupName=data.寰�鏉ュ崟浣�,
- this.hform.HSupID=data.HSupID,
- this.hform.TypeName=data.寰�鏉ョ被鍨嬪悕绉�,
- this.hform.HSupTypeID=data.寰�鏉ョ被鍨�,
-
- this.hform.HMouldID_B=data.hmaterid,
- // this.hform.HMouldID_B=data.妯″叿浠ｇ爜,
- this.hform.HMouldName_B=data.妯″叿鍚嶇О,
- // this.hform.HMouldModel=data.妯″叿瑙勬牸,
- this.hform.HMouldCount_B=1,
- this.hform.HRedBlueFlag=data.绾㈣摑鍗曟爣璁�=='钃濆瓧'?false:true,
-
-
- this.hform.HStockOrgID=data.HStockOrgID,
- this.hform.HStockOrgName=data.搴撳瓨缁勭粐,
- // this.hform.HICMOEntryID=data.HICMOEntryID,
- // this.hform.HProcExchBillNo=data.HProcExchBillNo,
- // this.hform.HProcExchInterID=data.HProcExchInterID,
- // this.hform.HProcExchEntryID=data.HProcExchEntryID,
- // this.hform.HOrgID=data.HOrgID,
-
- this.hform.HMaker= data.鍒跺崟浜�
- //this.hform.HMakeDate= data.鍒跺崟鏃ユ湡
- //this.hform.HUpDater= data.淇敼浜�
- //this.hform.HUpDateDate= data.淇敼鏃ユ湡
- // this.hform.HChecker= data.瀹℃牳浜�
- // this.hform.HCheckDate= data.瀹℃牳鏃ユ湡
- // this.hform.HDeleteMan= data.浣滃簾浜�
- // this.hform.HDeleteDate= data.浣滃簾鏃ユ湡
- }else{
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- },
- async submit() {
- //浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
- if (!this.hform.HWHName) {
- this.hform.HWHID = 0
- }
- if (!this.hform.HStockPlaceName) {
- this.hform.HStockPlaceID = 0
- }
- if (!this.hform.HKeeperName) {
- this.hform.HKeeperID = 0
- }
-
- if (!this.hform.HSecManagerName) {
- this.hform.HSecManagerID = 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)
- try {
- let res = await CommonUtils.doRequest2Sync({
- url: '/MouldController/set_SaveMouldProdOutBill_Json',
- method: 'POST',
- data: {
- oMain: sMainStr
- },
- })
-
- if (!res) {
- return
- }
-
- 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/caigouruku/POStockInBill?OperationType=1'
- })
- } 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()
- }
- })
- }
- } catch (err) {
- console.warn(err);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触:' + err,
- icon: 'none'
- })
- }
- }
- }
- },
- showBillList() {
- this.$refs.billList.showPopup()
- },
- //閫夋嫨婧愬崟绫诲瀷
- HMainSourceBillTypeChange(e) {
- this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
-
- let index = this.arrayHMainSourceBillType.findIndex(e => e == this.HMainSourceBillType)
- if (index != -1) {
- this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[index]
- // this.getHYDList()
- }
- console.log(this.hform.HMainSourceBillType)
- uni.setStorageSync("billType_3802",this.hform.HMainSourceBillType);
- uni.setStorageSync("billTypeName_3802",this.HMainSourceBillType);
- },
- //閫変腑婧愬崟
- getHBarCodeData(HBarCode) {
- uni.request({
- url: this.serverUrl + '/MouldController/Get_SourceBarCode_ProdOut_Json',
- data: {
- HInterID: this.hform.HInterID,
- HBillNo: this.hform.HBillNo,
- HBillType: this.hform.HBillType,
- HSourceBillNo: HBarCode,
- HSourceBillType: this.hform.HMainSourceBillType,
- HMaker: this.hform.HMaker,
- HStockOrgID: this.hform.HStockOrgID
- },
- success: (res) => {
- if (res.data.count == 1) {
- var data = res.data.data[0]
- console.log(2, data);
-
- this.hform.HSourceBillNo = data.HSourceBillNo
- this.showHMainSourceBillType = false
- //榛樿闈炲婧愬崟
- this.showHSourceBillNo = false
- //璁剧疆寰�鏉ュ崟浣�
- this.hform.HSupTypeID = data.HCorrespondentTypeID
- this.hform.HSupID = data.HCorrespondentID
- this.hform.HSupName = data.HCorrespondentName
- if(data.HCorrespondentTypeID==1){
- this.hform.TypeName = "渚涘簲鍟�"
- }else if(data.HCorrespondentTypeID==2){
- this.hform.TypeName = "閮ㄩ棬"
- }else{
- this.hform.TypeName = "瀹㈡埛"
- }
-
-
- this.tabs = 1
- CommonUtils.playSound(1)
- //鍏夋爣瀵瑰噯鏉＄爜
- this.refreshBarCodeState()
- this.DisBillEntryList()
- } else {
- console.log('res.data.Message: ', res.data.Message);
- CommonUtils.playSound(0)
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- }
- },
- fail: (res) => {
- CommonUtils.playSound(0)
- console.log(res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- },
- });
- },
- async refreshBarCodeState() {
- this.barCodeFocus = false
- await this.$nextTick(() => {
- this.barCodeFocus = true
- this.hform.HBarCode = ""
- })
- },
- delMater(item) {
- if (event && event.target.classList && event.target.classList.contains('link-text')) {
- return; // 濡傛灉鏄摼鎺ョ偣鍑伙紝涓嶆墽琛屽垹闄�
- }
-
- uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕佸垹闄� "' + item.鐗╂枡鍚嶇О + '" 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
- success: (res) => {
- if (res.confirm) {
- uni.request({
- url: this.serverUrl +
- '/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json',
- data: {
- HInterID: this.hform.HInterID,
- HMaterID: item.HMaterID,
- HAuxPropID: item.HAuxPropID,
- HMTONo: item.HMTONo,
- HSourceInterID: item.HSourceInterID,
- HSourceEntryID: item.HSourceEntryID,
- HBillType: this.hform.HBillType
- },
- success: (res) => {
- if (res.data.count == 1) {
- this.DisBillEntryList()
- } else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- }
- });
- }
- }
- });
- },
- delMater(item) {
- uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕佸垹闄� "' + item.鍣ㄥ叿鍙� + '" 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
- success: (res) => {
- if (res.confirm) {
- uni.request({
- url: this.serverUrl +
- '/MouldController/set_DelMouldStockBillMain_Temp_Json',
- data: {
- HInterID: this.hform.HInterID,
- HBarCode: item.HBarCode,
- HBillType: this.hform.HBillType
- },
- success: (res) => {
- if (res.data.count == 1) {
- this.DisBillEntryList()
- } else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- }
- });
- }
- }
- });
- },
- onLoad(e) {
- console.log(e, this.userInfo)
- console.log(getUserInfo().HEmpName)
- if(e.linterid){
- this.btnType = 3
- this.linterid = e.linterid
- this.HBillNo = e.HBillNo
- this.getEditData(e.linterid, e.HBillNo)
- }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 === '瀹㈡埛') {
-
- }
-
- }, 300);
- uni.$on('BillSelectComplete', (e) => {
- console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
- this.getHBarCodeData(e.HBillNo)
- this.$refs.billList.exit()
- })
- //this.getHEmpList()
- },
- //閲嶈閫夋嫨婧愬崟蹇呴』娣诲姞杩欎釜鍚﹀垯鍑虹幇涓ラ噸bug
- onUnload() {
- uni.$off('BillSelectComplete')
- },
- }
- }
+ import getDateTime from '@/utils/getdateTime.js';
+ import {
+ getUserInfo
+ } from "@/utils/auth.js";
+ import { CommonUtils } from '@/utils/common';
+ import BillListPopupVue from '../../../components/BillListPopup/BillListPopup.vue';
+ export default {
+ data() {
+ return {
+ HSourceBillNoFocus: false,
+ barCodeFocus: true,//鏉＄爜鍏夋爣
+ userInfo: getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ tabs: 0,
+ btnType:1,//1鏂板锛�3淇敼
+ linterid:'',
+ 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_3802') ? uni.getStorageSync('billTypeName_3802'):'棰嗙敤鐢宠鍗�',
+ arrayHMainSourceBillType: ['棰嗙敤鐢宠鍗�', '鎵嬪伐褰曞叆'],
+ arrayHMainSourceBillValue: ['3849', '-1'],
+
+ hform: {
+ HBarCode: '',
+ HInterID: '',
+ HBillType: 3802,
+ HWHName: getUserInfo().HWHName,
+ HWHID: getUserInfo().HWhID,
+ HStockPlaceName: getUserInfo().HSPName,
+ HStockPlaceID: getUserInfo().HSPID,
+ HKeeperName: getUserInfo().User,
+ HKeeperID: getUserInfo().User,//鍙戞枡浜�
+ HSecManagerName: getUserInfo().HEmpName,
+ HSecManagerID: getUserInfo().HEmpID,//棰嗘枡浜�
+ HDeptName: getUserInfo().HDept,
+ HDeptID: getUserInfo().HDeptID,
+ //婧愬崟淇℃伅
+ HMainSourceBillType: uni.getStorageSync('billType_3802') ? uni.getStorageSync('billType_3802'):3849,
+ HSourceBillNo: '', //CGDD000200
+ //寰�鏉ョ被鍨�
+ TypeName:uni.getStorageSync('typeName_3802'),
+ HSupName: '', // 寰�鏉ュ崟浣嶉�変腑鐨勫��
+ HSupID: '' ,// 寰�鏉ュ崟浣嶅搴旂殑ID
+ HSupTypeID:uni.getStorageSync('typeID_3802')?uni.getStorageSync('typeID_3802'):0,
+ HDate: getDateTime.dateTimeStr('y-m-d'),
+ HMaker: uni.getStorageSync('HUserName'),
+
+ HRedBlueFlag:'false',
+ HStockOrgName: uni.getStorageSync('Organization'),
+ HStockOrgID: uni.getStorageSync('OrganizationID'),
+ HStockOutOrgID:uni.getStorageSync('OrganizationID'),
+ HBarCode_B:'',
+ HMouldName_B:'',
+ HMouldID_B:'',
+ HMouldCount_B:'',
+ }
+ }
+ },
+ components: {
+ BillListPopupVue
+ },
+ methods: {
+ HSupNameChange(e) {
+ let index = this.arrayHSelectType.findIndex(el => el == e)
+ let HSupInfo = this.HSelectTypeList[index]
+ console.log('HSupInfo: ',HSupInfo);
+
+ this.hform.HSupID = HSupInfo.HItemID
+ this.hform.HSupName = HSupInfo['閮ㄩ棬鍚嶇О'] || 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 = 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.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'
+ })
+ }
+ })
+ },
+ async 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 = this.hform.HSourceBillNo
+ var sSourceBillType =this.hform.HMainSourceBillType
+ if(sSourceBillType != -1&&sSourceBillNo==""){
+
+ uni.showToast({
+ title: "璇峰厛閫夋嫨婧愬崟",
+ icon: 'none'
+ })
+ return
+ }
+ if (HDeleteFlag == '*') {
+ if (sBarCode == "") {
+ uni.showToast({
+ title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
+ icon: 'none'
+ });
+ } else {
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: '/MouldController/set_DelMouldStockBillMain_Temp_Json',
+ data: {
+ HInterID: this.hform.HInterID,
+ HBillType: this.hform.HBillType,
+ HBarCode: sBarCode
+ },
+ })
+
+ if (!res) {
+ return
+ }
+
+ console.log('鍒犻櫎鏉＄爜', res.data);
+ this.hform.HBarCode = '';
+ if (res.data.count == 1) {
+ this.hform.HQty = ''
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+
+
+ } catch (err) {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ }
+ }else
+ {
+ var sBarCode = this.hform.HBarCode
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: '/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,
+ },
+ })
+
+ if (!res) {
+ return
+ }
+
+ console.log('妫�鏌ユ壂鐮佽繑鍥炵殑鏁版嵁', res.data);
+ this.hform.HBarCode=''
+ if(res.data.count==1){
+ this.tabs = 1
+ this.DisBillEntryList()
+ this.showHMainSourceBillType = false
+ this.showHSourceBillNo = false
+ }
+ else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+
+
+ } catch (err) {
+ 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.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"]
+ }
+ } else {
+ uni.showToast({
+ title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ )
+ },
+ /* #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'
+ })
+ },
+ });
+ },
+ 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'
+ })
+ }
+ }
+ )
+ },
+ 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].閮ㄩ棬鍚嶇О
+ }
+ }
+ },
+ 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_3802",e);
+ if(e=='閮ㄩ棬')
+ {
+ this.hform.HSupTypeID=3;
+ uni.setStorageSync("typeID_3802",3);
+ this.arrayHSelectType = this.arrayHDeptName;
+ this.HSelectTypeList = this.HDeptNameList;
+ }
+ else if(e === '渚涘簲鍟�') {
+ this.hform.HSupTypeID=1;
+ uni.setStorageSync("typeID_3802",1);
+ this.arrayHSelectType = this.arrayHSupplierName;
+ this.HSelectTypeList = this.HSuplierList;
+ } else if(e === '瀹㈡埛') {
+ // 瀹㈡埛鏁版嵁 - 杩欓噷鐣欑┖锛屽悗缁坊鍔犺幏鍙栧鎴锋暟鎹殑閫昏緫
+ this.hform.HSupTypeID=2;
+ uni.setStorageSync("typeID_3802",2);
+ this.arrayHSelectType =this.arrayHCusName;
+ this.HSelectTypeList = this.HCusNameList;
+ } else {
+ uni.setStorageSync("typeID_3802",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('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
+ });
+ },
+ ifEdit(){
+ this.isEdit = true
+ this.hform.eventType = 'Modify'
+ },
+ //缂栬緫鍥炴樉
+ getEditData(linterid,HBillNo){
+ //涓昏〃
+ var sWhere = " and hmainid='" + linterid + "'";
+ uni.request({
+ url: this.serverUrl + '/Sc_MouldProdOutBill/list_byPage',
+ data: { sWhere: this.sWhere,
+ user: uni.getStorageSync('HUserName'),
+ Organization: uni.getStorageSync('Organization'),
+ page:1,
+ size:100 },
+ success: (res) => {
+ console.log(1,res.data.data[0]);
+ if(res.data.code == 1){
+ var data = res.data.data[0]
+ this.btnType=3
+ this.hform.HInterID= data.hmainid
+ this.hform.HBillNo= data.鍗曟嵁鍙�
+ // this.hform.HBarCode= data.鏉″舰鐮� 瑙嗗浘涓病鏈夎瀛楁
+ this.hform.HDeptID= data.HDeptID
+ this.hform.HDeptName= data.閮ㄩ棬
+ this.hform.HSecManagerName= data.棰嗘枡浜�
+ this.hform.HSecManagerID= data.hsecmanagerid
+ this.hform.HKeeperID= data.hkeeperid
+ this.hform.HKeeperName= data.鍙戞枡浜�
+ // this.hform.HRemark= data.琛ㄥご澶囨敞
+ this.hform.HDate = data.鏃ユ湡.substr(0,10)
+
+ this.hform.HWHID=data.HWHID,
+ this.hform.HWHName=data.浠撳簱,
+ this.hform.HStockPlaceID=data.HSPID,
+ this.hform.HStockPlaceName=data.浠撲綅,
+
+ this.hform.HSupName=data.寰�鏉ュ崟浣�,
+ this.hform.HSupID=data.HSupID,
+ this.hform.TypeName=data.寰�鏉ョ被鍨嬪悕绉�,
+ this.hform.HSupTypeID=data.寰�鏉ョ被鍨�,
+
+ this.hform.HMouldID_B=data.hmaterid,
+ // this.hform.HMouldID_B=data.妯″叿浠ｇ爜,
+ this.hform.HMouldName_B=data.妯″叿鍚嶇О,
+ // this.hform.HMouldModel=data.妯″叿瑙勬牸,
+ this.hform.HMouldCount_B=1,
+ this.hform.HRedBlueFlag=data.绾㈣摑鍗曟爣璁�=='钃濆瓧'?false:true,
+
+
+ this.hform.HStockOrgID=data.HStockOrgID,
+ this.hform.HStockOrgName=data.搴撳瓨缁勭粐,
+ // this.hform.HICMOEntryID=data.HICMOEntryID,
+ // this.hform.HProcExchBillNo=data.HProcExchBillNo,
+ // this.hform.HProcExchInterID=data.HProcExchInterID,
+ // this.hform.HProcExchEntryID=data.HProcExchEntryID,
+ // this.hform.HOrgID=data.HOrgID,
+
+ this.hform.HMaker= data.鍒跺崟浜�
+ //this.hform.HMakeDate= data.鍒跺崟鏃ユ湡
+ //this.hform.HUpDater= data.淇敼浜�
+ //this.hform.HUpDateDate= data.淇敼鏃ユ湡
+ // this.hform.HChecker= data.瀹℃牳浜�
+ // this.hform.HCheckDate= data.瀹℃牳鏃ユ湡
+ // this.hform.HDeleteMan= data.浣滃簾浜�
+ // this.hform.HDeleteDate= data.浣滃簾鏃ユ湡
+ }else{
+ uni.showToast({
+ title:res.data.Message,
+ icon:'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title:'鎺ュ彛璇锋眰澶辫触',
+ icon:'none'
+ })
+ },
+ });
+ },
+ async submit() {
+ //浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ if (!this.hform.HWHName) {
+ this.hform.HWHID = 0
+ }
+ if (!this.hform.HStockPlaceName) {
+ this.hform.HStockPlaceID = 0
+ }
+ if (!this.hform.HKeeperName) {
+ this.hform.HKeeperID = 0
+ }
+
+ if (!this.hform.HSecManagerName) {
+ this.hform.HSecManagerID = 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)
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: '/MouldController/set_SaveMouldProdOutBill_Json',
+ method: 'POST',
+ data: {
+ oMain: sMainStr
+ },
+ })
+
+ if (!res) {
+ return
+ }
+
+ 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/caigouruku/POStockInBill?OperationType=1'
+ })
+ } 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()
+ }
+ })
+ }
+ } catch (err) {
+ console.warn(err);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触:' + err,
+ icon: 'none'
+ })
+ }
+ }
+ }
+ },
+ showBillList() {
+ this.$refs.billList.showPopup()
+ },
+ //閫夋嫨婧愬崟绫诲瀷
+ HMainSourceBillTypeChange(e) {
+ this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+
+ let index = this.arrayHMainSourceBillType.findIndex(e => e == this.HMainSourceBillType)
+ if (index != -1) {
+ this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[index]
+ // this.getHYDList()
+ }
+ console.log(this.hform.HMainSourceBillType)
+ uni.setStorageSync("billType_3802",this.hform.HMainSourceBillType);
+ uni.setStorageSync("billTypeName_3802",this.HMainSourceBillType);
+ },
+ //閫変腑婧愬崟
+ getHBarCodeData(HBarCode) {
+ uni.request({
+ url: this.serverUrl + '/MouldController/Get_SourceBarCode_ProdOut_Json',
+ data: {
+ HInterID: this.hform.HInterID,
+ HBillNo: this.hform.HBillNo,
+ HBillType: this.hform.HBillType,
+ HSourceBillNo: HBarCode,
+ HSourceBillType: this.hform.HMainSourceBillType,
+ HMaker: this.hform.HMaker,
+ HStockOrgID: this.hform.HStockOrgID
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ var data = res.data.data[0]
+ console.log(2, data);
+
+ this.hform.HSourceBillNo = data.HSourceBillNo
+ this.showHMainSourceBillType = false
+ //榛樿闈炲婧愬崟
+ this.showHSourceBillNo = false
+ //璁剧疆寰�鏉ュ崟浣�
+ this.hform.HSupTypeID = data.HCorrespondentTypeID
+ this.hform.HSupID = data.HCorrespondentID
+ this.hform.HSupName = data.HCorrespondentName
+ if(data.HCorrespondentTypeID==1){
+ this.hform.TypeName = "渚涘簲鍟�"
+ }else if(data.HCorrespondentTypeID==2){
+ this.hform.TypeName = "閮ㄩ棬"
+ }else{
+ this.hform.TypeName = "瀹㈡埛"
+ }
+
+
+ this.tabs = 1
+ CommonUtils.playSound(1)
+ //鍏夋爣瀵瑰噯鏉＄爜
+ this.refreshBarCodeState()
+ this.DisBillEntryList()
+ } else {
+ console.log('res.data.Message: ', res.data.Message);
+ CommonUtils.playSound(0)
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ CommonUtils.playSound(0)
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ async refreshBarCodeState() {
+ this.barCodeFocus = false
+ await this.$nextTick(() => {
+ this.barCodeFocus = true
+ this.hform.HBarCode = ""
+ })
+ },
+ delMater(item) {
+ if (event && event.target.classList && event.target.classList.contains('link-text')) {
+ return; // 濡傛灉鏄摼鎺ョ偣鍑伙紝涓嶆墽琛屽垹闄�
+ }
+
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕佸垹闄� "' + item.鐗╂枡鍚嶇О + '" 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+ success: (res) => {
+ if (res.confirm) {
+ uni.request({
+ url: this.serverUrl +
+ '/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json',
+ data: {
+ HInterID: this.hform.HInterID,
+ HMaterID: item.HMaterID,
+ HAuxPropID: item.HAuxPropID,
+ HMTONo: item.HMTONo,
+ HSourceInterID: item.HSourceInterID,
+ HSourceEntryID: item.HSourceEntryID,
+ HBillType: this.hform.HBillType
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.DisBillEntryList()
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ });
+ }
+ }
+ });
+ },
+ delMater(item) {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕佸垹闄� "' + item.鍣ㄥ叿鍙� + '" 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+ success: (res) => {
+ if (res.confirm) {
+ uni.request({
+ url: this.serverUrl +
+ '/MouldController/set_DelMouldStockBillMain_Temp_Json',
+ data: {
+ HInterID: this.hform.HInterID,
+ HBarCode: item.HBarCode,
+ HBillType: this.hform.HBillType
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.DisBillEntryList()
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ });
+ }
+ }
+ });
+ },
+ onLoad(e) {
+ console.log(e, this.userInfo)
+ console.log(getUserInfo().HEmpName)
+ if(e.linterid){
+ this.btnType = 3
+ this.linterid = e.linterid
+ this.HBillNo = e.HBillNo
+ this.getEditData(e.linterid, e.HBillNo)
+ }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 === '瀹㈡埛') {
+
+ }
+ this.$nextTick(() => {
+ this.loadCache()
+ })
+
+ }, 300);
+ uni.$on('BillSelectComplete', (e) => {
+ console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
+ this.getHBarCodeData(e.HBillNo)
+ this.$refs.billList.exit()
+ })
+ //this.getHEmpList()
+ },
+ //閲嶈閫夋嫨婧愬崟蹇呴』娣诲姞杩欎釜鍚﹀垯鍑虹幇涓ラ噸bug
+ onUnload() {
+ uni.$off('BillSelectComplete')
+ },
+ }
+ }
</script>
<style lang="scss" scoped>
.form {
@@ -1099,12 +1128,12 @@
margin: 20rpx auto;
padding-bottom: 240rpx;
}
-
+
.tab_area {
width: 100%;
height: 50rpx;
}
-
+
.other {
margin-top: 8rpx;
text-align: center;
@@ -1112,13 +1141,13 @@
padding: 4rpx 18rpx;
color: #1890FF;
}
-
+
.tabs {
width: 100%;
display: flex;
border-bottom: 1px solid #ddd;
margin: 20rpx 0;
-
+
view {
width: 25%;
font-size: 30rpx;
@@ -1126,31 +1155,31 @@
text-align: center;
padding: 16rpx 0;
}
-
+
.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;
-
+
.title {
width: 208rpx;
flex-shrink: 0;
-
+
text {
color: red;
font-weight: bold;
}
}
-
+
.right {
// width: 450rpx;
flex: 1;
@@ -1158,35 +1187,35 @@
border: 1px solid #acacac;
position: relative;
display: flex;
-
+
picker {
width: 100%;
}
-
+
.uni-combox {
width: 100%;
}
}
-
+
.righton {
width: 450rpx;
border-radius: 22rpx;
border: 1px solid #e4e4e4;
background-color: #e4e4e4;
}
-
+
input {
width: 100%;
padding: 8rpx 20rpx;
font-size: 30rpx;
}
-
+
textarea {
width: 98%;
padding: 8rpx 20rpx;
font-size: 30rpx;
}
-
+
.icon-wrapper {
background-color: #3A78FF;
border-radius: 100%;
@@ -1196,19 +1225,19 @@
justify-content: center;
align-items: center;
flex-shrink: 0;
-
+
.uni-icons {
color: #fff !important;
}
}
-
+
.icon-wrapper[disabled] {
background-color: rgba(228, 228, 228, 1);
pointer-events: none;
touch-action: none;
}
}
-
+
.bottom-btn {
width: 100%;
box-sizing: border-box;
@@ -1222,7 +1251,7 @@
display: flex;
flex-direction: row;
gap: 10rpx;
-
+
button {
border-radius: 50rpx;
width: 180rpx;
@@ -1230,61 +1259,61 @@
line-height: 66rpx;
font-size: 28rpx;
}
-
+
.btn-a {
background-color: #3A78FF;
color: #fff;
}
-
+
.btn-b {
background-color: #41a863;
color: #fff;
}
-
+
.btn-c {
background-color: #acacac;
color: #fff;
// position: absolute;
// right: 120rpx;
}
-
+
.btn-d {
background-color: #ff8901;
color: #fff;
}
}
-
+
.list {
width: 100%;
-
+
.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;
-
+
text {
color: #999;
font-size: 26rpx;
}
}
}
-
+
.more {
color: #888;
font-size: 24rpx;
display: flex;
border-top: 1px solid #eee;
padding-top: 20rpx;
-
+
.part {
width: 50%;
text-align: center;
diff --git a/pages/MJGL/mujulingliaotuikudan/form.vue b/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
similarity index 100%
rename from pages/MJGL/mujulingliaotuikudan/form.vue
rename to pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
diff --git a/pages/MJGL/mujulingliaotuikudan/table.vue b/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList.vue
similarity index 98%
rename from pages/MJGL/mujulingliaotuikudan/table.vue
rename to pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList.vue
index c806b09..d152d20 100644
--- a/pages/MJGL/mujulingliaotuikudan/table.vue
+++ b/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList.vue
@@ -180,7 +180,8 @@
operations:-1,
page:1,
- size:100
+ size:100,
+
}
},
onLoad() {
@@ -282,7 +283,7 @@
},
creat(){
uni.navigateTo({
- url:'/pages/MJGL/mujulingliaochukudan/MouldProdOutBill'
+ url:'/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill'
})
},
clear(){
diff --git a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
index ff2d334..d3c5e07 100644
--- a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
+++ b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
@@ -262,7 +262,7 @@
<view style="flex: 1;"></view>
</view>
<view v-for="(item, index) in attachmentInfo" :key="index">
- <uni-card :title="item['fileName']">
+ <uni-card :title="item['fileName']" :thumbnail="item.filePath">
<view class="card-detail">
<view class="detail">
<text>澶у皬锛�</text>{{item["size"]}}
@@ -447,12 +447,14 @@
uni.chooseImage({
count: 1,
success: (res) => {
+ console.log(res)
let fileNameArray = res.tempFiles[0].path.split("/")
this.attachmentInfo.push({
- fileName: fileNameArray[fileNameArray.length - 1],
- size: res.tempFiles[0].size,
+ fileName: res.tempFiles[0].name,
+ size: (res.tempFiles[0].size / 1024).toFixed(2) + 'kB',
status: '绛夊緟涓婁紶',
- filePath: res.tempFilePaths[0]
+ filePath: res.tempFilePaths[0],
+ type: res.tempFilePaths[0].type
})
},
})
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index c03c984..6994958 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -413,7 +413,7 @@
{
"img": "../../static/icon/icon8.png",
"text": "妯″叿棰嗘枡閫�搴撳崟鍒楄〃",
- "url": "/pages/MJGL/mujulingliaotuikudan/table",
+ "url": "/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBillList",
"id": 50,
"hidden": false
},
@@ -461,7 +461,7 @@
},
{
"img": "../../static/icon/icon8.png",
- "text": "鏉ユ枡妫�楠�",
+ "text": "鏉ユ枡妫�楠�(閿﹂殕)",
"url": "/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast",
"id": 55,
"hidden": false
diff --git a/pages/index/vers.vue b/pages/index/vers.vue
index b83dc4c..96ad6a6 100644
--- a/pages/index/vers.vue
+++ b/pages/index/vers.vue
@@ -46,7 +46,7 @@
//#endif
},
methods: {
- update() {
+ update(index=0) {
var _this = this;
uni.request({
url:_this.serverUrl + '/LMES/AppUpdate',
@@ -59,7 +59,8 @@
// "HotVersionNumber": "鏈�鏂扮増鏈�",
// "Content": ""
if (result.data.count == 1) {
- var datas = result.data.data[0]
+ var datas = result.data.data[index]
+ let dataLength = result.data.data.length
uni.setStorageSync('remarkURL',datas.DowloadPath)
plus.runtime.getProperty(plus.runtime.appid, function(inf) {
console.log(inf)
@@ -82,16 +83,38 @@
success: (downloadResult) => {
if (downloadResult.statusCode === 200) {
uni.hideLoading()
+ uni.showLoading({
+ title:'涓嬭浇瀹屾垚锛屾鍦ㄦ洿鏂�...',
+ mask:true,
+ })
plus.runtime.install(downloadResult.tempFilePath, {
force: false
}, function() {
+ uni.hideLoading()
console.log('install success...');
plus.runtime.restart();
}, function(e) {
+ uni.hideLoading()
console.error('install fail...');
+
});
- }
- }
+ } else {
+ uni.hideLoading()
+ console.error('install fail...');
+ if(index < dataLength){
+ // 濡傛灉鏈夊涓姹傚湴鍧�锛屽垯璇锋眰涓嬩竴涓湴鍧�
+ _this.update(index + 1)
+ }
+ }
+ },
+ fail: (err) => {
+ uni.hideLoading()
+ console.error('install fail...');
+ if(index < dataLength){
+ // 濡傛灉鏈夊涓姹傚湴鍧�锛屽垯璇锋眰涓嬩竴涓湴鍧�
+ _this.update(index + 1)
+ }
+ }
});
}
}
diff --git a/pages/zhijiediaobo/MoveStockBill.vue b/pages/zhijiediaobo/MoveStockBill.vue
index 65d3ac2..5bf52f6 100644
--- a/pages/zhijiediaobo/MoveStockBill.vue
+++ b/pages/zhijiediaobo/MoveStockBill.vue
@@ -32,7 +32,7 @@
v-model="hform.HOutStockPlaceName" @input="HOutStockPlaceNameChange"
@confirm="HStockPlaceOutNameScan"></uni-combox>
</view>
-
+
<!-- <view class="righton" v-show="!HSCIsStockMgr">
<input v-model="hform.HOutStockPlaceName" :disabled="!HIsStockMgr" placeholder="涓嶅彲鎿嶄綔" />
</view> -->
@@ -173,7 +173,7 @@
v-model="hform.HStockPlaceName" @input="HStockPlaceInNameChange"
@confirm="HStockPlaceNameInScan"></uni-combox>
</view>
-<!-- <view class="righton" v-show="!HIsStockMgr">
+ <!-- <view class="righton" v-show="!HIsStockMgr">
<input v-model="hform.HStockPlaceName" :disabled="!HIsStockMgr" placeholder="涓嶅彲鎿嶄綔" />
</view> -->
</view>
@@ -460,7 +460,7 @@
HSupNameList: [],
arrayHCusName: [], //渚涘簲鍟�
HCusNameList: [],
-
+
Materlist: [],
FIFOlist: [],
hform: {
@@ -529,16 +529,19 @@
BillListPopupVue,
BarCodePopupVue
},
-
+
async onLoad(e) {
await this.getOrganization()
+ await this.GetSourceBillType()
+ await this.set_InitBillSubType()
+ // 纭繚 鍗曟嵁瀛愮被鍨嬪厛浜� 璇诲彇鍗曟嵁淇℃伅杩涜锛岄槻姝㈡椂搴忛棶棰�
console.log(e, this.userInfo)
this.OperationType = e.OperationType
if (e.HInterID) {
this.HInterID_Temp = e.HInterID
// this.btnType = 1
this.barCodeFocus = true
- this.RoadBillMain(e.HInterID)
+ await this.RoadBillMain(e.HInterID)
} else {
this.HSourcebillNoFocus = true
this.getNewData()
@@ -549,15 +552,14 @@
this.getHSupList()
this.getHEmpList()
this.getHDeptList()
- this.set_InitBillSubType()
+
this.InitTransferDirect()
this.InitShipType()
-
+
// this.getHSupList() // 鍒濆鍖� 瀹㈡埛
this.getHCusList() // 鍒濆鍖� 渚涘簲鍟�
this.getRelationStore()
- this.GetSourceBillType()
uni.$on('BillSelectComplete', (e) => {
console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
@@ -610,7 +612,7 @@
},
success: (res) => {
if (res.data.count == 1) {
- console.log('Supplier: ',res.data);
+ console.log('Supplier: ', res.data);
this.HCusNameList = res.data.data
for (var i = 0; i < res.data.data.length; i++) {
this.arrayHCusName[i] = res.data.data[i].HName
@@ -634,7 +636,7 @@
},
//閫夋嫨渚涘簲鍟�
HCusNameChange(e) {
- console.log('e: ',e);
+ console.log('e: ', e);
for (var i = 0; i < this.HCusNameList.length; i++) {
if (this.HCusNameList[i].HName == e) {
this.hform.HCusID = this.HCusNameList[i].HItemID
@@ -658,7 +660,7 @@
})
},
async HWHNameOutScan(e) {
- return
+ return
// 鎵弿浠撳簱鐮�
console.log('浠撳簱鐮�: ', e);
let index = this.HWHNameList.findIndex(elem => elem['鏉＄爜缂栧彿'] == e)
@@ -686,9 +688,9 @@
Organization: uni.getStorageSync('Organization')
},
})
-
+
if (res.data.count == 1) {
-
+
this.hform.HOutStockPlaceID = res.data.data[0].HMainID
this.hform.HOutStockPlaceName = res.data.data[0].浠撲綅鍚嶇О
this.hform.HSCWHID = res.data.data[0].HWHID
@@ -699,7 +701,7 @@
icon: 'none'
})
}
-
+
} catch (err) {
uni.showToast({
title: '浠撲綅鏁版嵁璇锋眰澶辫触',
@@ -736,9 +738,9 @@
Organization: uni.getStorageSync('Organization')
},
})
-
+
if (res.data.count == 1) {
-
+
this.hform.HStockPlaceID = res.data.data[0].HMainID
this.hform.HStockPlaceName = res.data.data[0].浠撲綅鍚嶇О
this.hform.HWHID = res.data.data[0].HWHID
@@ -749,7 +751,7 @@
icon: 'none'
})
}
-
+
} catch (err) {
uni.showToast({
title: '浠撲綅鏁版嵁璇锋眰澶辫触',
@@ -860,36 +862,37 @@
this.hform.HWHID = '',
this.hform.HWHName = ''
},
- set_InitBillSubType() { // 鍒濆鍖栧崟鎹瓙绫诲瀷
+ async set_InitBillSubType() { // 鍒濆鍖栧崟鎹瓙绫诲瀷
this.arrayHBillSubType = []
this.arrayHBillSubTypeValue = []
- CommonUtils.doRequest(
- "/WEBSController/GetBillSubType_Json", {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/WEBSController/GetBillSubType_Json",
+ data: {
HBillType: this.hform.HBillType,
HStockOrgID: this.hform.HStockOrgID
- },
- (res) => {
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- Array.from(data).forEach(item => {
- this.arrayHBillSubType.push(item['HName'])
- this.arrayHBillSubTypeValue.push(item['HNumber'])
- })
-
- this.HBillSubType = this.arrayHBillSubType[0]
- this.hform.HBillSubType = this.arrayHBillSubTypeValue[0]
- } else {
- uni.showToast({
- icon: 'none',
- title: Message
- })
- }
}
- )
+ })
+
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ Array.from(data).forEach(item => {
+ this.arrayHBillSubType.push(item['HName'])
+ this.arrayHBillSubTypeValue.push(item['HNumber'])
+ })
+
+ this.HBillSubType = this.arrayHBillSubType[0]
+ this.hform.HBillSubType = this.arrayHBillSubTypeValue[0]
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+
},
onHSourceBillNoConfirmHandler() {
if (this.hform.HMainSourceBillType == -1) {
@@ -1209,45 +1212,43 @@
},
// 閫氳繃鍗曟嵁绫诲瀷鑾峰彇婧愬崟绫诲瀷
async GetSourceBillType() {
- CommonUtils.doRequest2({
+ let res = await CommonUtils.doRequest2Async({
url: '/Web/GetHSourceBillTypeByBillType',
data: {
HBillType: this.hform.HBillType,
Num: 2
- },
- resFunction: (res) => {
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- console.log('data: ', data);
- this.arrayHMainSourceBillType = []
- this.arrayHMainSourceBillValue = []
- Array.from(data).forEach(e => {
- this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
- this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
- })
+ }
+ })
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ console.log('data: ', data);
+ this.arrayHMainSourceBillType = []
+ this.arrayHMainSourceBillValue = []
+ Array.from(data).forEach(e => {
+ this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
+ this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
+ })
- this.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
- this.arrayHMainSourceBillValue.push('-1')
- //濡傛灉鎵嬪伐褰曞叆涓嶇敤閫夋嫨婧愬崟
- if (this.arrayHMainSourceBillType[0] == '鎵嬪伐褰曞叆') {
- this.tabs = 1
- }
-
- this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
- this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
- } else {
- uni.showToast({
- icon: 'none',
- title: Message
- })
- }
+ this.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
+ this.arrayHMainSourceBillValue.push('-1')
+ //濡傛灉鎵嬪伐褰曞叆涓嶇敤閫夋嫨婧愬崟
+ if (this.arrayHMainSourceBillType[0] == '鎵嬪伐褰曞叆') {
+ this.tabs = 1
}
- })
+ this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
+ this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+
+ }
},
//婧愬崟璧勬枡
async getHYDList() {
@@ -1324,7 +1325,7 @@
this.getStockPlaceRemote(this.HWHNameList[i]["HSPGroupID"], 2) // 淇敼璋冨嚭浠撳簱
// 鏌ヨ浠撲綅鏁版嵁
} else {
-
+
this.HSCIsStockMgr = false
}
}
@@ -1342,30 +1343,30 @@
Organization: uni.getStorageSync('Organization')
},
})
-
+
if (res.data.count == 1) {
- if(Mode == 1){
+ if (Mode == 1) {
this.HStockPlaceInNameList = res.data.data
for (var i = 0; i < res.data.data.length; i++) {
this.arrayHStockPlaceInName[i] = res.data.data[i].浠撲綅鍚嶇О
}
- return
+ return
}
- if(Mode == 2) {
+ if (Mode == 2) {
this.HStockPlaceNameList = res.data.data
for (var i = 0; i < res.data.data.length; i++) {
this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
}
return
}
-
+
} else {
uni.showToast({
title: '浠撲綅鏁版嵁璇锋眰澶辫触',
icon: 'none'
})
}
-
+
} catch (err) {
uni.showToast({
title: '浠撲綅鏁版嵁璇锋眰澶辫触',
@@ -1399,8 +1400,8 @@
if (index != -1) {
this.hform.HOutStockPlaceName = this.HStockPlaceNameList[index].浠撲綅鍚嶇О
this.hform.HOutStockPlaceID = this.HStockPlaceNameList[index].HMainID
- }
-
+ }
+
// for (var i = 0; i < this.HStockPlaceInNameList.length; i++) {
// if (this.HStockPlaceInNameList[i].浠撲綅鍚嶇О == e) {
// this.hform.HOutStockPlaceName = this.HStockPlaceInNameList[i].浠撲綅鍚嶇О
@@ -1420,12 +1421,13 @@
},
//閫夋嫨婧愬崟绫诲瀷
HMainSourceBillTypeChange(e) {
- console.log(e)
+ console.log('e: ',e);
let index = e.detail.value
if (index != -1) {
this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[index]
}
+
},
//鑾峰彇渚涘簲鍟嗘暟鎹�
@@ -2025,8 +2027,8 @@
});
},
//淇敼鍥炲～鏁版嵁
- RoadBillMain(HInterID) {
- uni.request({
+ async RoadBillMain(HInterID) {
+ await uni.request({
url: this.serverUrl + '/WEBSController/GetSourceBill_Temp_Json',
data: {
HInterID: HInterID,
@@ -2036,6 +2038,7 @@
console.log(33, res.data.data[0]);
if (res.data.count == 1) {
var data = res.data.data[0]
+
this.hform.HInterID = data.HInterID
this.hform.HBillNo = data.HBillNo
this.hform.HMainSourceBillType = data.HSourceBillType
@@ -2045,8 +2048,11 @@
let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
.HSourceBillType)
if (index != -1) {
- this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
- this.HMainSourceBillTypeChange({detail: {value: this.arrayHMainSourceBillType[index]}})
+ this.HMainSourceBillTypeChange({
+ detail: {
+ value: index
+ }
+ })
if (index != -1) {
this.showHSupName = false
}
diff --git a/utils/common.js b/utils/common.js
index dc857f6..90a457e 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -459,6 +459,37 @@
return handler(key, match);
});
}
+
+ fieldListFilterRole({FieldList, ExcludeKeys = [] ,RoleList = null}) {
+ if(!RoleList) {
+ RoleList = [
+ /^[a-zA-Z]+$/,
+ /\bid$/i
+ ]
+ }
+ if(!Array.isArray(RoleList)){
+ return {
+ status: false,
+ data: null,
+ Message: "杩囨护瀛楁鍒楄〃澶辫触锛岃鍒欏繀椤绘槸鏁扮粍銆�"
+ }
+ }
+
+ let FieldListCache = Array(FieldList)
+
+ let list1 = FieldListCache.filter(elem => role[0].test(elem.ColmCols))
+ console.log('list1: ',list1);
+ // RoleList.forEach(role => {
+ // console.log(FieldListCache.filter(field => !role.test(field.ColmCols)))
+ // FieldListCache = FieldListCache.filter(field => !role.test(field.ColmCols))
+ // })
+
+ return {
+ status: true,
+ data: FieldListCache,
+ Message: ""
+ }
+ }
}
export const CommonUtils = new commonUtils()
\ No newline at end of file
--
Gitblit v1.9.1