From 9e51a3b44d210615d8a7213a943258f7147676ba Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 30 一月 2026 11:53:22 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue | 10
pages/tepidan/TePiDanList.vue | 602 ++
pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue | 52
pages/MJGL/shangmudan/MouldUpperBill.vue | 12
pages/xiaoshoudingdan/xiaoshoudingdanBillList.vue | 604 ++
pages/caigouruku/POStockInBill.vue | 6
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue | 281
pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport.vue | 1130 +-
pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue | 66
pages/caigoutuiliao/POStockInBackBill.vue | 6
pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue | 23
pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue | 13
pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport.vue | 124
pages/index/login.vue | 4
pages/xiaoshoutuihuo/ICStockBillMain.vue | 6
pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue | 1402 ++--
pages/ZLGL/shoujianjianyan/firstCheckBill.vue | 4871 ++++++++--------
pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue | 2
pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue | 63
pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue | 1688 ++--
pages/simaheyi/BarCodeCheck_SN.vue | 32
pages/xiaoshoudingdan/xiaoshoudingdanListEdit.vue | 742 ++
pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue | 5
pages.json | 37
pages/tepidan/TePiDanEdit.vue | 742 ++
pages/xiaoshouchuku/SellOutBill.vue | 6
pages/index/tab4.vue | 14
pages/qitaruku_v2/OtherInBill.vue | 12
pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue | 14
pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue | 2
pages/caigoudingdan/caigoudingdanListEdit.vue | 648 ++
pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue | 1615 ++--
pages/shengchanrukushengdan/Kf_ProductInBill.vue | 102
pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue | 127
pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue | 2
pages/sanmaheyi/BarCodeCheck.vue | 31
pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue | 48
pages/caigoudingdan/caigoudingdanList.vue | 24
manifest.json | 7
pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue | 88
pages/index/tab3.vue | 8
pages/zhijiediaobo/MoveStockBill.vue | 6
pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue | 53
pages/EmployeeRecords/EmployeeRecordsBill.vue | 2137 ++----
pages/qitachuku_v2/OtherOutBill.vue | 6
45 files changed, 10,530 insertions(+), 6,943 deletions(-)
diff --git a/manifest.json b/manifest.json
index 3f16198..b542431 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "2.0.61",
- "versionCode" : 261,
+ "versionName" : "2.0.66",
+ "versionCode" : 266,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
@@ -162,7 +162,8 @@
"LcPrinter" : {
"__plugin_info__" : {
"name" : "LcPrinter",
- "description" : "鎵撳嵃鎻掍欢",
+ // "description" : "鎵撳嵃鎻掍欢",
+ "description" : "鏂扮増鎵撳嵃鎻掍欢",
"platforms" : "Android",
"url" : "",
"android_package_name" : "",
diff --git a/pages.json b/pages.json
index dc854dd..9f2db90 100644
--- a/pages.json
+++ b/pages.json
@@ -585,6 +585,12 @@
"navigationBarTitleText": "閲囪喘璁㈠崟鍒楄〃"
}
},
+ {
+ "path": "pages/caigoudingdan/caigoudingdanListEdit",
+ "style": {
+ "navigationBarTitleText": "閲囪喘璁㈠崟鏌ョ湅"
+ }
+ },
{
"path": "pages/caigoudingdan/caigoudingdan",
"style": {
@@ -1695,7 +1701,36 @@
{
"navigationBarTitleText" : "寰呮楠屽垪琛�"
}
- }
+ },
+ {
+ "path" : "pages/xiaoshoudingdan/xiaoshoudingdanBillList",
+ "style" :
+ {
+ "navigationBarTitleText" : "閿�鍞鍗曞垪琛�"
+ }
+ },
+ {
+ "path" : "pages/xiaoshoudingdan/xiaoshoudingdanListEdit",
+ "style" :
+ {
+ "navigationBarTitleText" : "閿�鍞鍗�"
+ }
+ },
+ {
+ "path" : "pages/tepidan/TePiDanList",
+ "style" :
+ {
+ "navigationBarTitleText" : "鐗规壒鍗曞垪琛�"
+ }
+ },
+ {
+ "path" : "pages/tepidan/TePiDanEdit",
+ "style" :
+ {
+ "navigationBarTitleText" : "鐗规壒鍗�"
+ }
+ }
+
],
diff --git a/pages/EmployeeRecords/EmployeeRecordsBill.vue b/pages/EmployeeRecords/EmployeeRecordsBill.vue
index a962dca..7cbb4af 100644
--- a/pages/EmployeeRecords/EmployeeRecordsBill.vue
+++ b/pages/EmployeeRecords/EmployeeRecordsBill.vue
@@ -1,541 +1,520 @@
<template>
- <view class="form">
- <view class="form-base-info">
+ <view>
+ <view class="form">
<view class="form-item">
<view class="title">鏉＄爜</view>
- <view class="right">
- <input type="text" :focus="HBarCodeFocus" v-model="HBarCode"
- @confirm="GetMeesageByBarCode(HBarCode)" />
+ <view class="right" style="width: 350rpx;">
+ <input type="text" :focus="HBarCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜"
+ @confirm="getHBarCodeData(hform.HBarCode)" />
</view>
- <view class="right-icon">
- <uni-icons type="scan"
- style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
- @click="toScanCode2"></uni-icons>
- </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-data-select v-model="hform.HRoles" :multiple="true" :localdata="roleOptions"
- placeholder="璇烽�夋嫨瑙掕壊" :clear="false" @change="onRoleChange">
- </uni-data-select>
- </view>
+ <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>
- <view class="form-item">
- <view class="title">鐢熶骇杞﹂棿:</view>
- <view class="right">
- <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨杞﹂棿" v-model="hform.HDeptName"
- @input="HDeptNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">绛惧埌浜哄憳:</view>
- <view class="right">
- <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨绛惧埌浜哄憳" v-model="hform.HEmpName"
- @input="HEmpNameChange"></uni-combox>
- </view>
- </view>
-
- <view class="form-item">
- <view class="title">鐝粍:</view>
- <view class="right">
- <uni-combox :candidates="arrayHGroupName" placeholder="璇烽�夋嫨鐝粍" v-model="hform.HGroupName"
- @input="HGroupNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐝:</view>
- <view class="right">
- <uni-combox :candidates="arrayHShiftsName" placeholder="璇烽�夋嫨鐝" v-model="hform.HShiftsName"
- @input="HShiftsNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鐢熶骇璧勬簮:</view>
- <view class="right">
- <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
- @input="HSourceNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">宸ュ簭:</view>
- <view class="right">
- <uni-combox :candidates="arrayHProcName" placeholder="璇烽�夋嫨宸ュ簭" v-model="hform.HProcName"
- @input="HProcNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">鏃ユ湡</view>
- <view class="right disabled">
- <input type="text" disabled :value="hform.HDate" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">鍗曟嵁鍙�</view>
- <view class="right disabled">
- <input type="text" disabled :value="hform.HBillNo" />
- </view>
- </view>
- </view>
- <view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鏈哄彴淇℃伅</view>
- <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">宸ュ崟淇℃伅</view>
- <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍒跺崟淇℃伅</view>
- </view>
- <!-- 瑁呯淇℃伅 -->
- <view v-if="tabs == 1" class="work-order-cards">
- <view v-for="(item, index) in listData" :key="item.index" class="work-order-card">
- <view class="card-header">
- <text class="card-title">宸ュ崟淇℃伅 {{ index + 1 }}</text>
- <checkbox :checked="item.checked" style="transform:scale(0.8)" color="#3A78FF"
- @change="onCardCheckChange(item, index)" />
- </view>
- <view class="card-content">
- <view class="card-row">
- <text class="card-label">娴佽浆鍗″彿锛�</text>
- <text class="card-value">{{ item['娴佽浆鍗″彿'] || '-' }}</text>
- </view>
- <view class="card-row">
- <text class="card-label">鐗╂枡浠ｇ爜锛�</text>
- <text class="card-value">{{ item['鐗╂枡浠ｇ爜'] || '-' }}</text>
- </view>
- <view class="card-row">
- <text class="card-label">鐗╂枡鍚嶇О锛�</text>
- <text class="card-value">{{ item['鐗╂枡鍚嶇О'] || '-' }}</text>
- </view>
- <view class="card-row">
- <text class="card-label">瑙勬牸鍨嬪彿锛�</text>
- <text class="card-value">{{ item['瑙勬牸鍨嬪彿'] || '-' }}</text>
- </view>
- <view class="card-row">
- <text class="card-label">鏁伴噺锛�</text>
- <text class="card-value">{{ item['鏁伴噺'] || '0' }}</text>
- </view>
- <view class="card-row">
- <text class="card-label">鐢熶骇璧勬簮锛�</text>
- <text class="card-value">{{ item['鐢熶骇璧勬簮'] || '-' }}</text>
- </view>
- </view>
- </view>
-
- <view v-if="listData.length === 0" class="empty-card">
- <uni-icons type="info" size="30" color="#999"></uni-icons>
- <text class="empty-text">鏆傛棤宸ュ崟淇℃伅</text>
- <text class="empty-tip">璇峰厛鎵弿鏉＄爜鑾峰彇宸ュ崟淇℃伅</text>
- </view>
- </view>
- <view v-if="tabs == 0" class="machine-info-container">
- <view class="form-item" v-if="false">
- <view class="title">璁惧ID:</view>
- <view class="righton">
- <input name="HEquipID" disabled v-model="hform.HEquipID" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">璁惧鍚嶇О:</view>
- <view class="righton">
- <input name="HEquipName" disabled v-model="hform.HEquipName" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">妯″叿缂栫爜:</view>
- <view class="righton">
- <input name="HMouldNo" disabled v-model="hform.HMouldNo" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">妯″叿鍚嶇О:</view>
- <view class="righton">
- <input name="HMouldName" disabled v-model="hform.HMouldName" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">妯″叿鐘舵��:</view>
- <view class="righton">
- <input name="HMouldState" disabled v-model="hform.HMouldState" />
- </view>
- </view>
- <!-- <label class="checkbox" style="float: right;">
- <checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc" />鏉＄爜鏍稿
- </label> -->
- </view>
- <!-- 鍒跺崟淇℃伅 -->
- <view v-if="tabs == 2">
- <view class="bill-info">
+
+ <!-- 鍗曟嵁淇℃伅 -->
+ <view v-if="tabs == 0">
<view class="form-item">
- <view class="title">鍒涘缓鏃ユ湡</view>
+ <view class="title">瑙掕壊</view>
<view class="right">
- <uni-datetime-picker type="date" v-model="hform.HDate">
- <input type="text" v-model="hform.HDate" disabled />
- </uni-datetime-picker>
+ <!-- 澶氶�変笅鎷夋 -->
+ <uni-data-select v-model="hform.HRoles" :multiple="true" :localdata="roleOptions"
+ placeholder="璇烽�夋嫨瑙掕壊" :clear="false" @change="onRoleChange">
+ </uni-data-select>
</view>
</view>
- </view>
- <view class="bill-info">
<view class="form-item">
- <view class="title">鍒涘缓浜�</view>
- <view class="right disabled">
- <input type="text" disabled :value="hform.HMaker" />
- </view>
- </view>
- </view>
- <view class="bill-info">
- <view class="form-item">
- <view class="title">淇敼鏃ユ湡</view>
+ <view class="title"><text>*</text>鐢熶骇杞﹂棿:</view>
<view class="right">
- <uni-datetime-picker type="date" v-model="hform.HUpDateDate">
- <input type="text" v-model="hform.HDate" disabled />
- </uni-datetime-picker>
+ <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+ @input="HDeptNameChange"></uni-combox>
</view>
</view>
- </view>
- <view class="bill-info">
<view class="form-item">
- <view class="title">淇敼浜�</view>
- <view class="right disabled">
- <input type="text" disabled :value="hform.HUpDater" />
- </view>
- </view>
- </view>
- <view class="bill-info">
- <view class="form-item">
- <view class="title">淇敼鏃ユ湡</view>
+ <view class="title"><text>*</text>绛惧埌浜哄憳:</view>
<view class="right">
- <uni-datetime-picker type="date" v-model="hform.HCheckDate">
- <input type="text" v-model="hform.HDate" disabled />
- </uni-datetime-picker>
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName"
+ @input="HEmpNameChange"></uni-combox>
</view>
</view>
- </view>
- <view class="bill-info">
<view class="form-item">
- <view class="title">淇敼浜�</view>
- <view class="right disabled">
- <input type="text" disabled :value="hform.HChecker" />
+ <view class="title"><text>*</text>鐢熶骇璧勬簮:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
+ @input="HSourceNameChange"></uni-combox>
</view>
</view>
- </view>
- <view class="bill-info">
<view class="form-item">
- <view class="title">鍗曟嵁鍙�</view>
- <view class="right disabled">
- <input type="text" disabled :value="hform.HBillNo" />
+ <view class="title"><text>*</text>鐢熶骇鐝粍:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHGroupName" placeholder="璇烽�夋嫨鐝粍" v-model="hform.HGroupName"
+ @input="HGroupNameChange"></uni-combox>
</view>
</view>
- </view>
-
- <view class="bill-info">
<view class="form-item">
- <view class="title">缁勭粐</view>
- <view class="right disabled">
- <input type="text" disabled :value="hform.HStockOrgName" />
+ <view class="title"><text>*</text>鐢熶骇鐝:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHShiftsName" placeholder="璇烽�夋嫨鐝" v-model="hform.HShiftsName"
+ @input="HShiftsNameChange"></uni-combox>
</view>
</view>
+ <view class="form-item">
+ <view class="title"><text>*</text>妯″叿瀹為檯鍑烘暟:</view>
+ <view class="right">
+ <input name="HMouldRelQty" v-model="hform.HMouldRelQty" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">宸ュ簭:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHProcName" placeholder="璇烽�夋嫨宸ュ簭" v-model="hform.HProcName"
+ @input="HProcNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璁惧缂栧彿:</view>
+ <view class="righton">
+ <input name="HEquipNumber" disabled v-model="hform.HEquipNumber" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">璁惧鍚嶇О:</view>
+ <view class="righton">
+ <input name="HEquipName" disabled v-model="hform.HEquipName" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">妯″叿缂栫爜:</view>
+ <view class="righton">
+ <input name="HMouldNo" disabled v-model="hform.HMouldNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">妯″叿鍚嶇О:</view>
+ <view class="righton">
+ <input name="HMouldName" disabled v-model="hform.HMouldName" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">妯″叿鐘舵��:</view>
+ <view class="righton">
+ <input name="HMouldState" disabled v-model="hform.HMouldState" />
+ </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">鍗曟嵁鏃ユ湡:</view>
+ <view class="righton">
+ <picker mode="date" v-model="hform.HDate" @change="HDateChange">
+ <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+ </picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">澶囨敞:</view>
+ <view class="right">
+ <textarea name="HRemark" v-model="hform.HRemark" auto-height placeholder="璇疯緭鍏ュ娉�"></textarea>
+ </view>
+ </view>
+
</view>
+ <!-- 妯″叿淇℃伅 -->
+ <view v-if="tabs == 1">
+ <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="card-label">娴佽浆鍗″彿锛�</text>
+ <text class="card-value">{{ item['娴佽浆鍗″彿'] || '-' }}</text>
+ </view>
+ <view class="card-row">
+ <text class="card-label">鐗╂枡浠ｇ爜锛�</text>
+ <text class="card-value">{{ item['鐗╂枡浠ｇ爜'] || '-' }}</text>
+ </view>
+ <view class="card-row">
+ <text class="card-label">鐗╂枡鍚嶇О锛�</text>
+ <text class="card-value">{{ item['鐗╂枡鍚嶇О'] || '-' }}</text>
+ </view>
+ <view class="card-row">
+ <text class="card-label">瑙勬牸鍨嬪彿锛�</text>
+ <text class="card-value">{{ item['瑙勬牸鍨嬪彿'] || '-' }}</text>
+ </view>
+ <view class="card-row">
+ <text class="card-label">鏁伴噺锛�</text>
+ <text class="card-value">{{ item['鏁伴噺'] || '0' }}</text>
+ </view>
+ <view class="card-row">
+ <text class="card-label">鐢熶骇璧勬簮锛�</text>
+ <text class="card-value">{{ item['鐢熶骇璧勬簮'] || '-' }}</text>
+ </view>
+ </view>
+ </uni-card>
+ </view>
- </view>
- <view class="bottom-btn" id="bottom-btn">
- <button :class="EnableSubmit?'btn-a':'btn-c'" :disabled="!EnableSubmit" size="mini"
- @tap="cmdSubmit">鎻愪氦</button>
- <view style="flex: 1;"></view>
- <!-- <button class="btn-d" size="mini" @tap="cmdDelete">鍒犻櫎</button> -->
- <button class="btn-c" size="mini" @tap="cmdExit">閫�鍑�</button>
- </view>
- <!-- 鎵撳嵃妯″潡 -->
- <labelPrinterComponentVue ref="labelPrinter" :printInfo="printInfo" :printMode="'cpcl'">
- </labelPrinterComponentVue>
-
- <!-- 鎵撳嵃鏈洪�夋嫨鍒楄〃 -->
- <view v-if="maskShow" class="uni-mask" @tap="maskShow = false">
- <scroll-view class="uni-scroll_box" scroll-y>
- <view class="uni-list-box" v-for="(device, index) in discoveredDevices" :key="index"
- @tap="connectBT(device)">
- <view class="uni-list_name">鍚嶇О锛歿{ device.name }}</view>
- <view class="uni-list_item">{{ connectedDeviceId === device.address?'宸茶繛鎺�':'鏈繛鎺�' }}</view>
- </view>
- </scroll-view>
- </view>
- <view v-if="showResultTable" class="result-modal">
- <view class="modal-mask" @tap="closeResultTable"></view>
- <view class="modal-content">
- <view class="modal-header">
- <text class="modal-title">绛惧埌缁撴灉</text>
- <uni-icons type="close" size="20" @tap="closeResultTable"></uni-icons>
- </view>
- <view class="modal-body">
- <zb-table :fit="true" :style="{height: '400px'}" :columns="resultTableColumns"
- :data="resultTableData" :show-header="true" :border="true" :row-key="row => row.index" />
- </view>
- <view class="modal-footer">
- <button class="btn-a" size="mini" @tap="toAddNew">鏂板</button>
- <button class="btn-a" size="mini" @tap="search">鎵撳嵃</button>
- <view style="flex: 1;"></view>
- <button class="btn-c" size="mini" @tap="closeResultTable">鍏抽棴</button>
+ <view class="over" v-if="listData.length == 0">鏆傛棤宸ュ崟淇℃伅</view>
</view>
</view>
+ <view v-if="tabs == 2">
+ <view class="form-item">
+ <view class="title">鍒跺崟浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HMaker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">鍒跺崟鏃ユ湡:</view>
+ <view class="righton">
+ <input v-if="hform.HMakeDate" v-model="hform.HMakeDate.substr(0,10)" disabled />
+ <input v-else v-model="hform.HMakeDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HUpDater" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇敼鏃ユ湡:</view>
+ <view class="righton">
+ <input v-if="hform.HUpDateDate" v-model="hform.HUpDateDate.substr(0,10)" disabled />
+ <input v-else v-model="hform.HUpDateDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳浜�:</view>
+ <view class="righton">
+ <input v-model="hform.HChecker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">瀹℃牳鏃ユ湡:</view>
+ <view class="righton">
+ <input v-if="hform.HCheckDate" v-model="hform.HCheckDate.substr(0,10)" disabled />
+ <input v-else v-model="hform.HCheckDate" disabled />
+ </view>
+ </view>
+
+ </view>
+
+ <view class="bottom-btn">
+ <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 && isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+ </view>
</view>
+
</view>
</template>
-
<script>
- import dayjs from 'dayjs'
+ import getDateTime from '@/utils/getdateTime.js';
import {
getUserInfo
- } from "../../utils/auth";
+ } from "@/utils/auth.js";
+ import dayjs from 'dayjs'
import {
CommonUtils
} from "@/utils/common.js"
import {
MpaasScan
} from "@/utils/mpaasScan.js"
- import labelPrinterComponentVue from "@/components/labelPrinterComponent/labelPrinterComponent.vue"
- import getdateTime from '../../utils/getdateTime';
export default {
- components: {
- labelPrinterComponentVue
- },
data() {
return {
-
- serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
// 璁＄畻鍒楄〃楂樺害
bottomBtnTop: 0,
listTableTop: 0,
- // 鍏叡鍙橀噺
+ tabs: 0,
+
+ userInfo: getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ linterid: '',
+ HBillNo: '',
+ btnType: 1, //1鏂板锛�3淇敼
+ showmore: false,
+ HBarCodeFocus: false,
+
arrayHDeptName: [], //閮ㄩ棬
HDeptNameList: [],
- arrayHEmpName: [], //鍛樺伐
+ arrayHEmpName: [], //鍙戠幇浜�/璐熻矗浜�
HEmpNameList: [],
+ arrayHSourceName: [], //鐢熶骇璧勬簮
+ HSourceNameList: [],
arrayHGroupName: [], //鐝粍
HGroupNameList: [],
arrayHShiftsName: [], //鐝
HShiftsNameList: [],
- arrayHSourceName: [], //鐢熶骇璧勬簮
- HSourceNameList: [],
arrayHProcName: [], //宸ュ簭
HProcNameList: [],
-
- maskShow:false,
- printInfo:false,
- EnableScanBarCodePack: true,
- EnableSubmit: true,
- HBarCodePackFocus: false,
- HBarCodeFocus: false,
- HBarCode: '', // 鍖呮潯鐮�
- tabs: 0,
- HBillType: '4616',
- HBillSubType: '1', //瀛愮被鍨嬶紙1瑁呯銆�2缁勬墭锛�
- OperationType: 1, //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
- HMaterNumber_Pack: "", //鎵樻潯鐮佸搴旂墿鏂欎唬鐮�
- listOption: [],
- listData: [],
- columns: [{
- type: 'selection',
- fixed: true,
- width: 50
- },
- {
- name: 'index',
- label: '搴忓彿',
- width: 60,
- hidden: true
- },
- {
- name: '娴佽浆鍗″彿',
- label: '娴佽浆鍗″彿',
- width: 100,
- },
- {
- name: '鏁伴噺',
- label: '鏁伴噺',
- width: 100,
- },
- {
- name: '鐗╂枡浠ｇ爜',
- label: '鐗╂枡浠ｇ爜',
- width: 100,
- },
- {
- name: '鐗╂枡鍚嶇О',
- label: '鐗╂枡鍚嶇О',
- width: 100,
- },
- {
- name: '瑙勬牸鍨嬪彿',
- label: '瑙勬牸鍨嬪彿',
- width: 100,
- },
- {
- name: '鏁伴噺',
- label: '鏁伴噺',
- width: 100,
- },
- {
- name: '鐢熶骇璧勬簮',
- label: '鐢熶骇璧勬簮',
- width: 100,
- }
- ],
- selectedRows: [], // 瀛樺偍閫変腑鐨勬暟鎹�
- titleData: [], //涓嶉渶瑕佹樉绀虹殑瀛楁
- OperationType: 1, //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩�
- //灞曠ず琛ㄥ崟
- showResultTable: false, // 鎺у埗缁撴灉琛ㄦ牸鏄剧ず
- resultTableData: [], // 缁撴灉琛ㄦ牸鏁版嵁
- resultTableColumns: [{
- name: '璁惧缂栫爜',
- label: '璁惧缂栫爜',
- width: 120,
- },
- {
- name: '璁惧鍚嶇О',
- label: '璁惧鍚嶇О',
- width: 120,
- },
- {
- name: '绛惧埌瑙掕壊',
- label: '绛惧埌瑙掕壊',
- width: 100,
- },
- {
- name: '鐢熶骇璧勬簮鍚嶇О',
- label: '鐢熶骇璧勬簮鍚嶇О',
- width: 100,
- }
- ],
- //
- // 琛ㄥ崟鎻愪氦鍊�
+ isEdit: false,
+ listOption: [], // 鍒楄〃閫夐」
+ listData: [], // 琛ㄦ牸鏁版嵁
+ selectedRows: [], // 琛ㄦ牸閫変腑鐨勬暟鎹�
+ roleOptions: [], // 涓嬫媺妗嗛�夐」
+ roleList: [], // 瀹屾暣瑙掕壊鍒楄〃锛堝寘鍚獻D锛�
+
+ // 娣诲姞鐢ㄦ埛宸茬粦瀹氳鑹叉暟鎹�
+ userBoundRoles: [], // 鐢ㄦ埛宸茬粦瀹氱殑瑙掕壊ID鍒楄〃
+ HBillType: 4616,
+
hform: {
- HDate: dayjs(new Date()).format('YYYY-MM-DD'),
- HMaker: getUserInfo()['Czymc'],
HInterID: '',
- HStockOrgName: uni.getStorageSync("Organization"),
- HStockOrgID: uni.getStorageSync("OrganizationID"),
-
- HQualityApproval: false,
-
- HMainID: '',
- HSubID: '',
- HSourceBillSEQ: '',
HBillNo: '',
- HEmpID: getUserInfo()['HEmpID'] || '',
- HEmpName: getUserInfo()['Czymc'] || '',
- HEmpNumber: getUserInfo()['Czybm'] || uni.getStorageSync("HEmpNumber"),
-
-
- HCheckEmpName: '',
-
- HRemark: '',
-
- HProduceDate: dayjs(new Date()).format('YYYY-MM-DD'),
-
- //鑷畾涔�
+ HDate: getDateTime.dateTimeStr('y-m-d'),
+ HBarCode: '',
+ HDeptName: uni.getStorageSync('HDeptName'),
+ HDeptID: uni.getStorageSync('HDeptID'),
+ HEmpName: uni.getStorageSync('HEmpName'),
+ HEmpID: uni.getStorageSync('HEmpID'),
+ HSourceID: uni.getStorageSync('HSourceID'),
+ HSourceName: uni.getStorageSync('HSourceName'),
+ HProcID: uni.getStorageSync('HProcID'),
+ HProcName: uni.getStorageSync('HProcName'),
+ HGroupID: uni.getStorageSync('HGroupID'),
+ HGroupName: uni.getStorageSync('HGroupName'),
+ HShiftsID: 0,
+ HShiftsName: '',
HMouldID: 0,
HMouldName: '',
HMouldNumber: '',
HMouldNo: '',
HMouldState: '',
HEquipID: 0,
+ HEquipNumber: '',
HEquipName: '',
- HSourceID: uni.getStorageSync('HSourceID'),
- HSourceName: uni.getStorageSync('HSourceName'),
- HProcID: uni.getStorageSync('HProcID'),
- HProcName:uni.getStorageSync('HProcName'),
- HGroupID:uni.getStorageSync('HGroupID'),
- HGroupName: uni.getStorageSync('HGroupName'),
- HShiftsID: 0,
- HShiftsName: '',
- HDeptName: uni.getStorageSync('HDeptName'),
- HDeptID: uni.getStorageSync('HDeptID'),
- //HEmpID:0,
- //HEmpName:'',
HSignInReason: '',
HSignRemark: '',
+ HMouldRelQty: 0,
+ HOrgID: uni.getStorageSync('OrganizationID'),
- HMaterID: 0,
- HMaterNumber: '',
- HMaterName: '',
- HMaterModel: '',
+ HMaker: '',
+ HMakeDate: '',
+ HUpDater: '',
+ HUpDateDate: '',
+ HChecker: '',
+ HCheckDate: '',
+ HCloseMan: '',
+ HCloseDate: '',
+ HDeleteMan: '',
+ HDeleteDate: '',
+
HRoles: [],
- },
- roleOptions: [],
- // 鍒嗛〉妯″潡鍏冩暟鎹�
- paginationMeta: {
-
+ eventType: 'Add'
+ }
+ }
+ },
+ onLoad(e) {
+ this.HBarCodeFocus = true
+ this.getHDeptList()
+ this.getHEmpList()
+ this.getHSourceList()
+ this.getHGroupList()
+ this.getHShiftsList()
+ this.getHProcList()
+ //鍏堣幏鍙栬鑹插垪琛紝鐒跺悗鑾峰彇鐢ㄦ埛缁戝畾鐨勮鑹�
+ this.getRoleList().then(() => {
+ this.getUserBoundRoles();
+ });
+ this.hform.HMaker = uni.getStorageSync('HUserName')
+ console.log(e, this.userInfo)
+ if (e.linterid) {
+ this.btnType = 3
+ this.linterid = e.linterid
+ this.HBillNo = e.HBillNo
+ } else {
+ this.getNewData()
+ }
+ this.tabs = 0
+ },
+ // ==================== 璁＄畻灞炴�� ====================
+ computed: {
+ // 璁＄畻琛ㄦ牸楂樺害
+ listTableHeight: {
+ get() {
+ return this.bottomBtnTop - this.listTableTop - 10
}
}
},
methods: {
- onCardCheckChange(item, index) {
- item.checked = !item.checked;
- if (item.checked) {
- this.selectedRows.push(item);
- } else {
- const idx = this.selectedRows.findIndex(row => row.index === item.index);
- if (idx > -1) {
- this.selectedRows.splice(idx, 1);
- }
- }
- console.log('褰撳墠閫変腑鐨勮:', this.selectedRows);
- },
- onTableRowClickHandler(row, index) {
- console.log('row: ', row);
- if (!this.listData[index].checked) {
- this.$set(this.listData[index], 'checked', true)
- } else {
- this.listData[index].checked = !this.listData[index].checked
- }
+ //鎵爜
+ toScanCode() {
+ var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+ mpaasScanModule.mpaasScan({
+ 'hideAlbum': true,
+ 'timeoutInterval': '10', //瓒呮椂鏃堕棿
+ 'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ }, (ret) => {
+ console.log(ret.resp_result)
+ this.hform.HBarCode = ret.resp_result
+ this.getHBarCodeData(ret.resp_result)
+ })
},
- async HBarCodeFocusRefresh() {
- this.HBarCode = ''
+ //鍏夋爣
+ async refreshBarCodeState() {
this.HBarCodeFocus = false
- await this.$nextTick()
- this.HBarCodeFocus = true
+ await this.$nextTick(() => {
+ this.HBarCodeFocus = true
+ this.hform.HBarCode = ""
+ })
},
- async HBarCodePackFocusRefresh() {
- this.HBarCode_Pack = ''
- this.HBarCodePackFocus = false
- await this.$nextTick()
- this.HBarCodePackFocus = true
+ // 娣诲姞涓�涓噸鏂拌仛鐒︾殑鏂规硶
+ reFocusBarCode() {
+ this.HBarCodeFocus = false;
+ this.$nextTick(() => {
+ this.HBarCodeFocus = true;
+ });
},
- //#region 涓嬫媺妗�
- //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
- async getHDeptList() {
- try{
- let res = await CommonUtils.doRequest2Async({
- url: '/PublicPageMethod/DeptList',
- data: {
- sWhere: "where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + uni.getStorageSync(
- 'OrganizationID') + ""
- },
- })
-
- console.log('res: ', res);
- if (res.data.count == 1) {
- console.log('res.data.data: ', res.data.data);
- this.HDeptNameList = res.data.data
- // for (var i = 0; i < res.data.data.length; i++) {
- // this.arrayHDeptName[i] = res.data.data[i].HName
- // }
- this.arrayHDeptName = res.data.data.map(item => item.HName)
- this.$forceUpdate();
- } else {
+ //鏃ユ湡
+ HDateChange(e) {
+ console.log(e.detail.value)
+ this.hform.HDate = e.detail.value
+ },
+ getHBarCodeData(HBarCode) {
+ uni.request({
+ url: this.serverUrl + '/Sc_EmployeeSignInNoteBillController/txtHBarCode_KeyDown',
+ data: {
+ HBarCode: this.hform.HBarCode
+ },
+ success: (res) => {
+ if (res.data.code == 1) {
+ var data = res.data.data[0];
+ this.hform.HEquipID = data.HInterID
+ this.hform.HEquipNumber = data.璁惧浠ｇ爜
+ this.hform.HEquipName = data.璁惧鍚嶇О
+ this.hform.HSourceID = data.HSourceID
+ this.hform.HSourceName = data.鐢熶骇璧勬簮鍚嶇О
+ this.getHMouldList()
+ this.getHIcmoList()
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
uni.showToast({
- title: res.data.Message,
+ title: '鎺ュ彛璇锋眰澶辫触',
icon: 'none'
})
- }
- }catch(err) {
- uni.showToast({
- title: err,
- icon: 'none'
- })
- }
-
+ },
+ });
+ },
+ //鑾峰彇妯″叿淇℃伅
+ getHMouldList() {
+ uni.request({
+ url: this.serverUrl + '/Sc_EmployeeSignInNoteBillController/Get_HMouldList',
+ data: {
+ HInterID: this.hform.HEquipID,
+ UserNmae: uni.getStorageSync('Czybm'),
+ },
+ success: (res) => {
+ if (res.data.code == 1) {
+ var data = res.data.data[0];
+ this.hform.HMouldID = data.妯″叿id
+ this.hform.HMouldNo = data.妯″叿缂栫爜
+ this.hform.HMouldName = data.妯″叿鍚嶇О
+ this.hform.HMouldState = data.妯″叿鐘舵��
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //鑾峰彇鐢熶骇宸ュ崟
+ getHIcmoList() {
+ uni.request({
+ url: this.serverUrl + '/Sc_EmployeeSignInNoteBillController/Get_HIcmoList',
+ data: {
+ HInterID: this.hform.HSourceID,
+ UserNmae: uni.getStorageSync('Czybm'),
+ },
+ success: (res) => {
+ if (res.data.code == 1) {
+ var data = res.data.data;
+ console.log(data)
+ for (let i = 0; i < data.length; i++) {
+ this.listData.push(Object.assign(data[i], {
+ index: i
+ }))
+ }
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+ getHDeptList() {
+ uni.request({
+ url: this.serverUrl + '/PublicPageMethod/DeptList',
+ data: {
+ sWhere: "where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + uni.getStorageSync(
+ 'OrganizationID') + ""
+ },
+ 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].HName
+ }
+ this.$forceUpdate();
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
},
//閫夋嫨浣跨敤閮ㄩ棬
HDeptNameChange(e) {
@@ -546,38 +525,35 @@
}
},
//鎿嶄綔鍛樸�佽礋璐ｄ汉
- async getHEmpList() {
- try{
- let res = await CommonUtils.doRequest2Async({
- url: '/Web/GetEmployeeList_Json',
- data: {
- Employee: '',
- HGroupID: 0
- },
- })
-
- console.log('res: ', res);
- if (res.data.count == 1) {
- console.log('res.data.data: ', res.data.data);
- this.HEmpNameList = res.data.data
- // for (var i = 0; i < res.data.data.length; i++) {
- // this.arrayHDeptName[i] = res.data.data[i].HName
- // }
- this.arrayHEmpName = res.data.data.map(item => item.HName)
- this.$forceUpdate();
- } else {
+ getHEmpList() {
+ uni.request({
+ url: this.serverUrl + '/Web/GetEmployeeList_Json',
+ data: {
+ Employee: '',
+ HGroupID: 0
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.HEmpNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHEmpName[i] = res.data.data[i].HName
+ }
+ this.$forceUpdate();
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
uni.showToast({
- title: res.data.Message,
+ title: '鎺ュ彛璇锋眰澶辫触',
icon: 'none'
})
- }
- }catch(err) {
- uni.showToast({
- title: err,
- icon: 'none'
- })
- }
-
+ },
+ });
},
//閫夋嫨鎿嶄綔鍛�
HEmpNameChange(e) {
@@ -587,10 +563,47 @@
}
}
},
-
+ //鐢熶骇璧勬簮
+ getHSourceList() {
+ uni.request({
+ url: this.serverUrl + '/api/newBill/getSourceList',
+ data: {
+ sWhere: " and HUSEORGID = " + uni.getStorageSync('OrganizationID') + ""
+ },
+ success: (res) => {
+ if (res.data.code == 1) {
+ this.HSourceNameList = res.data.data.Gy_Source
+ for (var i = 0; i < res.data.data.Gy_Source.length; i++) {
+ this.arrayHSourceName[i] = res.data.data.Gy_Source[i].鐢熶骇璧勬簮
+ }
+ this.$forceUpdate();
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ //閫夋嫨鐢熶骇璧勬簮
+ HSourceNameChange(e) {
+ for (var i = 0; i < this.HSourceNameList.length; i++) {
+ if (this.HSourceNameList[i].鐢熶骇璧勬簮 == e) {
+ this.hform.HSourceID = this.HSourceNameList[i].HItemID
+ }
+ }
+ },
//鐝粍
async getHGroupList() {
- try{
+ try {
let res = await CommonUtils.doRequest2Async({
url: '/Gy_Group/list',
data: {
@@ -598,14 +611,11 @@
user: getUserInfo()['Czymc'] || '',
},
})
-
+
console.log('res: ', res);
if (res.data.count > 0) {
console.log('res.data.data: ', res.data.data);
this.HGroupNameList = res.data.data
- // for (var i = 0; i < res.data.data.length; i++) {
- // this.arrayHDeptName[i] = res.data.data[i].HName
- // }
this.arrayHGroupName = res.data.data.map(item => item.鐝粍鍚嶇О)
this.$forceUpdate();
} else {
@@ -614,13 +624,13 @@
icon: 'none'
})
}
- }catch(err) {
+ } catch (err) {
uni.showToast({
title: err,
icon: 'none'
})
}
-
+
},
//閫夋嫨鐝粍
HGroupNameChange(e) {
@@ -630,9 +640,9 @@
}
}
},
- //鐝璫i
+ //鐝
async getHShiftsList() {
- try{
+ try {
let res = await CommonUtils.doRequest2Async({
url: '/Gy_ShiftsController/Get_Gy_WorkShiftList',
data: {
@@ -640,14 +650,11 @@
HMaker: getUserInfo()['Czymc'] || '',
},
})
-
+
console.log('res: ', res);
if (res.data.count > 0) {
console.log('res.data.data: ', res.data.data);
this.HShiftsNameList = res.data.data
- // for (var i = 0; i < res.data.data.length; i++) {
- // this.arrayHDeptName[i] = res.data.data[i].HName
- // }
this.arrayHShiftsName = res.data.data.map(item => item.鐝鍚嶇О)
this.$forceUpdate();
} else {
@@ -656,15 +663,15 @@
icon: 'none'
})
}
- }catch(err) {
+ } catch (err) {
uni.showToast({
title: err,
icon: 'none'
})
}
-
+
},
- //閫夋嫨鐝璫i
+ //閫夋嫨鐝
HShiftsNameChange(e) {
for (var i = 0; i < this.HSourceNameList.length; i++) {
if (this.HSourceNameList[i].鐝鍚嶇О == e) {
@@ -672,52 +679,9 @@
}
}
},
- //鐢熶骇璧勬簮
- async getHSourceList() {
- try{
- let res = await CommonUtils.doRequest2Async({
- url: '/Gy_Source/list',
- data: {
- sWhere: '',
- user: getUserInfo()['Czymc'] || '',
- },
- })
-
- console.log('鐢熶骇璧勬簮res: ', res);
- if (res.data.count > 0) {
- console.log('鐢熶骇璧勬簮res.data.data: ', res.data.data);
- this.HSourceNameList = res.data.data
- // for (var i = 0; i < res.data.data.length; i++) {
- // this.arrayHDeptName[i] = res.data.data[i].HName
- // }
- this.arrayHSourceName = res.data.data.map(item => item.鐢熶骇璧勬簮鍚嶇О)
- this.$forceUpdate();
- } else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- }
- }catch(err) {
- uni.showToast({
- title: err,
- icon: 'none'
- })
- }
-
- },
- //閫夋嫨shengcanziyuan
- HSourceNameChange(e) {
- for (var i = 0; i < this.HSourceNameList.length; i++) {
- if (this.HSourceNameList[i].鐢熶骇璧勬簮鍚嶇О == e) {
- this.hform.HSourceID = this.HSourceNameList[i].HItemID
- console.log("HSourceID涓�",this.hform.HSourceID)
- }
- }
- },
//宸ュ簭
async getHProcList() {
- try{
+ try {
let res = await CommonUtils.doRequest2Async({
url: '/Gy_Process/list',
data: {
@@ -725,14 +689,11 @@
user: getUserInfo()['Czymc'] || '',
},
})
-
+
console.log('宸ュ簭res: ', res);
if (res.data.count > 0) {
console.log('宸ュ簭res.data.data: ', res.data.data);
this.HProcNameList = res.data.data
- // for (var i = 0; i < res.data.data.length; i++) {
- // this.arrayHDeptName[i] = res.data.data[i].HName
- // }
this.arrayHProcName = res.data.data.map(item => item.宸ュ簭鍚嶇О)
this.$forceUpdate();
} else {
@@ -741,13 +702,13 @@
icon: 'none'
})
}
- }catch(err) {
+ } catch (err) {
uni.showToast({
title: err,
icon: 'none'
})
}
-
+
},
//閫夋嫨Proc
HProcNameChange(e) {
@@ -756,72 +717,164 @@
this.hform.HProcID = this.HProcNameList[i].HItemID
}
}
- },
-
-
- // 鑾峰彇瑙掕壊鍒楄〃
- async getRoleList() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: '/Xt_UserGroup/list',
- data: {
- sWhere: '',
- },
- })
-
- console.log('瑙掕壊鍒楄〃res: ', res);
- if (res.data.count > 0) {
- console.log('瑙掕壊鍒楄〃res.data.data: ', res.data.data);
- // 灏嗘帴鍙ｈ繑鍥炵殑鏁版嵁杞崲涓� uni-data-select 闇�瑕佺殑鏍煎紡
- this.roleOptions = res.data.data.map(item => {
+ },
+ // 鑾峰彇鐢ㄦ埛宸茬粦瀹氱殑瑙掕壊
+ async getUserBoundRoles() {
+ try {
+ // 纭繚瑙掕壊鍒楄〃宸插姞杞�
+ if (!this.roleList || this.roleList.length === 0) {
+ console.log('瑙掕壊鍒楄〃鏈姞杞斤紝鍏堝姞杞借鑹插垪琛�');
+ await this.getRoleList();
+ }
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Xt_UserGroup/UserGroupInfoList',
+ data: {
+ sWhere: ' and userid = '+getUserInfo()['Czybm']+''
+ },
+ });
- return {
- value: item.瑙掕壊 ,
- text: item.瑙掕壊
- };
- });
- this.$forceUpdate();
- } else {
- uni.showToast({
- title: res.data.Message || '鑾峰彇瑙掕壊鍒楄〃澶辫触',
- icon: 'none'
- });
- // 濡傛灉鎺ュ彛澶辫触锛屽彲浠ヨ缃粯璁ら�夐」
- this.roleOptions = [];
- }
- } catch(err) {
- uni.showToast({
- title: err.message || '鑾峰彇瑙掕壊鍒楄〃寮傚父',
- icon: 'none'
- });
- // 寮傚父鎯呭喌璁剧疆榛樿閫夐」
- this.roleOptions = [];
- }
- },
- //#endregion
-
-
- toScanCode2() {
- MpaasScan.scanCode((scanCode) => {
- this.HBarCode = scanCode
- GetMeesageByBarCode(scanCode)
- })
- },
- GetMeesageByBarCode(HBarCode) {
- let sBarCode = this.HBarCode
- if (!sBarCode) {
- return uni.showToast({
- icon: 'none',
- title: '鏉＄爜涓嶈兘涓虹┖锛岃鎵弿鏉＄爜锛�',
- })
+ if (res.data.count > 0) {
+
+ // 鎻愬彇瑙掕壊ID
+ const boundRoleIds = res.data.data.map(item => item.GroupId);
+ this.userBoundRoles = boundRoleIds;
+
+ // 灏嗚鑹睮D杞崲涓鸿鑹插悕绉�
+ const boundRoleNames = [];
+ for (const roleId of boundRoleIds) {
+ // 鍦ㄨ鑹插垪琛ㄤ腑鏌ユ壘瀵瑰簲鐨勮鑹�
+ const roleItem = this.roleList.find(r => r.HGroupID == roleId);
+ if (roleItem && roleItem.瑙掕壊) {
+ boundRoleNames.push(roleItem.瑙掕壊);
+ }
+ }
+
+ console.log('鐢ㄦ埛缁戝畾瑙掕壊鍚嶇О: ', boundRoleNames);
+
+ // 濡傛灉鏄柊澧炴ā寮忥紝璁剧疆榛樿閫変腑鐨勮鑹�
+ if (this.btnType == 1) {
+ this.hform.HRoles = boundRoleNames;
+ console.log('宸茶缃粯璁よ鑹�: ', this.hform.HRoles);
+ }
+
+ this.$forceUpdate();
+ } else {
+ // 濡傛灉娌℃湁缁戝畾瑙掕壊锛屾竻绌洪�夋嫨
+ if (this.btnType == 1) {
+ this.hform.HRoles = [];
+ }
+ console.log('鐢ㄦ埛鏈粦瀹氫换浣曡鑹�');
+ }
+ } catch (err) {
+ console.error('鑾峰彇鐢ㄦ埛缁戝畾瑙掕壊澶辫触:', err);
+ uni.showToast({
+ title: err.message || '鑾峰彇鐢ㄦ埛瑙掕壊澶辫触',
+ icon: 'none'
+ });
}
- CommonUtils.doRequest2({
- url: '/Sc_EmployeeSignInNoteBillController/APP_Edit_json',
+ },
+
+ // 鑾峰彇瑙掕壊淇℃伅
+ async getRoleList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Xt_UserGroup/list',
+ data: {
+ sWhere: '',
+ },
+ });
+ if (res.data.count > 0) {
+ console.log('瑙掕壊鍒楄〃res.data.data: ', res.data.data);
+
+ // 淇濆瓨鍘熷瑙掕壊鍒楄〃锛屽寘鍚鑹睮D
+ this.roleList = res.data.data;
+
+ // 鐢熸垚涓嬫媺妗嗛�夐」
+ this.roleOptions = res.data.data.map(item => {
+ return {
+ value: item.瑙掕壊,
+ text: item.瑙掕壊
+ };
+ });
+
+ // 鏇存柊瑙嗗浘
+ this.$forceUpdate();
+
+ // 杩斿洖Promise浠ヤ究閾惧紡璋冪敤
+ return Promise.resolve();
+ } else {
+ uni.showToast({
+ title: res.data.Message || '鑾峰彇瑙掕壊鍒楄〃澶辫触',
+ icon: 'none'
+ });
+
+ // 璁剧疆绌烘暟缁�
+ this.roleList = [];
+ this.roleOptions = [];
+
+ // 杩斿洖Promise浠ヤ究閾惧紡璋冪敤
+ return Promise.reject('鑾峰彇瑙掕壊鍒楄〃澶辫触');
+ }
+ } catch (err) {
+ uni.showToast({
+ title: err.message || '鑾峰彇瑙掕壊鍒楄〃寮傚父',
+ icon: 'none'
+ });
+
+ // 璁剧疆绌烘暟缁�
+ this.roleList = [];
+ this.roleOptions = [];
+
+ // 杩斿洖Promise浠ヤ究閾惧紡璋冪敤
+ return Promise.reject(err);
+ }
+ },
+
+ //鏂板
+ getNewData() {
+ uni.request({
+ url: this.serverUrl + '/Web/GetMAXNum',
data: {
- "HInterID": this.hform.HInterID,
- "HBarCode": sBarCode,
+ HBillType: '4616'
},
-
+ success: (res) => {
+ console.log(res.data)
+ if (res.data.count == 1) {
+ this.hform.HInterID = 0
+ this.hform.HBillNo = res.data.data[0].HBillNo
+ this.hform.HMakeDate = getDateTime.dateTimeStr('y-m-d')
+ this.btnType = 1
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ },
+ submit() {
+ this.hform.HInterID = 0
+ for (let i = 0; i < this.hform.HRoles.length; i++) {
+ this.hform.HSignRemark = this.hform.HSignRemark + this.hform.HRoles[i] + ","
+ }
+ let oMain = JSON.stringify(this.hform);
+ console.log("鎻愪氦鐨刯son", oMain)
+
+ let sMainSub = oMain + ';' + getUserInfo()['OrganizationID'] + ';' + getUserInfo()['Czymc'];
+ CommonUtils.doRequest2({
+ url: "/Sc_EmployeeSignInNoteBillController/SaveBill_APP",
+ data: {
+ "msg": sMainSub
+ },
+ method: "POST",
resFunction: (res) => {
let {
data,
@@ -829,571 +882,151 @@
Message
} = res.data
if (count == 1) {
- //let data=res.data
- console.log(sBarCode)
- console.log(res.data.data[0])
- console.log(res.data[1])
- this.hform.HMouldID = data[0][0].妯″叿id
- this.hform.HMouldNo = data[0][0].妯″叿缂栫爜
- this.hform.HMouldName = data[0][0].妯″叿鍚嶇О
- this.hform.HMouldState = data[0][0].妯″叿鐘舵��
-
- this.listData = []
- let tabledata = data[1][0]
- if (data[1].length > 0) {
- this.hform.HEquipID = tabledata.璁惧鍐呯爜
- this.hform.HEquipName = tabledata.璁惧鍚嶇О
- this.hform.HMaterID = tabledata.HMaterID
- for (let i = 0; i < data[1].length; i++) {
- this.listData.push(Object.assign(data[1][i], {
- index: i
- }))
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + ' 鏄惁缁х画鏂板锛�',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url: '/pages/EmployeeRecords/EmployeeRecordsBill'
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ }
}
- }
- if(data[0][0].妯″叿id===0 && data[0][0].妯″叿缂栫爜===""&& data[0][0].妯″叿鍚嶇О===""&&data[1].length<=0)
- {
- CommonUtils.playSound(0)
- this.listData = []
-
- this.HBarCodeFocusRefresh()
- uni.showToast({
- icon: 'none',
- title: Message
- })
- return;
- }
-
+ });
} else {
- CommonUtils.playSound(0)
- this.listData = []
-
- this.HBarCodeFocusRefresh()
uni.showToast({
icon: 'none',
title: Message
- })
- }
- }
- })
- },
- onRoleChange(e) {
- console.log('閫変腑鐨勮鑹�:', this.hform.HRoles);
- },
-
-
- handleSelect(selected, array) {
- this.selectedRows = array
- },
- handleSelectAll(selected, array) {
- this.selectedRows = array
- },
- getMaxNo() {
- CommonUtils.doRequest2({
- url: "/WEBSController/GetMaxBillNoAndID_Json",
- data: {
- "HBillType": this.HBillType
- },
- resFunction: (d) => {
- let {
- count,
- data,
- Message
- } = d.data
- if (count == 1) {
- this.hform.HInterID = data[0].HInterID;
- this.hform.HBillNo = data[0].HBillNo
- } else {
-
- uni.showModal({
- title: "娓╅Θ鎻愮ず",
- showCancel: false,
- content: Message
-
- })
-
- }
- }
- })
- },
- submitPreCheck() {
- if (CommonUtils.isEmpty(this.hform.HInterID)) {
- uni.showToast({
- icon: 'none',
- title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�'
- })
- return false
- }
- if (CommonUtils.isEmpty(this.hform.HBillNo)) {
- uni.showToast({
- icon: 'none',
- title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�'
- })
- return false
- }
- if (this.listData.length < 1) {
- uni.showToast({
- icon: 'none',
- title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�'
- })
- return false
- }
- return true
- },
- cmdDelete() {
- console.log('this.selectedRows: ', this.selectedRows);
- if (this.selectedRows.length != 1) {
- return uni.showToast({
- icon: 'none',
- title: '璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�'
- })
- }
- uni.showModal({
- title: '鍒犻櫎纭',
- content: '纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠!',
- success: () => {
- if (confirm) {
- CommonUtils.doRequest2({
- url: '/WEBSController/set_DelPackUnionBill_Temp_Pack_Json',
- data: {
- HInterID: this.hform.HInterID,
- HBillType: this.HBillType,
- HBarCode: this.selectedRows[0].HBarCode
- },
- resFunction: (res) => {
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- CommonUtils.playSound(1)
- uni.showToast({
- icon: 'none',
- title: Message
- })
- //this.DisBillEntryList()
- } else {
- CommonUtils.playSound(0)
- uni.showToast({
- icon: 'none',
- title: Message
- })
- }
- }
- })
- }
- }
- })
- },
-
- async cmdSubmit() {
- let checkRes = this.submitPreCheck()
- if (!checkRes) {
- return
- }
- this.EnableSubmit = false
-
- try {
- debugger
- this.hform.HInterID = 0
- for (let i = 0; i < this.hform.HRoles.length; i++) {
- this.hform.HSignRemark = this.hform.HSignRemark + this.hform.HRoles[i] + ","
- }
- let oMain = JSON.stringify(this.hform);
- console.log("鎻愪氦鐨刯son", oMain)
- // this.HBillSub[0].HRepairCheckID = this.hform.HRepairCheckMainID
- // this.HBillSub[0].HManagerID = this.hform.HManagerID
- // this.HBillSub[0].HRepairCheckContent = this.hform.HRepairCheckMainContent
- // let sSubStr = JSON.stringify(this.HBillSub);
- let sMainSub = oMain + ';' + getUserInfo()['OrganizationID'] + ';' + getUserInfo()['Czymc'];
- await CommonUtils.doRequest2({
- url: "/Sc_EmployeeSignInNoteBillController/SaveBill_APP",
- data: {
- "msg": sMainSub
- },
- method: "POST",
- resFunction: async (res) => {
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- // 绛夊緟鏁版嵁鑾峰彇瀹屾垚鍚庡啀鏄剧ず琛ㄦ牸
- await this.getResultTableData();
- } else {
- uni.showToast({
- icon: 'none',
- title: Message
- })
- this.EnableSubmit = true;
- }
- }
- })
- } catch (error) {
- console.error('鎻愪氦澶辫触:', error);
- this.EnableSubmit = true;
- }
- },
- getResultTableData() {
- CommonUtils.doRequest2({
- url: '/Sc_EmployeeSignInNoteBillController/GetListPage',
- data: {
- "sWhere": 'and HEquipID=' + this.hform.HEquipID,
- "user": 'admin'
- },
- resFunction: (res) => {
- console.log('缁撴灉鎺ュ彛杩斿洖:', res);
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- console.log('鑾峰彇鍒扮粨鏋滄暟鎹�:', data);
- this.resultTableData = data;
- this.showResultTable = true; // 鏄剧ず缁撴灉琛ㄦ牸
- console.log('showResultTable 璁剧疆涓�:', this.showResultTable);
- } else {
- uni.showToast({
- icon: 'none',
- title: Message || '鑾峰彇鏁版嵁澶辫触'
})
this.EnableSubmit = true;
}
}
})
},
- // 鏂板鏂规硶
- toAddNew() {
- // 閲嶇疆鏁版嵁锛屽噯澶囨柊澧�
- this.showResultTable = false;
- this.EnableSubmit = true;
- this.resultTableData = [];
- this.HBarCode_Pack = '';
- this.HBarCode = '';
- this.listData = [];
- this.getMaxNo(); // 閲嶆柊鑾峰彇鏂扮殑鍗曟嵁鍙�
- this.HBarCodePackFocusRefresh(); // 閲嶆柊鑱氱劍
- },
-
- // 鍏抽棴缁撴灉琛ㄦ牸
- closeResultTable() {
- this.showResultTable = false;
- uni.navigateBack();
- },
- cmdExit() {
- uni.navigateBack()
- },
- //鎵撳嵃妯″潡鍑芥暟
- /**
- * 鎵撳嵃鍑芥暟
- */
- async search() {
- // #ifndef APP-PLUS
+ goBack() {
uni.showModal({
- content: "涓嶆敮鎸佽摑鐗欐墦鍗板姛鑳斤紝璇峰垏鎹㈢Щ鍔ㄨ澶�...",
- })
- return
- // #endif
- if (this.$printer.isConnected() === false) {
- this.$refs.labelPrinter.openPopup()
- } else {
- let printContent = []
- let printInfoBuffer = []
- let count = 0
- uni.showLoading()
- console.log('this.listData: ', this.printListData);
- for (let listOne of this.printListData) {
- let Message = await this.getPrintTemplate(listOne.HInterID, listOne.HItemID)
- printContent.push(Message)
- count++;
- if (count == 10) {
- printInfoBuffer.push(printContent.join("\r\n"))
- count = 0
- printContent = []
+ title: '鎻愮ず',
+ content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.navigateBack()
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
}
}
- uni.hideLoading()
- printInfoBuffer.push(printContent.join("\r\n"))
- this.printInfo = JSON.stringify(printInfoBuffer)
- printInfoBuffer = []
-
- await this.$nextTick(() => {
- this.$refs.labelPrinter.execPrint()
- })
- }
- },
- /** 鑾峰彇鎵撳嵃妯℃澘
- * @param {Object} HInterID
- * @param {Object} HItemID
- */
- async getPrintTemplate(HInterID, HItemID) {
- console.log('data: ', {
- HOrginationName: uni.getStorageSync("Organization"),
- HBillSubType: this.HBillType,
- HInterID: HInterID,
- HItemID: HItemID,
- })
- return new Promise((resolve, reject) => {
- CommonUtils.doRequest2({
- url: "/Sc_BarCode/Get_BarCodePrintCode_CPCL",
- data: {
- HOrginationName: uni.getStorageSync("Organization"),
- HBillSubType: this.HBillType,
- HInterID: HInterID,
- HItemID: HItemID,
- },
- resFunction: (res) => {
- let {
- Message,
- count
- } = res.data
- if (count == 1) {
- console.log('Message: ', Message);
- resolve(Message)
- } else {
- uni.showToast({
- icon: 'none',
- title: Message
- })
- reject();
- }
- },
- errFunction: (err) => {
- reject();
- },
-
- })
- })
- },
- /**
- * 鏌ユ壘鎵撳嵃鏈�
- */
- async searchLabelPrinter() {
- // 鏌ユ壘鎵撳嵃鏈�
- var that = this
- // 浣跨敤openBluetoothAdapter 鎺ュ彛锛屽厤鍘讳富鍔ㄧ敵璇锋潈闄愮殑楹荤儲
- uni.openBluetoothAdapter({
- success: async (res) => {
- await this.checkPermission();
- console.log('start discovery devices');
- this.discoveredDevices = [];
- console.log(res)
- bluetoothTool.discoveryNewDevice();
- this.maskShow = true
- },
- fail: async (e) => {
- console.error(e)
- switch (e.code) {
- case "10009":
- this.showToast("姝よ澶囦笉鏀寔璁惧鎼滅储鍔熻兘!");
- break;
- default:
- console.error(e);
- }
- }
- })
-
- },
- onDevice(device) {
- console.log("鐩戝惉瀵绘壘鍒版柊璁惧鐨勪簨浠�---------------")
- console.log(device)
- if (typeof device === 'undefined') return;
- if (typeof device.name === 'undefined') return;
- console.log(device.name);
- if (device.name === '') return;
- if (device.name === null) return;
- if (device.name.toUpperCase().endsWith('_BLE') ||
- device.name.toUpperCase().endsWith('-LE') ||
- device.name.toUpperCase().endsWith('-BLE')) return;
- const isDuplicate = this.discoveredDevices.find(item => item.address === device.address);
- if (isDuplicate) return;
- this.discoveredDevices.push(device);
- },
- connectBT(device) {
- const vm = this;
- uni.showLoading({
- title: '杩炴帴涓�'
});
- bluetoothTool.connDevice(device.address, (result) => {
- console.log(result)
- uni.hideLoading()
- if (result) {
- // // console.log(result);
- bluetoothTool.cancelDiscovery();
- // console.log(vm.$printer)
- vm.$printer.init(new FakeConnectedDevice());
- vm.connectedDeviceId = device.address;
- uni.showToast({
- icon: 'none',
- title: '杩炴帴鎴愬姛'
- })
- this.maskShow = false
- } else {
- uni.showToast({
- icon: 'none',
- title: '杩炴帴澶辫触'
- })
- }
- });
- },
- stopSearchBT() {
- console.log("鍋滄鎼滃闄勮繎鐨勮摑鐗欏鍥磋澶�---------------")
- bluetoothTool.cancelDiscovery();
- },
- closeBluetooth() {
- console.log("鍋滄钃濈墮杩炴帴")
- const vm = this;
- if (vm.connectedDeviceId != '') {
- bluetoothTool.closeBtSocket();
- vm.connectedDeviceId = "";
- }
- },
-
- },
- computed: {
- listTableHeight: {
- get() {
- return this.bottomBtnTop - this.listTableTop - 10
- }
}
- },
- async onReady() {
- // #ifndef MP-WEIXIN
- let query = uni.createSelectorQuery().in(this)
- query.select("#bottom-btn")
- .boundingClientRect((data) => {
- if (data) {
- this.bottomBtnTop = data.top
- } else {
- console.log("鏈壘鍒�#bottom-btn鑺傜偣");
- }
- })
- .exec();
- query.select("#list-table")
- .boundingClientRect((data) => {
- if (data) {
- this.listTableTop = data.top
- } else {
- console.log("鏈壘鍒�#list-table鑺傜偣");
- }
- })
- .exec();
- // #endif
- },
- onLoad(e) {
- // 1涓� 瑁呯 2涓� 缁勬墭
- this.BarCodeType = e.BarCodeType || 1
- this.OperationType = e.OperationType || 1
-
- this.getHDeptList()
- this.getHEmpList()
- this.getHGroupList()
- this.getHShiftsList()
- this.getHSourceList()
- this.getHProcList()
- this.getRoleList()
- if (this.OperationType == 1) {
- this.getMaxNo()
- } else if (this.OperationType == 2) {
- // this.GetMeesageByBarCode_Pack(this.HBarCode_Pack)
- //this.DisBillEntryList()
- this.tabs = 0
- }
-
-
- // 鍏夋爣榛樿鑱氱劍鍦ㄦ墭鏉＄爜涓�
- this.HBarCodePackFocusRefresh()
}
}
</script>
-<style lang="scss">
- input {
- width: inherit;
- padding: 8rpx 20rpx;
- font-size: 30rpx;
+<style lang="scss" scoped>
+ .form {
+ width: 668rpx;
+ margin: 20rpx auto;
+ padding-bottom: 240rpx;
}
- .uni-mask {
- position: fixed;
- top: 0;
- left: 0;
- bottom: 0;
- z-index: 3;
+ .tab_area {
+ width: 100%;
+ height: 50rpx;
+ }
+
+ .other {
+ margin-top: 8rpx;
+ text-align: center;
+ font-size: 28rpx;
+ padding: 4rpx 18rpx;
+ color: #1890FF;
+ }
+
+ .form-item {
display: flex;
align-items: center;
- width: 100%;
- background: rgba(0, 0, 0, 0.6);
- padding: 0 30rpx;
- box-sizing: border-box;
+ font-size: 30rpx;
+ padding: 6rpx 0;
+
+ .title {
+ width: 208rpx;
+
+ text {
+ color: red;
+ font-weight: bold;
+ }
+ }
+
+ .right {
+ width: 450rpx;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ }
+
+ .righton {
+ width: 450rpx;
+ border-radius: 22rpx;
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
+
+ input {
+ width: 100%;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+
+ textarea {
+ width: 98%;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+
}
- .form {
- display: flex;
- flex-direction: column;
- gap: 20rpx;
+ .bottom-btn {
+ width: 100%;
+ // height: 120rpx;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ background-color: #fff;
+ box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+ padding: 30rpx 40rpx 40rpx 40rpx;
- .form-base-info {
- display: flex;
- flex-direction: column;
- gap: 10rpx;
- box-sizing: border-box;
- padding: 30rpx;
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
}
- .bill-info {
- display: flex;
- flex-direction: column;
- gap: 10rpx;
- box-sizing: border-box;
- padding: 16rpx 30rpx;
- background-color: #fff;
+ .btn-a {
+ background-color: #3A78FF;
+ color: #fff;
}
- .form-item {
- display: flex;
- align-items: center;
- font-size: 30rpx;
- padding: 6rpx 0;
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
- .title {
- width: 208rpx;
+ .btn-c {
+ background-color: #FFA500;
+ color: #fff;
+ position: absolute;
+ right: 120rpx;
+ }
- text {
- color: red;
- font-weight: bold;
- }
- }
-
- .right {
- flex: 1;
- border-radius: 22rpx;
- border: 1px solid #acacac;
- }
-
- .righton {
- width: 450rpx;
- border-radius: 22rpx;
- border: 1px solid #e4e4e4;
- background-color: #e4e4e4;
- }
-
- input {
- // width: 100%;
- padding: 8rpx 20rpx;
- font-size: 30rpx;
- }
-
-
-
- textarea {
- width: 98%;
- padding: 8rpx 20rpx;
- font-size: 30rpx;
- }
-
+ .btn-d {
+ background-color: #ff8901;
+ color: #fff;
}
}
@@ -1417,224 +1050,4 @@
border-bottom: 3px solid #3a78ff;
}
}
-
- .machine-info-container {
- padding-left: 40rpx;
- /* 鍚戝彸绉诲姩40rpx */
- padding-right: 40rpx;
- padding-top: 20rpx;
-
- .form-item {
- display: flex;
- align-items: center;
- font-size: 30rpx;
- padding: 10rpx 0;
-
- .title {
- width: 220rpx;
- /* 绋嶅井鍔犲鏍囬瀹藉害 */
- min-width: 220rpx;
- color: #333;
- }
-
- .righton {
- flex: 1;
- border-radius: 22rpx;
- border: 1px solid #e4e4e4;
- background-color: #f8f8f8;
-
- input {
- width: 100%;
- padding: 12rpx 20rpx;
- font-size: 30rpx;
- color: #666;
- }
- }
- }
- }
-
- .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;
- }
-
- .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;
- }
- }
-
- .result-modal {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- z-index: 2;
-
- .modal-mask {
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- background: rgba(0, 0, 0, 0.5);
- }
-
- .modal-content {
- position: absolute;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
- width: 90%;
- max-width: 700rpx;
- background: #fff;
- border-radius: 20rpx;
- overflow: hidden;
-
- .modal-header {
- padding: 30rpx;
- border-bottom: 1px solid #eee;
- display: flex;
- justify-content: space-between;
- align-items: center;
-
- .modal-title {
- font-size: 32rpx;
- font-weight: bold;
- }
- }
-
- .modal-body {
- padding: 30rpx;
- max-height: 60vh;
- overflow-y: auto;
- }
-
- .modal-footer {
- padding: 30rpx;
- border-top: 1px solid #eee;
- display: flex;
- align-items: center;
- }
- }
- }
- .work-order-cards {
- padding: 30rpx;
- display: flex;
- flex-direction: column;
- gap: 20rpx;
-
- .work-order-card {
- background: #fff;
- border-radius: 16rpx;
- padding: 24rpx;
- box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
- border: 1px solid #e8e8e8;
-
- .card-header {
- display: flex;
- justify-content: space-between;
- align-items: center;
- padding-bottom: 20rpx;
- border-bottom: 1px solid #f0f0f0;
- margin-bottom: 20rpx;
-
- .card-title {
- font-size: 32rpx;
- font-weight: bold;
- color: #333;
- }
- }
-
- .card-content {
- .card-row {
- display: flex;
- align-items: center;
- padding: 12rpx 0;
- border-bottom: 1px dashed #f5f5f5;
-
- &:last-child {
- border-bottom: none;
- }
-
- .card-label {
- width: 160rpx;
- font-size: 28rpx;
- color: #666;
- flex-shrink: 0;
- }
-
- .card-value {
- flex: 1;
- font-size: 28rpx;
- color: #333;
- word-break: break-all;
- }
- }
- }
-
- &:hover {
- box-shadow: 0 4rpx 16rpx rgba(58, 120, 255, 0.15);
- border-color: #3a78ff;
- }
- }
-
- .empty-card {
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- padding: 80rpx 30rpx;
- background: #f8f9fa;
- border-radius: 16rpx;
- border: 2rpx dashed #dcdfe6;
-
- .empty-text {
- font-size: 30rpx;
- color: #999;
- margin-top: 20rpx;
- margin-bottom: 10rpx;
- }
-
- .empty-tip {
- font-size: 26rpx;
- color: #ccc;
- }
- }
- }
</style>
\ No newline at end of file
diff --git a/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue b/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue
index 4da4cad..d23b2f2 100644
--- a/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue
+++ b/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue
@@ -145,6 +145,7 @@
</view>
<view class="op" v-if="operations == item.hmainid">
+ <button class="op1" v-if="activeTab == 0" size="mini" plain @tap.stop="pushBill(0,item)">涓嬫帹淇濆吇鍗�</button>
<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
</uni-card>
@@ -180,7 +181,7 @@
activeTab: 0,
tabs: [{
- label: '浠婃棩寰呬繚鍏�',
+ label: '杩戞棩寰呬繚鍏�',
type: 0,
count: 0,
listData: [], // 娣诲姞杩欎釜
@@ -191,7 +192,7 @@
}
},
{
- label: '浠婃棩宸蹭繚鍏�',
+ label: '杩戞棩宸蹭繚鍏�',
type: 1,
count: 0,
listData: [], // 娣诲姞杩欎釜
@@ -202,7 +203,7 @@
}
},
{
- label: '浠婃棩鍏ㄩ儴浠诲姟',
+ label: '杩戞棩鍏ㄩ儴浠诲姟',
type: 2,
count: 0,
listData: [], // 娣诲姞杩欎釜
@@ -221,9 +222,9 @@
},
dateRangePicker: ["浠绘剰闂撮殧", "浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"],
- curDateGap: "浠婂ぉ",
+ curDateGap: "杩戜竷澶�",
enableCustomDateRange: false,
- startDate: dayjs(new Date()).format('YYYY-MM-DD'),
+ startDate: dayjs(new Date()).subtract(7, 'days').format('YYYY-MM-DD'),
endDate: dayjs(new Date()).format('YYYY-MM-DD'),
HBillNo: '',
@@ -268,6 +269,14 @@
// #endif
},
methods: {
+ pushBill(currTab, item) {
+ let Query = `?operationType=4&HBarCode=${item['璁惧浠ｇ爜']}`
+ if(currTab == 0) {
+ uni.navigateTo({
+ url: '/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill' + Query
+ })
+ }
+ },
goTop: function(e) {
// 瑙ｅ喅view灞備笉鍚屾鐨勯棶棰�
this.scrollTop = this.old.scrollTop
@@ -335,9 +344,9 @@
},
clear() {
- this.curDateGap = "浠婂ぉ"
+ this.curDateGap = "杩�7澶�"
this.enableCustomDateRange = false
- this.startDate = dayjs(new Date()).format('YYYY-MM-DD')
+ this.startDate = dayjs(new Date()).subtract(7, 'days').format('YYYY-MM-DD')
this.endDate = dayjs(new Date()).format('YYYY-MM-DD')
this.HBillNo = ''
},
diff --git a/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport.vue b/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport.vue
index 87bc93b..cfba498 100644
--- a/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport.vue
+++ b/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport.vue
@@ -1,627 +1,637 @@
<template>
- <view>
- <view class="page-header">
- <view class="search-item">
- <view class="left">鏃ユ湡闂撮殧</view>
- <view class="right">
- <picker mode="selector" :value="curDateGap" :range="dateRangePicker"
- @change="onDateRangePickerChangeHandler">
- <input disabled v-model="curDateGap" placeholder="璇烽�夋嫨鏃ユ湡闂撮殧" />
- <view class="picker-overlay"></view>
- </picker>
+ <view>
+ <view class="page-header">
+ <view class="search-item">
+ <view class="left">鏃ユ湡闂撮殧</view>
+ <view class="right">
+ <picker mode="selector" :value="curDateGap" :range="dateRangePicker"
+ @change="onDateRangePickerChangeHandler">
+ <input disabled v-model="curDateGap" placeholder="璇烽�夋嫨鏃ユ湡闂撮殧" />
+ <view class="picker-overlay"></view>
+ </picker>
- </view>
- </view>
- <view class="search-item">
- <view class="left">寮�濮嬫棩鏈�</view>
- <view class="right">
- <uni-datetime-picker :clear-icon="false" type="date" v-model="startDate"
- :disabled="!enableCustomDateRange">
- <view class="datetime-picker-inner"
- :class="enableCustomDateRange?'font__enable':'font__disable'">
- <text>{{ startDate }}</text>
- </view>
- </uni-datetime-picker>
- </view>
- </view>
- <view class="search-item">
- <view class="left">缁撴潫鏃ユ湡</view>
- <view class="right">
- <uni-datetime-picker :clear-icon="false" type="date" v-model="endDate"
- :disabled="!enableCustomDateRange">
- <view class="datetime-picker-inner"
- :class="enableCustomDateRange?'font__enable':'font__disable'">{{ endDate }}</view>
- </uni-datetime-picker>
- </view>
- </view>
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">寮�濮嬫棩鏈�</view>
+ <view class="right">
+ <uni-datetime-picker :clear-icon="false" type="date" v-model="startDate"
+ :disabled="!enableCustomDateRange">
+ <view class="datetime-picker-inner"
+ :class="enableCustomDateRange?'font__enable':'font__disable'">
+ <text>{{ startDate }}</text>
+ </view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">缁撴潫鏃ユ湡</view>
+ <view class="right">
+ <uni-datetime-picker :clear-icon="false" type="date" v-model="endDate"
+ :disabled="!enableCustomDateRange">
+ <view class="datetime-picker-inner"
+ :class="enableCustomDateRange?'font__enable':'font__disable'">{{ endDate }}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
- <view class="button-groups">
- <button type="default" size="mini" class="btn-c" @tap.stop="onSearchClickHandler">鏌ヨ</button>
- <button type="default" size="mini" class="btn-a" @tap.stop="onResetClickHandler">閲嶇疆</button>
- </view>
- </view>
+ <view class="button-groups">
+ <button type="default" size="mini" class="btn-c" @tap.stop="onSearchClickHandler">鏌ヨ</button>
+ <button type="default" size="mini" class="btn-a" @tap.stop="onResetClickHandler">閲嶇疆</button>
+ </view>
+ </view>
- <!-- 椤电鍖哄煙 -->
- <view class="tab-container">
- <view class="tab-list">
- <view v-for="(tab, index) in tabs" :key="index" :class="['tab-item', { 'active': activeTab === index }]"
- @tap="switchTab(index)">
- <text>{{ tab.label }}</text>
- <text v-if="tab.count > 0" class="tab-count">{{ tab.count }}</text>
- </view>
- </view>
- </view>
+ <!-- 椤电鍖哄煙 -->
+ <view class="tab-container">
+ <view class="tab-list">
+ <view v-for="(tab, index) in tabs" :key="index" :class="['tab-item', { 'active': activeTab === index }]"
+ @tap="switchTab(index)">
+ <text>{{ tab.label }}</text>
+ <text v-if="tab.count > 0" class="tab-count">{{ tab.count }}</text>
+ </view>
+ </view>
+ </view>
- <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+ <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
- <!-- 椤电鍐呭鍖哄煙 -->
- <scroll-view v-for="(tab, tabIndex) in tabs" :key="tabIndex" v-show="activeTab === tabIndex" id="pageContent"
- scroll-y class="page-content" :style="{height: pageContentHeight + 'px'}">
- <view class="list" v-for="(item,index) in tab.listData" :key="index">
- <uni-card :title="item.鍣ㄥ叿鍙�" :extra="item.鍣ㄥ叿淇濆吇璁″垝鍗曞彿" style="margin: 10px;"
- @tap="showDetail = showDetail==item.hmainid?-1:item.hmainid">
- <view class="card-detail">
- <view class="detail" v-if="item.鍣ㄥ叿鍚嶇О">
- <text>鍣ㄥ叿鍚嶇О锛�</text>{{item.鍣ㄥ叿鍚嶇О}}
- </view>
- <view class="detail" v-if="item.鍣ㄥ叿瑙勬牸">
- <text>鍣ㄥ叿瑙勬牸锛�</text>{{item.鍣ㄥ叿瑙勬牸}}
- </view>
- <view class="detail" v-if="item.鍣ㄥ叿鍨嬪彿">
- <text>鍣ㄥ叿鍨嬪彿锛�</text>{{item.鍣ㄥ叿鍨嬪彿}}
- </view>
- <view class="detail" v-if="item.淇濆吇鍛ㄦ湡">
- <text>淇濆吇鍛ㄦ湡锛�</text>{{item.淇濆吇鍛ㄦ湡}}
- </view>
- <view class="detail" v-if="item.鎽樿">
- <text>鎽樿锛�</text>{{item.鎽樿}}
- </view>
- <view class="detail" v-if="item.淇濆吇璐熻矗浜�">
- <text>淇濆吇璐熻矗浜猴細</text>{{item.淇濆吇璐熻矗浜簘}
- </view>
- <view class="detail" v-if="item.鏄惁淇濆吇">
- <text>鏄惁淇濆吇锛�</text>{{item.鏄惁淇濆吇}}
- </view>
- <view class="detail" v-if="item.璁″垝寮�濮嬫椂闂寸偣">
- <text>璁″垝寮�濮嬫椂闂寸偣锛�</text>{{item.璁″垝寮�濮嬫椂闂寸偣.substr(0,10)}}
- </view>
- <view class="detail" v-if="item.璁″垝缁撴潫鏃堕棿鐐�">
- <text>璁″垝缁撴潫鏃堕棿鐐癸細</text>{{item.璁″垝缁撴潫鏃堕棿鐐�.substr(0,10)}}
- </view>
- </view>
- <view class="card-detail" v-if="showDetail == item.hmainid">
- <view class="detail" v-if="item.鍒跺崟浜�">
- <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
- </view>
- <view class="detail" v-if="item.鍒跺崟鏃ユ湡">
- <text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
- </view>
- <view class="detail" v-if="item.瀹℃牳浜�">
- <text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
- </view>
- <view class="detail" v-if="item.瀹℃牳鏃ユ湡">
- <text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
- </view>
- <view class="detail" v-if="item.淇敼浜�">
- <text>淇敼浜猴細</text>{{item.淇敼浜簘}
- </view>
- <view class="detail" v-if="item.淇敼鏃ユ湡">
- <text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
- </view>
- <view class="detail" v-if="item.鍏抽棴浜�">
- <text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
- </view>
- <view class="detail" v-if="item.鍏抽棴鏃ユ湡">
- <text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
- </view>
- <view class="detail" v-if="item.浣滃簾浜�">
- <text>浣滃簾浜猴細</text>{{item.浣滃簾浜簘}
- </view>
- <view class="detail" v-if="item.浣滃簾鏃ユ湡">
- <text>浣滃簾鏃ユ湡锛�</text>{{item.浣滃簾鏃ユ湡.substr(0,10)}}
- </view>
- </view>
+ <!-- 椤电鍐呭鍖哄煙 -->
+ <scroll-view v-for="(tab, tabIndex) in tabs" :key="tabIndex" v-show="activeTab === tabIndex" id="pageContent"
+ scroll-y class="page-content" :style="{height: pageContentHeight + 'px'}">
+ <view class="list" v-for="(item,index) in tab.listData" :key="index">
+ <uni-card :title="item.鍣ㄥ叿鍙�" :extra="item.鍣ㄥ叿淇濆吇璁″垝鍗曞彿" style="margin: 10px;"
+ @tap="showDetail = showDetail==item.hmainid?-1:item.hmainid">
+ <view class="card-detail">
+ <view class="detail" v-if="item.鍣ㄥ叿鍚嶇О">
+ <text>鍣ㄥ叿鍚嶇О锛�</text>{{item.鍣ㄥ叿鍚嶇О}}
+ </view>
+ <view class="detail" v-if="item.鍣ㄥ叿瑙勬牸">
+ <text>鍣ㄥ叿瑙勬牸锛�</text>{{item.鍣ㄥ叿瑙勬牸}}
+ </view>
+ <view class="detail" v-if="item.鍣ㄥ叿鍨嬪彿">
+ <text>鍣ㄥ叿鍨嬪彿锛�</text>{{item.鍣ㄥ叿鍨嬪彿}}
+ </view>
+ <view class="detail" v-if="item.淇濆吇鍛ㄦ湡">
+ <text>淇濆吇鍛ㄦ湡锛�</text>{{item.淇濆吇鍛ㄦ湡}}
+ </view>
+ <view class="detail" v-if="item.鎽樿">
+ <text>鎽樿锛�</text>{{item.鎽樿}}
+ </view>
+ <view class="detail" v-if="item.淇濆吇璐熻矗浜�">
+ <text>淇濆吇璐熻矗浜猴細</text>{{item.淇濆吇璐熻矗浜簘}
+ </view>
+ <view class="detail" v-if="item.鏄惁淇濆吇">
+ <text>鏄惁淇濆吇锛�</text>{{item.鏄惁淇濆吇}}
+ </view>
+ <view class="detail" v-if="item.璁″垝寮�濮嬫椂闂寸偣">
+ <text>璁″垝寮�濮嬫椂闂寸偣锛�</text>{{item.璁″垝寮�濮嬫椂闂寸偣.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.璁″垝缁撴潫鏃堕棿鐐�">
+ <text>璁″垝缁撴潫鏃堕棿鐐癸細</text>{{item.璁″垝缁撴潫鏃堕棿鐐�.substr(0,10)}}
+ </view>
+ </view>
+ <view class="card-detail" v-if="showDetail == item.hmainid">
+ <view class="detail" v-if="item.鍒跺崟浜�">
+ <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ </view>
+ <view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+ <text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.瀹℃牳浜�">
+ <text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
+ </view>
+ <view class="detail" v-if="item.瀹℃牳鏃ユ湡">
+ <text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.淇敼浜�">
+ <text>淇敼浜猴細</text>{{item.淇敼浜簘}
+ </view>
+ <view class="detail" v-if="item.淇敼鏃ユ湡">
+ <text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.鍏抽棴浜�">
+ <text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
+ </view>
+ <view class="detail" v-if="item.鍏抽棴鏃ユ湡">
+ <text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.浣滃簾浜�">
+ <text>浣滃簾浜猴細</text>{{item.浣滃簾浜簘}
+ </view>
+ <view class="detail" v-if="item.浣滃簾鏃ユ湡">
+ <text>浣滃簾鏃ユ湡锛�</text>{{item.浣滃簾鏃ユ湡.substr(0,10)}}
+ </view>
+ </view>
- <view class="more" v-if="showDetail == item.hmainid && operations != item.hmainid">
- <view class="part" style="border-right: 1px solid #eee;">
- <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
- </view>
- <view class="part" @tap.stop="operations = operations==item.hmainid?-1:item.hmainid">
- <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
- size="14"></uni-icons>鎿嶄綔
- </view>
- </view>
- <view class="more" v-if="showDetail != item.hmainid && operations != item.hmainid">
- <view class="part" style="border-right: 1px solid #eee;">
- <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
- </view>
- <view class="part" @tap.stop="operations = operations==item.hmainid?-1:item.hmainid">
- <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
- size="14"></uni-icons>鎿嶄綔
- </view>
- </view>
+ <view class="more" v-if="showDetail == item.hmainid && operations != item.hmainid">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+ </view>
+ <view class="part" @tap.stop="operations = operations==item.hmainid?-1:item.hmainid">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="more" v-if="showDetail != item.hmainid && operations != item.hmainid">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+ </view>
+ <view class="part" @tap.stop="operations = operations==item.hmainid?-1:item.hmainid">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
- <view class="op" v-if="operations == item.hmainid">
- <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
- </view>
- </uni-card>
- </view>
- <view class="over" v-if="tabs[activeTab].listData.length == 0">鏆傛棤鏁版嵁</view>
- </scroll-view>
+ <view class="op" v-if="operations == item.hmainid">
+ <button class="op1" v-if="activeTab == 0" size="mini" plain
+ @tap.stop="pushBill(0,item)">涓嬫帹淇濆吇鍗�</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="tabs[activeTab].listData.length == 0">鏆傛棤鏁版嵁</view>
+ </scroll-view>
- <!-- 鍒嗛〉鍣� -->
- <view class="page-footer">
- <uni-pagination id="pagination" title="鏍囬鏂囧瓧" v-model="tabs[activeTab].pageMeta.curPage"
- :pageSize="tabs[activeTab].pageMeta.size" :total="tabs[activeTab].pageMeta.total"
- @change="onPageChangeHandler"></uni-pagination>
- </view>
- </view>
+ <!-- 鍒嗛〉鍣� -->
+ <view class="page-footer">
+ <uni-pagination id="pagination" title="鏍囬鏂囧瓧" v-model="tabs[activeTab].pageMeta.curPage"
+ :pageSize="tabs[activeTab].pageMeta.size" :total="tabs[activeTab].pageMeta.total"
+ @change="onPageChangeHandler"></uni-pagination>
+ </view>
+ </view>
</template>
<script>
- import dayjs from 'dayjs'
- import {
- CommonUtils
- } from '@/utils/common.js'
- import {
- getUserInfo
- } from '../../../utils/auth'
- export default {
- data() {
- return {
- // 璁＄畻鍗＄墖鍒楄〃楂樺害
- pagination_top: 0,
- pageContent_top: 0,
+ import dayjs from 'dayjs'
+ import {
+ CommonUtils
+ } from '@/utils/common.js'
+ import {
+ getUserInfo
+ } from '../../../utils/auth'
+ export default {
+ data() {
+ return {
+ // 璁＄畻鍗＄墖鍒楄〃楂樺害
+ pagination_top: 0,
+ pageContent_top: 0,
- // 褰撳墠婵�娲荤殑椤电
- activeTab: 0,
+ // 褰撳墠婵�娲荤殑椤电
+ activeTab: 0,
- tabs: [{
- label: '浠婃棩寰呬繚鍏�',
- type: 0,
- count: 0,
- listData: [], // 娣诲姞杩欎釜
- pageMeta: { // 娣诲姞杩欎釜
- curPage: 1,
- size: 50,
- total: 0,
- }
- },
- {
- label: '浠婃棩宸蹭繚鍏�',
- type: 1,
- count: 0,
- listData: [], // 娣诲姞杩欎釜
- pageMeta: { // 娣诲姞杩欎釜
- curPage: 1,
- size: 50,
- total: 0,
- }
- },
- {
- label: '浠婃棩鍏ㄩ儴浠诲姟',
- type: 2,
- count: 0,
- listData: [], // 娣诲姞杩欎釜
- pageMeta: { // 娣诲姞杩欎釜
- curPage: 1,
- size: 50,
- total: 0,
- }
- }
- ],
+ tabs: [{
+ label: '杩戞棩寰呬繚鍏�',
+ type: 0,
+ count: 0,
+ listData: [], // 娣诲姞杩欎釜
+ pageMeta: { // 娣诲姞杩欎釜
+ curPage: 1,
+ size: 50,
+ total: 0,
+ }
+ },
+ {
+ label: '杩戞棩宸蹭繚鍏�',
+ type: 1,
+ count: 0,
+ listData: [], // 娣诲姞杩欎釜
+ pageMeta: { // 娣诲姞杩欎釜
+ curPage: 1,
+ size: 50,
+ total: 0,
+ }
+ },
+ {
+ label: '杩戞棩鍏ㄩ儴浠诲姟',
+ type: 2,
+ count: 0,
+ listData: [], // 娣诲姞杩欎釜
+ pageMeta: { // 娣诲姞杩欎釜
+ curPage: 1,
+ size: 50,
+ total: 0,
+ }
+ }
+ ],
- // 婊氬姩鎺у埗
- scrollTop: 0,
- old: {
- scrollTop: 0
- },
+ // 婊氬姩鎺у埗
+ scrollTop: 0,
+ old: {
+ scrollTop: 0
+ },
- dateRangePicker: ["浠绘剰闂撮殧", "浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"],
- curDateGap: "浠婂ぉ",
- enableCustomDateRange: false,
- startDate: dayjs(new Date()).format('YYYY-MM-DD'),
- endDate: dayjs(new Date()).format('YYYY-MM-DD'),
- HBillNo: '',
+ dateRangePicker: ["浠绘剰闂撮殧", "浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"],
+ curDateGap: "杩戜竷澶�",
+ enableCustomDateRange: false,
+ startDate: dayjs(new Date()).subtract(7, 'days').format('YYYY-MM-DD'),
+ endDate: dayjs(new Date()).format('YYYY-MM-DD'),
+ HBillNo: '',
- showDetail: -1,
- operations: -1,
- }
- },
- computed: {
- pageContentHeight: {
- get() {
- return (this.pagination_top - this.pageContent_top)
- }
- },
- },
- onLoad() {
- this.onSearchClickHandler()
- },
- onPullDownRefresh() {
- this.onSearchClickHandler()
- },
- async onReady() {
- // #ifndef MP-WEIXIN
- let query = uni.createSelectorQuery().in(this)
- query.select("#pagination")
- .boundingClientRect((data) => {
- if (data) {
- this.pagination_top = data.top
- } else {
- console.log("鏈壘鍒�#pagination鑺傜偣");
- }
- })
- .exec();
- query.select("#pageContent")
- .boundingClientRect((data) => {
- if (data) {
- this.pageContent_top = data.top
- } else {
- console.log("鏈壘鍒�#pageContent鑺傜偣");
- }
- })
- .exec();
- // #endif
- },
- methods: {
- goTop: function(e) {
- // 瑙ｅ喅view灞備笉鍚屾鐨勯棶棰�
- this.scrollTop = this.old.scrollTop
- this.$nextTick(function() {
- this.scrollTop = 0
- });
- },
+ showDetail: -1,
+ operations: -1,
+ }
+ },
+ computed: {
+ pageContentHeight: {
+ get() {
+ return (this.pagination_top - this.pageContent_top)
+ }
+ },
+ },
+ onShow() {
+ this.onSearchClickHandler()
+ },
+ onPullDownRefresh() {
+ this.onSearchClickHandler()
+ },
+ async onReady() {
+ // #ifndef MP-WEIXIN
+ let query = uni.createSelectorQuery().in(this)
+ query.select("#pagination")
+ .boundingClientRect((data) => {
+ if (data) {
+ this.pagination_top = data.top
+ } else {
+ console.log("鏈壘鍒�#pagination鑺傜偣");
+ }
+ })
+ .exec();
+ query.select("#pageContent")
+ .boundingClientRect((data) => {
+ if (data) {
+ this.pageContent_top = data.top
+ } else {
+ console.log("鏈壘鍒�#pageContent鑺傜偣");
+ }
+ })
+ .exec();
+ // #endif
+ },
+ methods: {
+ pushBill(currTab, item) {
+ let Query = `?operationType=4&HBarCode=${item['鍣ㄥ叿缂栧彿']}`
+ if (currTab == 0) {
+ uni.navigateTo({
+ url: '/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill' + Query
+ })
+ }
+ },
+ goTop: function(e) {
+ // 瑙ｅ喅view灞備笉鍚屾鐨勯棶棰�
+ this.scrollTop = this.old.scrollTop
+ this.$nextTick(function() {
+ this.scrollTop = 0
+ });
+ },
- // 鍒囨崲椤电
- switchTab(index) {
- this.activeTab = index
- this.showDetail = -1
- this.operations = -1
- },
+ // 鍒囨崲椤电
+ switchTab(index) {
+ this.activeTab = index
+ this.showDetail = -1
+ this.operations = -1
+ },
- onDateRangePickerChangeHandler({
- detail
- }) {
- this.enableCustomDateRange = false
- this.curDateGap = this.dateRangePicker[detail.value]
- let date = new Date()
- switch (this.curDateGap) {
- case "浠婂ぉ":
- this.startDate = dayjs(date).format("YYYY-MM-DD")
- break;
- case "杩戜竴澶�":
- this.startDate = dayjs(date).subtract(1, 'day').format("YYYY-MM-DD")
- break;
- case "杩戜袱澶�":
- this.startDate = dayjs(date).subtract(2, 'day').format("YYYY-MM-DD")
- break;
- case "杩戜笁澶�":
- this.startDate = dayjs(date).subtract(3, 'day').format("YYYY-MM-DD")
- break;
- case "杩戝洓澶�":
- this.startDate = dayjs(date).subtract(4, 'day').format("YYYY-MM-DD")
- break;
- case "杩戜簲澶�":
- this.startDate = dayjs(date).subtract(5, 'day').format("YYYY-MM-DD")
- break;
- case "杩戝叚澶�":
- this.startDate = dayjs(date).subtract(6, 'day').format("YYYY-MM-DD")
- break;
- case "杩戜竷澶�":
- this.startDate = dayjs(date).subtract(7, 'day').format("YYYY-MM-DD")
- break;
- case "杩�30澶�":
- this.startDate = dayjs(date).subtract(30, 'day').format("YYYY-MM-DD")
- break;
- }
- if (this.curDateGap == '浠绘剰闂撮殧') {
- this.enableCustomDateRange = true
- }
- },
+ onDateRangePickerChangeHandler({
+ detail
+ }) {
+ this.enableCustomDateRange = false
+ this.curDateGap = this.dateRangePicker[detail.value]
+ let date = new Date()
+ switch (this.curDateGap) {
+ case "浠婂ぉ":
+ this.startDate = dayjs(date).format("YYYY-MM-DD")
+ break;
+ case "杩戜竴澶�":
+ this.startDate = dayjs(date).subtract(1, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜袱澶�":
+ this.startDate = dayjs(date).subtract(2, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜笁澶�":
+ this.startDate = dayjs(date).subtract(3, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戝洓澶�":
+ this.startDate = dayjs(date).subtract(4, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜簲澶�":
+ this.startDate = dayjs(date).subtract(5, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戝叚澶�":
+ this.startDate = dayjs(date).subtract(6, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜竷澶�":
+ this.startDate = dayjs(date).subtract(7, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩�30澶�":
+ this.startDate = dayjs(date).subtract(30, 'day').format("YYYY-MM-DD")
+ break;
+ }
+ if (this.curDateGap == '浠绘剰闂撮殧') {
+ this.enableCustomDateRange = true
+ }
+ },
- onSearchClickHandler() {
- let sWhere = ""
- // 鑾峰彇褰撳墠婵�娲荤殑椤电
- const currentTab = this.tabs[this.activeTab]
- sWhere = {
- HBeginDate: this.startDate,
- HEndDate: this.endDate
- }
- this.get_DisplayPage(JSON.stringify(sWhere), currentTab.type)
- },
+ onSearchClickHandler() {
+ let sWhere = ""
+ // 鑾峰彇褰撳墠婵�娲荤殑椤电
+ const currentTab = this.tabs[this.activeTab]
+ sWhere = {
+ HBeginDate: this.startDate,
+ HEndDate: this.endDate
+ }
+ this.get_DisplayPage(JSON.stringify(sWhere), currentTab.type)
+ },
- clear() {
- this.curDateGap = "浠婂ぉ"
- this.enableCustomDateRange = false
- this.startDate = dayjs(new Date()).format('YYYY-MM-DD')
- this.endDate = dayjs(new Date()).format('YYYY-MM-DD')
- this.HBillNo = ''
- },
+ clear() {
+ this.curDateGap = "杩戜竷澶�"
+ this.enableCustomDateRange = false
+ this.startDate = dayjs(new Date()).subtract(7, 'days').format('YYYY-MM-DD')
+ this.endDate = dayjs(new Date()).format('YYYY-MM-DD')
+ this.HBillNo = ''
+ },
- async onResetClickHandler() {
- this.clear()
- await this.$nextTick()
- this.onSearchClickHandler()
- },
+ async onResetClickHandler() {
+ this.clear()
+ await this.$nextTick()
+ this.onSearchClickHandler()
+ },
- get_DisplayPage(sWhere, tabType) {
- CommonUtils.doRequest2({
- url: '/Sb_EquipMaintainTaskReport/MaintainList_APP',
- data: {
- "sWhere": sWhere,
- "user": getUserInfo()["Czymc"],
- },
- resFunction: (res) => {
- let {
- data,
- Message,
- count
- } = res.data
- console.log('res.data: ', res.data)
+ get_DisplayPage(sWhere, tabType) {
+ CommonUtils.doRequest2({
+ url: '/Sc_MouldMaintainTaskReport/MaintainList_APP',
+ data: {
+ "sWhere": sWhere,
+ "user": getUserInfo()["Czymc"],
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ console.log('res.data: ', res.data)
- if (data && data.h_p_Sb_EquipMaintainTaskReport_APP) {
- // 鏇存柊寰呯鍒伴〉绛�
- this.tabs[0].listData = data.h_p_Sb_EquipMaintainTaskReport_APP
- this.tabs[0].pageMeta.total = data.h_p_Sb_EquipMaintainTaskReport_APP.length
- this.tabs[0].count = data.h_p_Sb_EquipMaintainTaskReport_APP.length
- }
+ if (data && data.h_p_Sc_MouldMaintainTaskReport_APP) {
+ // 鏇存柊寰呯鍒伴〉绛�
+ this.tabs[0].listData = data.h_p_Sc_MouldMaintainTaskReport_APP
+ this.tabs[0].pageMeta.total = data.h_p_Sc_MouldMaintainTaskReport_APP.length
+ this.tabs[0].count = data.h_p_Sc_MouldMaintainTaskReport_APP.length
+ }
- if (data && data.h_p_Sb_EquipMaintainTaskReport_APP1) {
- // 鏇存柊寰呭鐞嗛〉绛�
- this.tabs[1].listData = data.h_p_Sb_EquipMaintainTaskReport_APP1
- this.tabs[1].pageMeta.total = data.h_p_Sb_EquipMaintainTaskReport_APP1.length
- this.tabs[1].count = data.h_p_Sb_EquipMaintainTaskReport_APP1.length
- }
+ if (data && data.h_p_Sc_MouldMaintainTaskReport_APP1) {
+ // 鏇存柊寰呭鐞嗛〉绛�
+ this.tabs[1].listData = data.h_p_Sc_MouldMaintainTaskReport_APP1
+ this.tabs[1].pageMeta.total = data.h_p_Sc_MouldMaintainTaskReport_APP1.length
+ this.tabs[1].count = data.h_p_Sc_MouldMaintainTaskReport_APP1.length
+ }
- if (data && data.h_p_Sb_EquipMaintainTaskReport_APP2) {
- // 鏇存柊寰呴獙鏀堕〉绛�
- this.tabs[2].listData = data.h_p_Sb_EquipMaintainTaskReport_APP2
- this.tabs[2].pageMeta.total = data.h_p_Sb_EquipMaintainTaskReport_APP2.length
- this.tabs[2].count = data.h_p_Sb_EquipMaintainTaskReport_APP2.length
- }
+ if (data && data.h_p_Sc_MouldMaintainTaskReport_APP2) {
+ // 鏇存柊寰呴獙鏀堕〉绛�
+ this.tabs[2].listData = data.h_p_Sc_MouldMaintainTaskReport_APP2
+ this.tabs[2].pageMeta.total = data.h_p_Sc_MouldMaintainTaskReport_APP2.length
+ this.tabs[2].count = data.h_p_Sc_MouldMaintainTaskReport_APP2.length
+ }
-
- uni.stopPullDownRefresh()
- }
- })
- },
- onPageChangeHandler() {
- this.onSearchClickHandler()
- this.goTop()
- },
- },
- }
+ uni.stopPullDownRefresh()
+ }
+ })
+ },
+
+ onPageChangeHandler() {
+ this.onSearchClickHandler()
+ this.goTop()
+ },
+ },
+ }
</script>
<style lang="scss">
- .page-header {
- display: flex;
- box-sizing: border-box;
- padding: 20rpx;
- flex-direction: column;
- gap: 10rpx;
- font-size: 32rpx;
+ .page-header {
+ display: flex;
+ box-sizing: border-box;
+ padding: 20rpx;
+ flex-direction: column;
+ gap: 10rpx;
+ font-size: 32rpx;
- .search-item {
- display: flex;
- flex-direction: row;
- gap: 10rpx;
- justify-content: center;
- align-items: center;
+ .search-item {
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: center;
+ align-items: center;
- .left {
- width: 4em;
- }
+ .left {
+ width: 4em;
+ }
- .right {
- flex: 1;
- position: relative;
- border-radius: 22rpx;
- border: 1px solid #acacac;
- display: flex;
- padding: 4rpx 10rpx;
+ .right {
+ flex: 1;
+ position: relative;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ display: flex;
+ padding: 4rpx 10rpx;
- picker {
- width: 100%;
- }
- }
- }
+ picker {
+ width: 100%;
+ }
+ }
+ }
- input {
- width: inherit;
- padding: 8rpx 20rpx;
- font-size: 30rpx;
- }
+ input {
+ width: inherit;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
- .datetime-picker-inner {
- padding: 8rpx 20rpx;
- font-size: 30rpx;
- display: flex;
- align-items: center;
- }
+ .datetime-picker-inner {
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ display: flex;
+ align-items: center;
+ }
- .font__enable {
- color: #000;
- }
+ .font__enable {
+ color: #000;
+ }
- .font__disable {
- color: #cccccc;
- }
- }
+ .font__disable {
+ color: #cccccc;
+ }
+ }
- .button-groups {
- box-sizing: border-box;
- padding: 10rpx 0 0 0;
- display: flex;
- flex-direction: row;
- gap: 10rpx;
- justify-content: space-between;
+ .button-groups {
+ box-sizing: border-box;
+ padding: 10rpx 0 0 0;
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: space-between;
- button {
- border-radius: 50rpx;
- width: 180rpx;
- height: 66rpx;
- line-height: 66rpx;
- font-size: 28rpx;
- }
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
- .btn-a {
- background-color: #acacac;
- color: #fff;
- }
+ .btn-a {
+ background-color: #acacac;
+ color: #fff;
+ }
- .btn-b {
- background-color: #41a863;
- color: #fff;
- }
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
- .btn-c {
- background-color: #3a78ff;
- color: #fff;
- }
- }
+ .btn-c {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+ }
- /* 椤电鏍峰紡 */
- .tab-container {
- background-color: #fff;
- }
+ /* 椤电鏍峰紡 */
+ .tab-container {
+ background-color: #fff;
+ }
- .tab-list {
- display: flex;
- flex-direction: row;
- border-bottom: 1px solid #e5e5e5;
- }
+ .tab-list {
+ display: flex;
+ flex-direction: row;
+ border-bottom: 1px solid #e5e5e5;
+ }
- .tab-item {
- flex: 1;
- padding: 20rpx 0;
- text-align: center;
- font-size: 28rpx;
- color: #666;
- position: relative;
+ .tab-item {
+ flex: 1;
+ padding: 20rpx 0;
+ text-align: center;
+ font-size: 28rpx;
+ color: #666;
+ position: relative;
- &.active {
- color: #3a78ff;
- font-weight: bold;
+ &.active {
+ color: #3a78ff;
+ font-weight: bold;
- &::after {
- content: '';
- position: absolute;
- bottom: 0;
- left: 50%;
- transform: translateX(-50%);
- width: 80rpx;
- height: 4rpx;
- background-color: #3a78ff;
- }
- }
+ &::after {
+ content: '';
+ position: absolute;
+ bottom: 0;
+ left: 50%;
+ transform: translateX(-50%);
+ width: 80rpx;
+ height: 4rpx;
+ background-color: #3a78ff;
+ }
+ }
- .tab-count {
- display: inline-block;
- margin-left: 10rpx;
- padding: 0 12rpx;
- background-color: #ff6b6b;
- color: #fff;
- border-radius: 20rpx;
- font-size: 20rpx;
- min-width: 30rpx;
- text-align: center;
- }
- }
+ .tab-count {
+ display: inline-block;
+ margin-left: 10rpx;
+ padding: 0 12rpx;
+ background-color: #ff6b6b;
+ color: #fff;
+ border-radius: 20rpx;
+ font-size: 20rpx;
+ min-width: 30rpx;
+ text-align: center;
+ }
+ }
- .page-content {
- box-sizing: border-box;
- padding: 10rpx 0;
+ .page-content {
+ box-sizing: border-box;
+ padding: 10rpx 0;
- .card-detail {
- width: 100%;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
- line-height: 120%;
+ .card-detail {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ line-height: 120%;
- .detail {
- font-size: 26rpx;
- margin-bottom: 12rpx;
- color: #555;
- margin-right: 20rpx;
+ .detail {
+ 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;
+ }
+ }
- .op {
- display: flex;
- justify-content: space-around;
- margin-top: 20rpx;
+ .op {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 20rpx;
- button {
- padding: 0;
- width: 150rpx;
- font-size: 25rpx;
+ button {
+ padding: 0;
+ width: 150rpx;
+ font-size: 25rpx;
- &:disabled {
- opacity: 0.5;
- }
- }
+ &:disabled {
+ opacity: 0.5;
+ }
+ }
- .op1 {
- border: 1px solid #41a863;
- color: #41a863;
- }
+ .op1 {
+ border: 1px solid #41a863;
+ color: #41a863;
+ }
- .op2 {
- border: 1px solid #d98d00;
- color: #d98d00;
- }
+ .op2 {
+ border: 1px solid #d98d00;
+ color: #d98d00;
+ }
- .op3 {
- border: 1px solid #3a78ff;
- color: #3a78ff;
- }
+ .op3 {
+ border: 1px solid #3a78ff;
+ color: #3a78ff;
+ }
- .op4 {
- border: 1px solid #da0000;
- color: #da0000;
- }
+ .op4 {
+ border: 1px solid #da0000;
+ color: #da0000;
+ }
- .op5 {
- border: 1px solid #888;
- color: #888;
- }
- }
- }
+ .op5 {
+ border: 1px solid #888;
+ color: #888;
+ }
+ }
+ }
- .over {
- text-align: center;
- padding: 40rpx;
- color: #999;
- font-size: 28rpx;
- }
+ .over {
+ text-align: center;
+ padding: 40rpx;
+ color: #999;
+ font-size: 28rpx;
+ }
- .page-footer {
- position: fixed;
- bottom: 0;
- width: 100%;
- box-sizing: border-box;
- padding: 32rpx 40rpx;
- }
+ .page-footer {
+ position: fixed;
+ bottom: 0;
+ width: 100%;
+ box-sizing: border-box;
+ padding: 32rpx 40rpx;
+ }
</style>
\ No newline at end of file
diff --git a/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue b/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
index 4d08dea..5faca64 100644
--- a/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
+++ b/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
@@ -1,718 +1,764 @@
<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 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="right" v-show="showHMainSourceBillType">
- <picker :range="arrayHMainSourceBillType" @change="HMainSourceBillTypeChange">
+ <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="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>
- </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">
+ <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>
+ </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.HRepairCheckMainID">
- </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 required">缁翠慨璁板綍:</view>
- <view class="right" v-show="hform.HMainSourceBillType != 1">
- <input type="text" v-model="hform.HMouldRepairWorkName"
- :disabled="hform.HMainSourceBillType == -1" placeholder="璇烽�夋嫨缁翠慨璁板綍" />
- </view>
- <view class="icon-wrapper" v-show="hform.HMainSourceBillType != 1"
- :disabled="hform.HMainSourceBillType == -1">
- <uni-icons type="search" size="20" @click="showRepairRecordList"></uni-icons>
- </view>
- <view class="righton" v-show="hform.HMainSourceBillType == 1">
- <input type="text" disabled v-model="hform.HMouldRepairWorkName" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">妯″叿鍚嶇О:</view>
- <view class="righton">
- <input v-model="hform.HMouldName" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">妯″叿瑙勬牸:</view>
- <view class="righton">
- <input v-model="hform.HMouldSpec" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">妯″叿鍨嬪彿:</view>
- <view class="righton">
- <input v-model="hform.HMouldModel" disabled />
- </view>
- </view>
- </view>
- </template>
- <!-- 鍏朵粬淇℃伅 -->
- <template v-if="tabs == 2">
- <view class="form" :style="{
+ </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.HRepairCheckMainID">
+ </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 required">缁翠慨璁板綍:</view>
+ <view class="right" v-show="hform.HMainSourceBillType != 1">
+ <input type="text" v-model="hform.HMouldRepairWorkName"
+ :disabled="hform.HMainSourceBillType == -1" placeholder="璇烽�夋嫨缁翠慨璁板綍" />
+ </view>
+ <view class="icon-wrapper" v-show="hform.HMainSourceBillType != 1"
+ :disabled="hform.HMainSourceBillType == -1">
+ <uni-icons type="search" size="20" @click="showRepairRecordList"></uni-icons>
+ </view>
+ <view class="righton" v-show="hform.HMainSourceBillType == 1">
+ <input type="text" disabled v-model="hform.HMouldRepairWorkName" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">妯″叿鍚嶇О:</view>
+ <view class="righton">
+ <input v-model="hform.HMouldName" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">妯″叿瑙勬牸:</view>
+ <view class="righton">
+ <input v-model="hform.HMouldSpec" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">妯″叿鍨嬪彿:</view>
+ <view class="righton">
+ <input v-model="hform.HMouldModel" 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>
- <!-- 寮瑰嚭妯″叿鏁呴殰鐧昏鍗曠殑閫夋嫨鍒楄〃 -->
- <BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType"
- :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
- </BillListPopupMouldConkBookBillVue>
- <!-- 寮瑰嚭妯″叿缁翠慨璁板綍鍗曠殑閫夋嫨鍒楄〃 -->
- <RepairRecordPopup ref="repairRecordList" :HBillType="hform.HBillType" :HStockOrgID="hform.HStockOrgID">
- </RepairRecordPopup>
- </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>
+ <!-- 寮瑰嚭妯″叿鏁呴殰鐧昏鍗曠殑閫夋嫨鍒楄〃 -->
+ <BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType"
+ :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
+ </BillListPopupMouldConkBookBillVue>
+ <!-- 寮瑰嚭妯″叿缁翠慨璁板綍鍗曠殑閫夋嫨鍒楄〃 -->
+ <RepairRecordPopup ref="repairRecordList" :HBillType="hform.HBillType" :HStockOrgID="hform.HStockOrgID">
+ </RepairRecordPopup>
+ </view>
</template>
<script>
- import dayjs from "dayjs";
- import {
- CommonUtils
- } from "@/utils/common";
- import {
- MpaasScan
- } from "@/utils/mpaasScan.js"
- import {
- getUserInfo
- } from "../../../utils/auth";
- import BillListPopupMouldConkBookBillVue from '../../../components/BillListPopup/BillListPopupMouldConkBookBill.vue';
- import RepairRecordPopup from '../../../components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue';
+ import dayjs from "dayjs";
+ import {
+ CommonUtils
+ } from "@/utils/common";
+ import {
+ MpaasScan
+ } from "@/utils/mpaasScan.js"
+ import {
+ getUserInfo
+ } from "../../../utils/auth";
+ import BillListPopupMouldConkBookBillVue from '../../../components/BillListPopup/BillListPopupMouldConkBookBill.vue';
+ import RepairRecordPopup from '../../../components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue';
- export default {
- components: {
- BillListPopupMouldConkBookBillVue,
- RepairRecordPopup
- },
- name: 'Sc_MouldRepairCheckBill',
- data() {
- return {
- tabs: 0,
- btnTop: 0,
- tabsBottom: 0,
- HModName: "Sc_MouldRepairCheckBill",
- HBillType: '3817',
- operationType: 1,
- enableEdit: true,
+ export default {
+ components: {
+ BillListPopupMouldConkBookBillVue,
+ RepairRecordPopup
+ },
+ name: 'Sc_MouldRepairCheckBill',
+ data() {
+ return {
+ tabs: 0,
+ btnTop: 0,
+ tabsBottom: 0,
+ HModName: "Sc_MouldRepairCheckBill",
+ HBillType: '3817',
+ operationType: 1,
+ enableEdit: true,
- // 鎺у埗婧愬崟绫诲瀷鏄惁鍙紪杈�
- showHMainSourceBillType: true,
- HMainSourceBillType: '妯″叿鏁呴殰鐧昏鍗�',
- arrayHMainSourceBillType: ['妯″叿鏁呴殰鐧昏鍗�'],
- arrayHMainSourceBillTypeID: ['3815'],
+ // 鎺у埗婧愬崟绫诲瀷鏄惁鍙紪杈�
+ showHMainSourceBillType: true,
+ HMainSourceBillType: '妯″叿鏁呴殰鐧昏鍗�',
+ arrayHMainSourceBillType: ['妯″叿鏁呴殰鐧昏鍗�'],
+ arrayHMainSourceBillTypeID: ['3815'],
- HDeptList: [],
- HRepairCheckList: [],
- HEmpList: [],
+ HDeptList: [],
+ HRepairCheckList: [],
+ HEmpList: [],
- hform: {
- "HBillType": 3817,
- "HBarCode": "",
- "HBillNo": "",
- "HInterID": 0,
- "HDate": dayjs(new Date()).format("YYYY-MM-DD"),
- "HInnerBillNo": "",
- "HMouldName": "",
- "HMouldSpec": "",
- "HMouldModel": "",
- "HMouldID": 0,
- "HMainSourceBillType": "3815",
- "HMainSourceInterID": 0,
- "HMainSourceEntryID": 0,
- "HCheckResult": "OK",
- "HEmpName": getUserInfo().HEmpName,
- "HEmpID": getUserInfo().HEmpID,
- "HCheckBeginDate": dayjs(new Date()).format("YYYY-MM-DD"),
- "HDeptName": getUserInfo().HDeptName,
- "HDeptID": getUserInfo().HDeptID,
- "HMainSourceBillNo": "",
- "HManagerName": getUserInfo().HManagerName,
- "HManagerID": getUserInfo().HManagerID,
- "HMouldRepairWorkName": "",
- "HMouldRepairWorkID": 0,
- "HExplanation": "",
- "HRemark": "",
- "HOrgID": uni.getStorageSync("OrganizationID"),
- "HStockOrgID": uni.getStorageSync("OrganizationID"),
- "HMaker": getUserInfo()["Czymc"],
- "HChecker": "",
- "HCloseMan": "",
- "HUpDater": "",
- "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD"),
- "HCheckDate": "",
- "HCloseDate": "",
- "HUpDateDate": "",
- "HDeleteMan": "",
- "HDeleteDate": "",
- "HRepairCheckMainID": 0,
- "HRepairCheckMainContent": "",
- },
- HBillSub: [{ // 鍚庣鎺ュ彛闇�瑕併�傚惁鍒欐暟鎹笉浼氭樉绀哄湪缂撳瓨涓�
- "HRepairCheckID": 0,
- "HRepairCheckCode": "",
- "HRepairCheckName": "",
- "HRepairCheckContent": "",
- "HManagerID": 0,
- "HManagerCode": "",
- "HManagerName": "",
- "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
- }
- }
+ hform: {
+ "HBillType": 3817,
+ "HBarCode": "",
+ "HBillNo": "",
+ "HInterID": 0,
+ "HDate": dayjs(new Date()).format("YYYY-MM-DD"),
+ "HInnerBillNo": "",
+ "HMouldName": "",
+ "HMouldSpec": "",
+ "HMouldModel": "",
+ "HMouldID": 0,
+ "HMainSourceBillType": "3815",
+ "HMainSourceInterID": 0,
+ "HMainSourceEntryID": 0,
+ "HCheckResult": "OK",
+ "HEmpName": getUserInfo().HEmpName,
+ "HEmpID": getUserInfo().HEmpID,
+ "HCheckBeginDate": dayjs(new Date()).format("YYYY-MM-DD"),
+ "HDeptName": getUserInfo().HDeptName,
+ "HDeptID": getUserInfo().HDeptID,
+ "HMainSourceBillNo": "",
+ "HManagerName": getUserInfo().HManagerName,
+ "HManagerID": getUserInfo().HManagerID,
+ "HMouldRepairWorkName": "",
+ "HMouldRepairWorkID": 0,
+ "HExplanation": "",
+ "HRemark": "",
+ "HOrgID": uni.getStorageSync("OrganizationID"),
+ "HStockOrgID": uni.getStorageSync("OrganizationID"),
+ "HMaker": getUserInfo()["Czymc"],
+ "HChecker": "",
+ "HCloseMan": "",
+ "HUpDater": "",
+ "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD"),
+ "HCheckDate": "",
+ "HCloseDate": "",
+ "HUpDateDate": "",
+ "HDeleteMan": "",
+ "HDeleteDate": "",
+ "HRepairCheckMainID": 0,
+ "HRepairCheckMainContent": "",
+ },
+ HBillSub: [{ // 鍚庣鎺ュ彛闇�瑕併�傚惁鍒欐暟鎹笉浼氭樉绀哄湪缂撳瓨涓�
+ "HRepairCheckID": 0,
+ "HRepairCheckCode": "",
+ "HRepairCheckName": "",
+ "HRepairCheckContent": "",
+ "HManagerID": 0,
+ "HManagerCode": "",
+ "HManagerName": "",
+ "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
+ }
+ }
- return {
- Message: "",
- state: true
- }
- },
- addNew() {
- uni.redirectTo({
- url: './Sc_MouldRepairCheckBill?operationType=1'
- })
- },
- goBack() {
- uni.navigateBack()
- },
- showBillList() {
- this.$refs.billList.showPopup()
- },
- showRepairRecordList() {
- if (this.hform.HMouldID === 0) {
- CommonUtils.showTips({
- title: '鎻愮ず',
- message: '璇峰厛閫夋嫨妯″叿'
- });
- return;
- }
- this.$refs.repairRecordList.showPopup(this.hform.HMouldID);
- },
- //閫夋嫨婧愬崟绫诲瀷
- 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
- })
- },
- checkBoxChangeHandler(index, e) {
- let cr = e.detail.value
- if (cr.length == 0) {
- this.HCheckFileList[index]["HDotCheckResult"] = false
- } else {
- this.HCheckFileList[index]["HDotCheckResult"] = true
- }
- },
- //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
- 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')
- }
- })
+ return {
+ Message: "",
+ state: true
+ }
+ },
+ addNew() {
+ uni.redirectTo({
+ url: './Sc_MouldRepairCheckBill?operationType=1'
+ })
+ },
+ goBack() {
+ uni.navigateBack()
+ },
+ showBillList() {
+ this.$refs.billList.showPopup()
+ },
+ showRepairRecordList() {
+ if (this.hform.HMouldID === 0) {
+ CommonUtils.showTips({
+ title: '鎻愮ず',
+ message: '璇峰厛閫夋嫨妯″叿'
+ });
+ return;
+ }
+ this.$refs.repairRecordList.showPopup(this.hform.HMouldID);
+ },
+ //閫夋嫨婧愬崟绫诲瀷
+ 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
+ })
+ },
+ checkBoxChangeHandler(index, e) {
+ let cr = e.detail.value
+ if (cr.length == 0) {
+ this.HCheckFileList[index]["HDotCheckResult"] = false
+ } else {
+ this.HCheckFileList[index]["HDotCheckResult"] = true
+ }
+ },
+ //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+ 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.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.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)
- })
- },
- async GetMessageByBarCode(HBarCode) {
- try {
- let res = await CommonUtils.doRequest2Sync({
- url: "/Sc_PDA_MouldRepairCheckBill/txtHBarCode_KeyDown_List",
- data: {
- HBarCode: HBarCode,
- },
- })
+ 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
+ this.GetMessageByBarCode(cb)
+ })
+ },
+ async GetMessageByBarCode(HBarCode) {
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sc_PDA_MouldRepairCheckBill/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.HMouldID = data[0].hmainid
- this.hform.HMouldName = data[0].妯″叿鍚嶇О
- this.hform.HMouldSpec = data[0].妯″叿鍝佺被
- this.hform.HMouldModel = data[0].妯″叿鍨嬪彿
- this.hform.HQty = 1
+ if (count == 1) {
+ console.log('data: ', data);
+ this.hform.HMouldID = data[0].hmainid
+ this.hform.HMouldName = data[0].妯″叿鍚嶇О
+ this.hform.HMouldSpec = data[0].妯″叿鍝佺被
+ this.hform.HMouldModel = 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
- })
- }
- },
- radioChange({
- detail: {
- value
- }
- }) {
- this.hform.HCheckResult = value
- },
- async getMaxNum() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Web/GetMAXNum",
- data: {
- "HBillType": this.HBillType
- }
- })
+ } 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
- }
+ 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
+ }
- try {
- let oMain = JSON.stringify(this.hform);
- this.HBillSub[0].HRepairCheckID = this.hform.HRepairCheckMainID
- this.HBillSub[0].HManagerID = this.hform.HManagerID
- this.HBillSub[0].HRepairCheckContent = this.hform.HRepairCheckMainContent
- let sSubStr = JSON.stringify(this.HBillSub);
- let sMainSub = oMain + ';' + sSubStr + ';' + getUserInfo()['Czymc'];
- let res = await CommonUtils.doRequest2Sync({
- url: "/Sc_MouldRepairCheckBill/SaveGetMouldRepairCheckBillList",
- data: {
- "msg": sMainSub
- },
- method: "POST"
- })
+ try {
+ let oMain = JSON.stringify(this.hform);
+ this.HBillSub[0].HRepairCheckID = this.hform.HRepairCheckMainID
+ this.HBillSub[0].HManagerID = this.hform.HManagerID
+ this.HBillSub[0].HRepairCheckContent = this.hform.HRepairCheckMainContent
+ let sSubStr = JSON.stringify(this.HBillSub);
+ let sMainSub = oMain + ';' + sSubStr + ';' + getUserInfo()['Czymc'];
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sc_MouldRepairCheckBill/SaveGetMouldRepairCheckBillList",
+ data: {
+ "msg": sMainSub
+ },
+ method: "POST"
+ })
- if (!res) {
- return
- }
+ 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_EquipRepairCheck/Sb_EquipRepairCheckBill?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) {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url: '/pages/MJGL/Sb_EquipRepairCheck/Sb_EquipRepairCheckBill?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
- }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鎻愪氦鍗曟嵁澶辫触: " + err
+ })
+ }
+ },
+ async getSourceBillInfo(HSourceBillType, HInterID, HBillNo) {
+ // 涓嬫帹鍗曟嵁绫诲瀷涓鸿澶囨晠闅滅櫥璁板崟
+ if(HSourceBillType == 3815) {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Sc_MouldConkBookBill/Sb_MouldConkBookBillListCheckDetai",
+ data: {
+ HID: HInterID
+ }
+ })
+
+ let {data,code, count, Message} = res.data
+ console.log('data: ',data);
+ if(code == 1) {
+ console.log('data: ',data.h_v_Sc_MouldConkBookBillList_Edit);
+ let data1 = data.h_v_Sc_MouldConkBookBillList_Edit[0]
+ this.hform.HMainSourceBillType = HSourceBillType
+ this.HMainSourceBillType = '鍣ㄥ叿鏁呴殰鐧昏鍗�'
+ this.hform.HMainSourceBillNo = data1.鍗曟嵁鍙�
+ this.hform.HMainSourceInterID = data1.hmainid
+ this.hform.HMainSourceEntryID = data1.hsubid
+ this.hform.HMouldID = data1.HMouldID
+ this.hform.HManagerName = data1.璐熻矗浜�
+ this.hform.HManagerID = data1.HManagerID
+ this.hform.HMouldName = data1.浜у搧妯″叿
+ this.hform.HMouldModel = data1.浜у搧妯″叿鍨嬪彿
+ this.hform.HMouldSpec = data1.浜у搧妯″叿瑙勬牸
+ }
+ else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇婧愬崟澶辫触: ${Message}`
+ })
+ }
+ }
+ }
+ },
+ 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) {
- // 缂栬緫
+ if (this.operationType == 1) {
+ // 鏂板
+ this.getMaxNum()
+ } else if (this.operationType == 2) {
+ // 澶嶅埗
+ } else if (this.operationType == 3) {
+ // 缂栬緫
- } else if (this.operationType == 4) {
- // 娴忚
+ } else if (this.operationType == 4) {
+ // 涓嬫帹
+ // 涓嬫帹
+ let {
+ HSourceBillType,
+ HInterID,
+ HBillNo
+ } = e
+ // 涓嬫帹
+ // this.enableEdit = false;
+ // this.enableSourceBillEdit = false;
+ // this.showHMainSourceBillType = false;
+ this.getMaxNum()
+ this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo)
+ }
- }
-
- 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.HMouldID = e.HMouldID
- this.hform.HMouldName = e.HMouldName
- this.hform.HMouldSpec = e.HMouldSpec
- this.hform.HMouldModel = e.HMouldModel
- this.$refs.billList.exit()
- })
- // 鐩戝惉缁翠慨璁板綍閫夋嫨瀹屾垚浜嬩欢
- uni.$on('RepairRecordSelectComplete', (e) => {
- console.log("鎺ユ敹鍒扮淮淇褰曢�夋嫨: ", e);
- if (e.HInterID) {
- this.hform.HMouldRepairWorkName = e.HBillNo;
- this.hform.HMouldRepairWorkID = e.HInterID;
- // 鍙互鏍规嵁闇�瑕佽缃叾浠栧瓧娈�
- }
- this.$refs.repairRecordList.exit();
- });
- },
- onUnload() {
- uni.$off('BillSelectComplete');
- uni.$off('RepairRecordSelectComplete');
- },
- 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)
- })
- }
- }
+ 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.HMouldID = e.HMouldID
+ this.hform.HMouldName = e.HMouldName
+ this.hform.HMouldSpec = e.HMouldSpec
+ this.hform.HMouldModel = e.HMouldModel
+ this.$refs.billList.exit()
+ })
+ // 鐩戝惉缁翠慨璁板綍閫夋嫨瀹屾垚浜嬩欢
+ uni.$on('RepairRecordSelectComplete', (e) => {
+ console.log("鎺ユ敹鍒扮淮淇褰曢�夋嫨: ", e);
+ if (e.HInterID) {
+ this.hform.HMouldRepairWorkName = e.HBillNo;
+ this.hform.HMouldRepairWorkID = e.HInterID;
+ // 鍙互鏍规嵁闇�瑕佽缃叾浠栧瓧娈�
+ }
+ this.$refs.repairRecordList.exit();
+ });
+ },
+ onUnload() {
+ uni.$off('BillSelectComplete');
+ uni.$off('RepairRecordSelectComplete');
+ },
+ 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_EqpMaintenance/Sb_EqpMaintenanceBill.vue b/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue
index 647fc59..f4f8be8 100644
--- a/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue
+++ b/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue
@@ -642,7 +642,7 @@
},
toScanCode() {
MpaasScan.scanCode(cb => {
- this.hfrom.HBarCode = cb
+ this.hform.HBarCode = cb
this.GetMessageByBarCode(cb)
})
},
@@ -783,7 +783,7 @@
})
return
}
-
+
try {
let oMain = JSON.stringify(this.hform);
this.HDetailList[0].HManagerID = this.hform.HManagerID
@@ -795,8 +795,8 @@
this.HDetailList[0].HSourceBillNo = this.hform.HMainSourceBillNo
let sSubStr = JSON.stringify(this.HDetailList);
- let sMainSub = oMain + ';' + sSubStr + `;-1;${this.operationType}` + ';' + getUserInfo()[
- 'Czymc'];
+ let sMainSub = oMain + ';' + sSubStr;
+ console.log('sMainSub: ',sMainSub);
let res = await CommonUtils.doRequest2Sync({
url: "/Sb_PDA_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList",
data: {
@@ -912,7 +912,42 @@
message: err
})
}
- }
+ },
+ async getSourceBillInfo(HSourceBillType, HInterID, HBillNo) {
+ // 涓嬫帹鍗曟嵁绫诲瀷涓鸿澶囨晠闅滅櫥璁板崟
+ if(HSourceBillType == 3907) {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Sb_EqpRepairWorkBill/Sb_EqpConkBookBillListCheckDetai",
+ data: {
+ HID: HInterID
+ }
+ })
+
+ let {data,code, count, Message} = res.data
+
+ if(code == 1) {
+ console.log('data: ',data.h_v_Sb_EquipConkBookBillList_Edit);
+ let data1 = data.h_v_Sb_EquipConkBookBillList_Edit[0]
+ this.hform.HMainSourceBillType = HSourceBillType
+ this.HMainSourceBillType = '璁惧鏁呴殰鐧昏鍗�'
+ this.hform.HMainSourceBillNo = data1.鍗曟嵁鍙�
+ this.hform.HMainSourceInterID = data1.hmainid
+ this.hform.HMainSourceEntryID = data1.hsubid
+ this.hform.HEquipID = data1.HEquipID
+ this.hform.HManagerName = data1.璐熻矗浜�
+ this.hform.HManagerID = data1.HManagerID
+ this.hform.HBarName = data1.璁惧鍚嶇О
+ this.hform.HBarModel = data1.璁惧鍨嬪彿
+ this.hform.HBarSpec = data1.璁惧瑙勬牸
+ }
+ else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇婧愬崟澶辫触: ${Message}`
+ })
+ }
+ }
+ }
},
onLoad(e) {
console.log('e: ', e);
@@ -935,7 +970,12 @@
let HEquipID = e.HEquipID
this.getMaxNum()
this.getEquipFileMain(HEquipID)
- }
+ } else if(this.operationType == 5) {
+ let {HSourceBillType, HInterID, HBillNo} = e
+ // 涓嬫帹
+ this.getMaxNum()
+ this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo)
+ }
this.getHDeptList()
this.getEmpList()
diff --git a/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue b/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
index 3fc78e3..1128ab7 100644
--- a/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
+++ b/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
@@ -530,7 +530,7 @@
toScanCode() {
MpaasScan.scanCode(cb => {
- this.hfrom.HBarCode = cb
+ this.hform.HBarCode = cb
this.GetMessageByBarCode(cb)
})
},
diff --git a/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
index f90d3c3..edff4d1 100644
--- a/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
+++ b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
@@ -533,7 +533,7 @@
},
toScanCode() {
MpaasScan.scanCode(cb => {
- this.hfrom.HBarCode = cb
+ this.hform.HBarCode = cb
this.GetMessageByBarCode(cb)
})
},
@@ -624,7 +624,8 @@
"HDotCheckItemClassName": "",
"HDotCheckItemMethodID": 0,
"HDotCheckItemMethodName": "",
- "HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
+ //"HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
+ "HDotCheckResult": item.榛樿鐐规缁撴灉 == 'OK' ? true : false
}
})
diff --git a/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue b/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
index 32c589f..8094176 100644
--- a/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
+++ b/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
@@ -580,7 +580,7 @@
},
toScanCode() {
MpaasScan.scanCode(cb => {
- this.hfrom.HBarCode = cb
+ this.hform.HBarCode = cb
this.GetMessageByBarCode(cb)
})
},
@@ -674,8 +674,9 @@
"HRemark": "",
"HSourceInterID": item.淇濆吇璁″垝ID,
"HSourceEntryID": item.淇濆吇璁″垝瀛怚D,
- "HSourceBillNo": item.淇濆吇璁″垝鍗�
- }
+ "HSourceBillNo": item.淇濆吇璁″垝鍗�,
+ "HMaintainResult": item.榛樿淇濆吇缁撴灉 == 'OK' ? true : false
+ }
})
this.enableEdit = false
@@ -803,8 +804,10 @@
// 缂栬緫
} else if (this.operationType == 4) {
- // 娴忚
-
+ // 涓嬫帹
+ let HBarCode = e.HBarCode
+ this.getMaxNum()
+ this.GetMessageByBarCode(HBarCode)
}
this.getHDeptList()
diff --git a/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
index 46200f5..99ea259 100644
--- a/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
+++ b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
@@ -1,834 +1,879 @@
<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="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="{
+ <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>
+ </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>
+ <!-- 婧愬崟鍗曟嵁鍒楄〃寮圭獥 -->
+ <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";
- // 寮曞叆婧愬崟鍗曟嵁鍒楄〃寮圭獥缁勪欢
- import BillListPopupEquipConkBookBillVue from '../../../components/BillListPopup/BillListPopupEquipConkBookBill.vue';
+ 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';
- 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, // 鏂板锛氭帶鍒剁淮淇褰曠紪杈戠姸鎬�
+ 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, // 鏂板锛氭帶鍒剁淮淇褰曠紪杈戠姸鎬�
- HDeptList: [],
- HRepairCheckList: [],
- HEmpList: [],
+ HDeptList: [],
+ HRepairCheckList: [],
+ HEmpList: [],
- 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();
- },
+ 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();
+ },
- // 鎵弿缁翠慨璁板綍鍗曞彿
- toScanHMainSourceBillNo() {
- MpaasScan.scanCode(cb => {
- this.hform.HMainSourceBillNo = cb;
- this.GetMessageByHMainSourceBillNo(cb);
- });
- },
+ // 鎵弿缁翠慨璁板綍鍗曞彿
+ toScanHMainSourceBillNo() {
+ MpaasScan.scanCode(cb => {
+ this.hform.HMainSourceBillNo = cb;
+ this.GetMessageByHMainSourceBillNo(cb);
+ });
+ },
- // 鏍规嵁缁翠慨璁板綍鍗曞彿鑾峰彇淇℃伅
- async GetMessageByHMainSourceBillNo(HSouceBillNo) {
- try {
- let url = "/Sb_EqpRepairWorkBill/GetEqpRepairWorkBillListPage";
- let dataField = {
- sWhere: ` and 鍗曟嵁鍙� = '${HSouceBillNo}'`,
- user: getUserInfo()["Czymc"],
- page: 1,
- size: 1,
- };
+ // 鏍规嵁缁翠慨璁板綍鍗曞彿鑾峰彇淇℃伅
+ async GetMessageByHMainSourceBillNo(HSouceBillNo) {
+ try {
+ let url = "/Sb_EqpRepairWorkBill/GetEqpRepairWorkBillListPage";
+ let dataField = {
+ sWhere: ` and 鍗曟嵁鍙� = '${HSouceBillNo}'`,
+ user: getUserInfo()["Czymc"],
+ page: 1,
+ size: 1,
+ };
- let res = await CommonUtils.doRequest2Async({
- url: url,
- data: dataField
- });
+ 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"];
+ 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);
- }
+ // 濡傛灉婧愬崟鏈夎澶囦俊鎭紝鍙互鑷姩濉厖
+ 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}`
- });
- }
- },
+ } 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,
- },
- });
+ // 鏍规嵁璁惧ID鑾峰彇璁惧淇℃伅
+ async getEquipFileMain(HInterID) {
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_ListByHEquipID",
+ data: {
+ HEquipID: HInterID,
+ },
+ });
- if (!res) {
- return;
- }
+ if (!res) {
+ return;
+ }
- let {
- data,
- count,
- Message
- } = res.data;
+ 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
- });
- }
- },
+ 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
+ });
+ }
+ },
- // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
- 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
- }
- }
+ // 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
+ 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
+ }
+ }
- 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)
- }
- },
- })
+ 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)
+ }
+ },
+ })
- },
- 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: "",
- }
- })
+ },
+ 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.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.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.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.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 {
+ 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,
+ },
+ })
- 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.HBarCode = HBarCode;
- 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.HBarCode = HBarCode;
+ 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
- })
- }
- },
- radioChange({
- detail: {
- value
- }
- }) {
- this.hform.HCheckResult = value
- },
- async getMaxNum() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Web/GetMAXNum",
- data: {
- "HBillType": this.HBillType
- }
- })
+ } 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
- }
+ 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 getSourceBillInfo(HSourceBillType, HInterID, HBillNo) {
+ // 涓嬫帹鍗曟嵁绫诲瀷涓鸿澶囨晠闅滅櫥璁板崟
+ if (HSourceBillType == 3907) {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Sb_EqpRepairWorkBill/GetEquipMatainanceBillBySourceInterID",
+ data: {
+ user: getUserInfo()["Czymc"],
+ HSourceInterID: HInterID
+ }
+ })
- 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"
- })
+ let {
+ data,
+ code,
+ count,
+ Message
+ } = res.data
- if (!res) {
- return
- }
+ if (count == 1) {
+ console.log('data: ', data);
+ let data1 = data[0]
+ this.hform.HEquipID = data[0].HEquipID
+ this.hform.HBarName = data[0].璁惧鍚嶇О
+ this.hform.HBarModel = data[0].璁惧瑙勬牸
+ this.hform.HBarSpec = data[0].璁惧瑙勬牸
+
+ this.hform.HMainSourceBillNo = data[0]["璁惧缁翠慨璁板綍鍗�"];
+ this.hform.HMainSourceInterID = data[0]["HEquipRepairCheckBillInterID"];
+ this.hform.HMainSourceEntryID = data[0]["HEquipRepairCheckBillEntryID"];
+
+
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇婧愬崟澶辫触: ${Message}`
+ })
+ }
+ }
+ },
+ async submit() {
+ let valid = this.ValidCheck()
+ if (!valid.state) {
+ CommonUtils.showTips({
+ message: valid.Message
+ })
+ 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
- })
- }
+ 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"
+ })
- } 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 (!res) {
+ return
+ }
- 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;
- }
+ 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
+ })
+ }
- this.getHDeptList()
- this.getEmpList()
- this.getCheckProjList()
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鎻愪氦鍗曟嵁澶辫触: " + err
+ })
+ }
+ }
+ },
+ onLoad(e) {
+ console.log('e: ', e);
+ if (!e.operationType) {
+ this.operationType = 1
+ } else {
+ this.operationType = e.operationType
+ }
- // 鐩戝惉鍗曟嵁閫夋嫨瀹屾垚浜嬩欢
- 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)
- })
- }
- }
+ 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) {
+ // 涓嬫帹
+ let {
+ HSourceBillType,
+ HInterID,
+ HBillNo
+ } = e
+ // 涓嬫帹
+ this.getMaxNum()
+ this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo)
+ }
+
+ 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 7a5e2fb..e6f35c6 100644
--- a/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
+++ b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
@@ -223,7 +223,7 @@
</view>
<!-- <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload> -->
<!-- 婧愬崟鍗曟嵁鍒楄〃寮圭獥 -->
- <BillListPopupEquipConkBookBillVue ref="billList" :HBillType="hform.HBillType"
+ <BillListPopupEquipConkBookBillVue ref="billList" :HBillType="HBillType"
:HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
</BillListPopupEquipConkBookBillVue>
</view>
@@ -907,6 +907,41 @@
message: "鎻愪氦鍗曟嵁澶辫触: " + err
})
}
+ },
+ async getSourceBillInfo(HSourceBillType, HInterID, HBillNo) {
+ // 涓嬫帹鍗曟嵁绫诲瀷涓鸿澶囨晠闅滅櫥璁板崟
+ if(HSourceBillType == 3907) {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Sb_EqpRepairWorkBill/Sb_EqpConkBookBillListCheckDetai",
+ data: {
+ HID: HInterID
+ }
+ })
+
+ let {data,code, count, Message} = res.data
+
+ if(code == 1) {
+ console.log('data: ',data.h_v_Sb_EquipConkBookBillList_Edit);
+ let data1 = data.h_v_Sb_EquipConkBookBillList_Edit[0]
+ this.hform.HMainSourceBillType = HSourceBillType
+ this.HMainSourceBillType = '璁惧鏁呴殰鐧昏鍗�'
+ this.hform.HMainSourceBillNo = data1.鍗曟嵁鍙�
+ this.hform.HMainSourceInterID = data1.hmainid
+ this.hform.HMainSourceEntryID = data1.hsubid
+ this.hform.HEquipID = data1.HEquipID
+ this.hform.HManagerName = data1.璐熻矗浜�
+ this.hform.HManagerID = data1.HManagerID
+ this.hform.HBarName = data1.璁惧鍚嶇О
+ this.hform.HBarModel = data1.璁惧鍨嬪彿
+ this.hform.HBarSpec = data1.璁惧瑙勬牸
+ }
+ else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇婧愬崟澶辫触: ${Message}`
+ })
+ }
+ }
}
},
onLoad(e) {
@@ -925,10 +960,13 @@
} else if (this.operationType == 3) {
// 缂栬緫
} else if (this.operationType == 4) {
- // 娴忚
- this.enableEdit = false;
- this.enableSourceBillEdit = false;
- this.showHMainSourceBillType = false;
+ let {HSourceBillType, HInterID, HBillNo} = e
+ // 涓嬫帹
+ // this.enableEdit = false;
+ // this.enableSourceBillEdit = false;
+ // this.showHMainSourceBillType = false;
+ this.getMaxNum()
+ this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo)
}
this.getHDeptList()
diff --git a/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue b/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue
index b0618b2..dc7e7ea 100644
--- a/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue
+++ b/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue
@@ -1,18 +1,43 @@
<template>
<view>
<view class="tabs" id="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="switchTab(0)">寰呯淮淇�</view>
- <view :class="tabs == 1 ? 'on':''" @tap="switchTab(1)">宸茬淮淇�</view>
- <view :class="tabs == 2 ? 'on':''" @tap="switchTab(2)">鍏ㄩ儴浠诲姟</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="switchTab(0)">寰呮淳宸�</view>
+ <view :class="tabs == 1 ? 'on':''" @tap="switchTab(1)">寰呯淮淇�</view>
+ <view :class="tabs == 2 ? 'on':''" @tap="switchTab(2)">寰呴獙鏀�</view>
</view>
<!-- 璁惧缁翠慨浠诲姟鍒楄〃鍒楄〃 -->
<view class="list" v-for="(item,index) in reportBillsDisplay" :key="index">
- <uni-card :title="item.鏁呴殰鐧昏鍗曞彿" :extra="`鏃ユ湡: ${dayjs(item.璁惧鏁呴殰鏃ユ湡).format('YYYY-MM-DD')}`" style="margin: 10px;">
+ <uni-card :title="item.鏁呴殰鐧昏鍗曞彿" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
- <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)" :key="index">
+ <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)"
+ :key="index">
<text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
</view>
+ </view>
+ <view class="more" v-if="showDetail == index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="more" v-if="showDetail != index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="op" v-if="operations == index">
+ <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+ <!-- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button> -->
+ <button class="op3" size="mini" v-if="tabs == 0" plain @tap.stop="pushBill(0, item)">涓嬫帹娲惧伐鍗�</button>
+ <button class="op3" size="mini" v-if="tabs == 1" plain @tap.stop="pushBill(1, item)">涓嬫帹缁翠慨鍗�</button>
+ <button class="op3" size="mini" v-if="tabs == 2" plain @tap.stop="pushBill(2, item)">涓嬫帹楠屾敹鍗�</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
</uni-card>
</view>
@@ -36,6 +61,9 @@
dayjs,
CommonUtils,
tabs: 0,
+ showDetail: -1,
+ operations: -1,
+
reportBillsDisplay: [],
reportBillsAwaitRepair: [], // 寰呯淮淇�
reportBillsRepaired: [], // 宸茬淮淇�
@@ -44,6 +72,25 @@
};
},
methods: {
+ pushBill(tab, item) {
+ console.log('item: ', item);
+ let Query = `&HBillNo=${item['鏁呴殰鐧昏鍗曞彿']}&HInterID=${item['HInterID']}&HSourceBillType=3907`
+ if (tab == 0) {
+ uni.navigateTo({
+ url: '/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill?operationType=4' +
+ Query
+ })
+ } else if (tab == 1) {
+ uni.navigateTo({
+ url: '/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill?operationType=5' + Query
+ })
+ } else if (tab == 2) {
+ uni.navigateTo({
+ url: '/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill?operationType=4' +
+ Query
+ })
+ }
+ },
switchTab(tabIndex) {
this.tabs = tabIndex
switch (tabIndex) {
@@ -61,7 +108,7 @@
async getRepairList() {
try {
let res = await CommonUtils.doRequest2Async({
- url: 'Sb_EquipRepairTaskReport/RepairList',
+ url: '/Sb_EquipRepairCheckTaskReport/RepairCheckList2',
data: {
user: getUserInfo()["Czymc"]
}
@@ -76,22 +123,22 @@
if (count == 1) {
console.log('data: ', data);
- this.reportBillsAwaitRepair = data.h_p_Sb_EquipRepairTaskReport
- this.reportBillsRepaired = data.h_p_Sb_EquipRepairTaskReport1
- this.reportBillsAll = data.h_p_Sb_EquipRepairTaskReport2
-
+ this.reportBillsAwaitRepair = data.h_p_Sb_EquipRepairCheckTaskReport_2
+ this.reportBillsRepaired = data.h_p_Sb_EquipRepairCheckTaskReport_21
+ this.reportBillsAll = data.h_p_Sb_EquipRepairCheckTaskReport_22
+
let fieldList = CommonUtils.fieldListFilterRole({
- ExcludeKeys: ['鏁呴殰鐧昏鍗曞彿', '璁惧鏁呴殰鏃ユ湡'],
+ ExcludeKeys: ['鏁呴殰鐧昏鍗曞彿'],
FieldList: list
})
-
+
if (fieldList.status == false) {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
message: `鑾峰彇琛ㄥ崟缁撴瀯澶辫触: ${fieldList.Message}`
})
}
-
+
this.HFieldList = fieldList.data
this.switchTab(0)
@@ -117,5 +164,57 @@
</script>
<style lang="scss">
- @import "@/pages/MJGL/style/MJBillStyle.scss"
+ @import "@/pages/MJGL/style/MJBillStyle.scss";
+
+ .more {
+ color: #888;
+ font-size: 26rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
+
+ .op {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 20rpx;
+
+ button {
+ padding: 0;
+ width: 150rpx;
+ font-size: 25rpx;
+ }
+
+ .op1 {
+ border: 1px solid #41a863;
+ color: #41a863;
+ }
+
+ .op2 {
+ border: 1px solid #d98d00;
+ color: #d98d00;
+ }
+
+ .op3 {
+ border: 1px solid #3a78ff;
+ color: #3a78ff;
+ }
+
+ .op4 {
+ border: 1px solid #da0000;
+ color: #da0000;
+ }
+
+ .op5 {
+ border: 1px solid #888;
+ color: #888;
+ }
+ }
</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue b/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
index d7feb1b..5a747c3 100644
--- a/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
+++ b/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
@@ -269,17 +269,25 @@
},
async onLoad(e) {
console.log(e, this.userInfo)
- this.OperationType = e.OperationType
- if (e.HInterID) {
- this.HInterID_Temp = e.HInterID
- this.RoadBillMain(e.HInterID)
- this.barCodeFocus = true
- } else {
- this.getNewData()
- this.HSourceBillNoFocus = true
- this.refreshBarCodeState()
+ this.OperationType = e.OperationType || 1
+ if(operationType == 1) {
+ if (e.HInterID) {
+ this.HInterID_Temp = e.HInterID
+ this.RoadBillMain(e.HInterID)
+ this.barCodeFocus = true
+ } else {
+ this.getNewData()
+ this.HSourceBillNoFocus = true
+ this.refreshBarCodeState()
+ }
+
+ }else if(operationType == 5) {
+ // 鍗曟嵁涓嬫帹
+ let {HSourceBillType, HInterID, HBillNo} = e
+ this.getMaxNum()
+ this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo)
}
-
+
this.InitConkType()
this.InitConkReason()
this.InitDept()
@@ -719,6 +727,41 @@
}
}
});
+ },
+ async getSourceBillInfo(HSourceBillType, HInterID, HBillNo) {
+ // 涓嬫帹鍗曟嵁绫诲瀷涓鸿澶囨晠闅滅櫥璁板崟
+ if(HSourceBillType == 3815) {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Sc_MouldConkBookBill/Sb_MouldConkBookBillListCheckDetai",
+ data: {
+ HID: HInterID
+ }
+ })
+
+ let {data,code, count, Message} = res.data
+ console.log('data: ',data);
+ if(code == 1) {
+ console.log('data: ',data.h_v_Sc_MouldConkBookBillList_Edit);
+ let data1 = data.h_v_Sc_MouldConkBookBillList_Edit[0]
+ this.hform.HMainSourceBillType = HSourceBillType
+ this.HMainSourceBillType = '鍣ㄥ叿鏁呴殰鐧昏鍗�'
+ this.hform.HMainSourceBillNo = data1.鍗曟嵁鍙�
+ this.hform.HMainSourceInterID = data1.hmainid
+ this.hform.HMainSourceEntryID = data1.hsubid
+ this.hform.HMouldID = data1.HMouldID
+ this.hform.HManagerName = data1.璐熻矗浜�
+ this.hform.HManagerID = data1.HManagerID
+ this.hform.HMouldName = data1.浜у搧妯″叿
+ this.hform.HMouldModel = data1.浜у搧妯″叿鍨嬪彿
+ this.hform.HMouldSpec = data1.浜у搧妯″叿瑙勬牸
+ }
+ else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇婧愬崟澶辫触: ${Message}`
+ })
+ }
+ }
}
}
}
diff --git a/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue b/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
index 6145ffa..ca8997e 100644
--- a/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
+++ b/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
@@ -328,6 +328,7 @@
HRepairList: [],
hform: {
+ "HBillType":"3843",
"HBarCode": "",
"HBillNo": "",
"HInterID": "0",
@@ -375,9 +376,9 @@
"HUpDateDate": "",
"HDeleteMan": "",
"HDeleteDate": "",
- HMouldName: "",
- HMouldSpec: "",
- HMouldModel: "",
+ "HMouldName": "",
+ "HMouldSpec": "",
+ "HMouldModel": "",
"HStockOrgID": uni.getStorageSync("OrganizationID") || "0" // 鏂板
},
HDetailList: [{ // 鍚庣鎺ュ彛鎻愪氦闇�瑕� 鏄庣粏淇℃伅
@@ -841,6 +842,41 @@
message: "鎻愪氦鍗曟嵁澶辫触: " + err
})
}
+ },
+ async getSourceBillInfo(HSourceBillType, HInterID, HBillNo) {
+ // 涓嬫帹鍗曟嵁绫诲瀷涓鸿澶囨晠闅滅櫥璁板崟
+ if(HSourceBillType == 3815) {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Sc_MouldConkBookBill/Sb_MouldConkBookBillListCheckDetai",
+ data: {
+ HID: HInterID
+ }
+ })
+
+ let {data,code, count, Message} = res.data
+ console.log('data: ',data);
+ if(code == 1) {
+ console.log('data: ',data.h_v_Sc_MouldConkBookBillList_Edit);
+ let data1 = data.h_v_Sc_MouldConkBookBillList_Edit[0]
+ this.hform.HMainSourceBillType = HSourceBillType
+ this.HMainSourceBillType = '鍣ㄥ叿鏁呴殰鐧昏鍗�'
+ this.hform.HMainSourceBillNo = data1.鍗曟嵁鍙�
+ this.hform.HMainSourceInterID = data1.hmainid
+ this.hform.HMainSourceEntryID = data1.hsubid
+ this.hform.HMouldID = data1.HMouldID
+ this.hform.HManagerName = data1.璐熻矗浜�
+ this.hform.HManagerID = data1.HManagerID
+ this.hform.HMouldName = data1.浜у搧妯″叿
+ this.hform.HMouldModel = data1.浜у搧妯″叿鍨嬪彿
+ this.hform.HMouldSpec = data1.浜у搧妯″叿瑙勬牸
+ }
+ else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇婧愬崟澶辫触: ${Message}`
+ })
+ }
+ }
}
},
onLoad(e) {
@@ -860,7 +896,14 @@
// 缂栬緫
} else if (this.operationType == 4) {
- // 娴忚
+ // 涓嬫帹
+ let {HSourceBillType, HInterID, HBillNo} = e
+ // 涓嬫帹
+ // this.enableEdit = false;
+ // this.enableSourceBillEdit = false;
+ // this.showHMainSourceBillType = false;
+ this.getMaxNum()
+ this.getSourceBillInfo(HSourceBillType, HInterID, HBillNo)
}
@@ -905,7 +948,7 @@
</script>
<style lang="scss" scoped>
- // @import "@/pages/MJGL/style/MJBillStyle.scss";
+ @import "@/pages/MJGL/style/MJBillStyle.scss";
.picker-overlay {
position: absolute;
diff --git a/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport.vue b/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport.vue
index e5b6577..9866e89 100644
--- a/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport.vue
+++ b/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport.vue
@@ -1,18 +1,44 @@
<template>
<view>
<view class="tabs" id="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="switchTab(0)">寰呯淮淇�</view>
- <view :class="tabs == 1 ? 'on':''" @tap="switchTab(1)">宸茬淮淇�</view>
- <view :class="tabs == 2 ? 'on':''" @tap="switchTab(2)">鍏ㄩ儴浠诲姟</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="switchTab(0)">寰呮淳宸�</view>
+ <view :class="tabs == 1 ? 'on':''" @tap="switchTab(1)">寰呯淮淇�</view>
+ <view :class="tabs == 2 ? 'on':''" @tap="switchTab(2)">寰呴獙鏀�</view>
</view>
<!-- 璁惧缁翠慨浠诲姟鍒楄〃鍒楄〃 -->
<view class="list" v-for="(item,index) in reportBillsDisplay" :key="index">
- <uni-card :title="item.鏁呴殰鐧昏鍗曞彿" :extra="`鏃ユ湡: ${dayjs(item.鍣ㄥ叿鏁呴殰鏃ユ湡).format('YYYY-MM-DD')}`" style="margin: 10px;">
+ <uni-card :title="item.鏁呴殰鐧昏鍗曞彿" :extra="`鏃ユ湡: ${dayjs(item.鍣ㄥ叿鏁呴殰鏃ユ湡).format('YYYY-MM-DD')}`"
+ style="margin: 10px;">
<view class="card-detail">
- <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)" :key="index">
+ <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)"
+ :key="index">
<text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
</view>
+ </view>
+ <view class="more" v-if="showDetail == index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="more" v-if="showDetail != index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="op" v-if="operations == index">
+ <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+ <!-- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button> -->
+ <button class="op3" size="mini" v-if="tabs == 0" plain @tap.stop="pushBill(0, item)">涓嬫帹娲惧伐鍗�</button>
+ <button class="op3" size="mini" v-if="tabs == 1" plain @tap.stop="pushBill(1, item)">涓嬫帹缁翠慨鍗�</button>
+ <button class="op3" size="mini" v-if="tabs == 2" plain @tap.stop="pushBill(2, item)">涓嬫帹楠屾敹鍗�</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
</uni-card>
</view>
@@ -36,6 +62,9 @@
dayjs,
CommonUtils,
tabs: 0,
+ showDetail: -1,
+ operations: -1,
+
reportBillsDisplay: [],
reportBillsAwaitRepair: [], // 寰呯淮淇�
reportBillsRepaired: [], // 宸茬淮淇�
@@ -44,6 +73,23 @@
};
},
methods: {
+ pushBill(tab, item) {
+ console.log('item: ',item);
+ let Query = `&HBillNo=${item['鏁呴殰鐧昏鍗曞彿']}&HInterID=${item['HInterID']}&HSourceBillType=3815`
+ if(tab == 0) {
+ uni.navigateTo({
+ url: '/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill?operationType=4' + Query
+ })
+ }else if(tab == 1) {
+ uni.navigateTo({
+ url: '/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill?operationType=5' + Query
+ })
+ }else if(tab == 2) {
+ uni.navigateTo({
+ url: '/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill?operationType=4' + Query
+ })
+ }
+ },
switchTab(tabIndex) {
this.tabs = tabIndex
switch (tabIndex) {
@@ -61,7 +107,7 @@
async getRepairList() {
try {
let res = await CommonUtils.doRequest2Async({
- url: 'Sc_MouldRepairTaskReport/RepairList',
+ url: 'Sc_MouldRepairCheckTaskReport/RepairCheckList2',
data: {
user: getUserInfo()["Czymc"]
}
@@ -76,22 +122,22 @@
if (count == 1) {
console.log('data: ', data);
- this.reportBillsAwaitRepair = data.h_p_Sc_MouldRepairTaskReport
- this.reportBillsRepaired = data.h_p_Sc_MouldRepairTaskReport1
- this.reportBillsAll = data.h_p_Sc_MouldRepairTaskReport2
-
+ this.reportBillsAwaitRepair = data.h_p_Sc_MouldRepairTaskReport_2
+ this.reportBillsRepaired = data.h_p_Sc_MouldRepairTaskReport_21
+ this.reportBillsAll = data.h_p_Sc_MouldRepairTaskReport_22
+
let fieldList = CommonUtils.fieldListFilterRole({
ExcludeKeys: ['鏁呴殰鐧昏鍗曞彿', '鍣ㄥ叿鏁呴殰鏃ユ湡'],
FieldList: list
})
-
+
if (fieldList.status == false) {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
message: `鑾峰彇琛ㄥ崟缁撴瀯澶辫触: ${fieldList.Message}`
})
}
-
+
this.HFieldList = fieldList.data
this.switchTab(0)
@@ -117,5 +163,57 @@
</script>
<style lang="scss">
- @import "@/pages/MJGL/style/MJBillStyle.scss"
+ @import "@/pages/MJGL/style/MJBillStyle.scss";
+
+ .more {
+ color: #888;
+ font-size: 26rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
+
+ .op {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 20rpx;
+
+ button {
+ padding: 0;
+ width: 150rpx;
+ font-size: 25rpx;
+ }
+
+ .op1 {
+ border: 1px solid #41a863;
+ color: #41a863;
+ }
+
+ .op2 {
+ border: 1px solid #d98d00;
+ color: #d98d00;
+ }
+
+ .op3 {
+ border: 1px solid #3a78ff;
+ color: #3a78ff;
+ }
+
+ .op4 {
+ border: 1px solid #da0000;
+ color: #da0000;
+ }
+
+ .op5 {
+ border: 1px solid #888;
+ color: #888;
+ }
+ }
</style>
\ No newline at end of file
diff --git a/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue b/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue
index 37d6acd..a164ff2 100644
--- a/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue
+++ b/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue
@@ -1,870 +1,886 @@
<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="{height: containerHeight + 'px',overflow: 'auto' }">
- <view class="form-item">
- <view class="title">妯″叿鏉＄爜:</view>
- <view class="right">
- <input v-model="hform.HBarCode" @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.HBeginDate">
- <input :value="hform.HBeginDate" />
- </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.HEndDate">
- <input :value="hform.HEndDate" />
- </uni-datetime-picker>
- </view>
- </view>
- <view class="form-item" v-if="false">
- <view class="title">鏁伴噺:</view>
- <view class="right">
- <input type="number" v-model="hform.HQty" />
- </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.HLastResult == 'OK'" />
- <text>OK</text>
- </view>
- </label>
- </label>
- <view>
- <radio value="NG" :checked="hform.HLastResult == 'NG'" />
- <text>NG</text>
- </view>
- </label>
- </radio-group>
- </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">
- <input v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
- </view>
- </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 class="form-item">
- <view class="title">淇濆吇璁″垝:</view>
- <view class="righton">
- <input v-model="hform.HPlanNo" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="title">淇濆吇绾у埆:</view>
- <zxz-uni-data-select class="right" :localdata="HMaintainLevList" dataKey="淇濆吇绾у埆鍚嶇О"
- dataValue="HItemID" v-model="hform.HMaintainLevID">
- </zxz-uni-data-select>
- </view>
- </view>
- </template>
- <!-- 鏄庣粏淇℃伅 -->
- <template v-if="tabs == 1">
- <view class="form">
- <view class="form-item">
- <view class="left">
- 妯″叿淇濆吇瑙勭▼
- </view>
- <view class="right">
- <input type="text" :value="hform.HMouldMaintainRuleInterNo" />
- </view>
- <view class="icon-wrapper">
- <uni-icons type="search" size="20" @click="toCheckFile"></uni-icons>
- </view>
- </view>
- </view>
- <view class="list" v-for="(item,index) in HCheckFileList" :key="index">
- <uni-card style="margin: 10px;">
- <view class="card-detail">
- <view class="detail">
- <text>搴忓彿锛�</text>{{index+1}}
- </view>
- <view class="detail">
- <text>缁撴灉锛�</text>
- <checkbox-group style="display: inline-block;"
- @change="checkBoxChangeHandler(index, $event)">
- <checkbox value="enabled" :checked="item.HMaintainResult" />
- </checkbox-group>
- </view>
- <view class="detail" v-if="false">
- <text>淇濆吇椤圭洰ID锛�</text>{{item.HMaintainItemID}}
- </view>
- <view class="detail">
- <text>淇濆吇椤圭洰锛�</text>{{item.HMaintainItem}}
- </view>
- <view class="detail">
- <text>淇濆吇閮ㄤ綅锛�</text>{{item.HMaintainPart}}
- </view>
- <view class="detail">
- <text>鍏蜂綋瑕佹眰锛�</text>{{item.HClaim}}
- </view>
- <view class="detail" v-if="false">
- <text>璐熻矗浜篒D锛�</text>{{item.HManagerID}}
- </view>
- <view class="detail">
- <text>璐熻矗浜哄悕绉帮細</text>{{item.HManagerName}}
- </view>
- <view class="detail">
- <text>澶囨敞锛�</text>{{item.HRemark}}
- </view>
- <view class="detail" v-if="false">
- <text>婧愬崟ID锛�</text>{{item.HSourceInterID}}
- </view>
- <view class="detail" v-if="false">
- <text>婧愬崟瀛怚D锛�</text>{{item.HSourceEntryID}}
- </view>
- <view class="detail" v-if="false">
- <text>婧愬崟鍙凤細</text>{{item.HSourceBillNo}}
- </view>
+ <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="right">
+ <input v-model="hform.HBarCode" @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.HBeginDate">
+ <input :value="hform.HBeginDate" />
+ </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.HEndDate">
+ <input :value="hform.HEndDate" />
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="form-item" v-if="false">
+ <view class="title">鏁伴噺:</view>
+ <view class="right">
+ <input type="number" v-model="hform.HQty" />
+ </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.HLastResult == 'OK'" />
+ <text>OK</text>
+ </view>
+ </label>
+ </label>
+ <view>
+ <radio value="NG" :checked="hform.HLastResult == 'NG'" />
+ <text>NG</text>
+ </view>
+ </label>
+ </radio-group>
+ </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">
+ <input v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </view>
+ </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 class="form-item">
+ <view class="title">淇濆吇璁″垝:</view>
+ <view class="righton">
+ <input v-model="hform.HPlanNo" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">淇濆吇绾у埆:</view>
+ <zxz-uni-data-select class="right" :localdata="HMaintainLevList" dataKey="淇濆吇绾у埆鍚嶇О"
+ dataValue="HItemID" v-model="hform.HMaintainLevID">
+ </zxz-uni-data-select>
+ </view>
+ </view>
+ </template>
+ <!-- 鏄庣粏淇℃伅 -->
+ <template v-if="tabs == 1">
+ <view class="form">
+ <view class="form-item">
+ <view class="left">
+ 妯″叿淇濆吇瑙勭▼
+ </view>
+ <view class="right">
+ <input type="text" :value="hform.HMouldMaintainRuleInterNo" />
+ </view>
+ <view class="icon-wrapper">
+ <uni-icons type="search" size="20" @click="toCheckFile"></uni-icons>
+ </view>
+ </view>
+ </view>
+ <view class="list" v-for="(item,index) in HCheckFileList" :key="index">
+ <uni-card style="margin: 10px;">
+ <view class="card-detail">
+ <view class="detail">
+ <text>搴忓彿锛�</text>{{index+1}}
+ </view>
+ <view class="detail">
+ <text>缁撴灉锛�</text>
+ <checkbox-group style="display: inline-block;"
+ @change="checkBoxChangeHandler(index, $event)">
+ <checkbox value="enabled" :checked="item.HMaintainResult" />
+ </checkbox-group>
+ </view>
+ <view class="detail" v-if="false">
+ <text>淇濆吇椤圭洰ID锛�</text>{{item.HMaintainItemID}}
+ </view>
+ <view class="detail">
+ <text>淇濆吇椤圭洰锛�</text>{{item.HMaintainItem}}
+ </view>
+ <view class="detail">
+ <text>淇濆吇閮ㄤ綅锛�</text>{{item.HMaintainPart}}
+ </view>
+ <view class="detail">
+ <text>鍏蜂綋瑕佹眰锛�</text>{{item.HClaim}}
+ </view>
+ <view class="detail" v-if="false">
+ <text>璐熻矗浜篒D锛�</text>{{item.HManagerID}}
+ </view>
+ <view class="detail">
+ <text>璐熻矗浜哄悕绉帮細</text>{{item.HManagerName}}
+ </view>
+ <view class="detail">
+ <text>澶囨敞锛�</text>{{item.HRemark}}
+ </view>
+ <view class="detail" v-if="false">
+ <text>婧愬崟ID锛�</text>{{item.HSourceInterID}}
+ </view>
+ <view class="detail" v-if="false">
+ <text>婧愬崟瀛怚D锛�</text>{{item.HSourceEntryID}}
+ </view>
+ <view class="detail" v-if="false">
+ <text>婧愬崟鍙凤細</text>{{item.HSourceBillNo}}
+ </view>
- </view>
- </uni-card>
- </view>
- <view class="over" v-if="HCheckFileList.length == 0">鏆傛棤鏁版嵁</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>
+ </uni-card>
+ </view>
+ <view class="over" v-if="HCheckFileList.length == 0">鏆傛棤鏁版嵁</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>
- </template>
- <!-- 闄勪欢淇℃伅 -->
- <template v-if="tabs == 3">
- <view class="card-item-wrapper">
- <view class="attachment-btns">
- <button type="primary" size="mini" @tap="fileUpload">閫夋嫨鏂囦欢</button>
- <view style="flex: 1;"></view>
- </view>
- <view v-for="(item, index) in attachmentInfo" :key="index">
- <uni-card :title="item['fileName']" :thumbnail="item.filePath">
- <view class="card-detail">
- <view class="detail">
- <text>澶у皬锛�</text>{{item["size"]}}
- </view>
- <view class="detail">
- <text>鐘舵�侊細</text>{{item["status"]}}
- </view>
- <view class="detail operation" v-if="item['status']!='涓婁紶鎴愬姛'">
- <text>鎿嶄綔锛�</text>
- <button class="btn-a" size="mini" @tap.stop="uploadFile(index)">涓婁紶</button>
- <button class="btn-b" size="mini" @tap.stop="delFile(index)">鍒犻櫎</button>
- </view>
- </view>
- </uni-card>
- </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>
+ <!-- 闄勪欢淇℃伅 -->
+ <template v-if="tabs == 3">
+ <view class="card-item-wrapper">
+ <view class="attachment-btns">
+ <button type="primary" size="mini" @tap="fileUpload">閫夋嫨鏂囦欢</button>
+ <view style="flex: 1;"></view>
+ </view>
+ <view v-for="(item, index) in attachmentInfo" :key="index">
+ <uni-card :title="item['fileName']" :thumbnail="item.filePath">
+ <view class="card-detail">
+ <view class="detail">
+ <text>澶у皬锛�</text>{{item["size"]}}
+ </view>
+ <view class="detail">
+ <text>鐘舵�侊細</text>{{item["status"]}}
+ </view>
+ <view class="detail operation" v-if="item['status']!='涓婁紶鎴愬姛'">
+ <text>鎿嶄綔锛�</text>
+ <button class="btn-a" size="mini" @tap.stop="uploadFile(index)">涓婁紶</button>
+ <button class="btn-b" size="mini" @tap.stop="delFile(index)">鍒犻櫎</button>
+ </view>
+ </view>
+ </uni-card>
+ </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>
<script>
- import dayjs from "dayjs";
- import {
- CommonUtils
- } from "@/utils/common";
- import {
- MpaasScan
- } from "@/utils/mpaasScan.js"
- import {
- getUserInfo
- } from "../../../utils/auth";
- import {
- TrackOpTypes
- } from "vue";
- export default {
- name: 'Sc_MouldMaintainBill',
- data() {
- return {
- tabs: 0,
- HMainSourceBillType: "",
- btnTop: 0,
- tabsBottom: 0,
- HModName: "Sc_MouldMaintainBill",
- HBillType: '3819',
- operationType: 1,
- uploadOptions: {},
+ import dayjs from "dayjs";
+ import {
+ CommonUtils
+ } from "@/utils/common";
+ import {
+ MpaasScan
+ } from "@/utils/mpaasScan.js"
+ import {
+ getUserInfo
+ } from "../../../utils/auth";
+ import {
+ TrackOpTypes
+ } from "vue";
+ export default {
+ name: 'Sc_MouldMaintainBill',
+ data() {
+ return {
+ tabs: 0,
+ HMainSourceBillType: "",
+ btnTop: 0,
+ tabsBottom: 0,
+ HModName: "Sc_MouldMaintainBill",
+ HBillType: '3819',
+ operationType: 1,
+ uploadOptions: {},
- HMaintainLevList: [],
- HCheckFileList: [],
- attachmentInfo: [],
+ HMaintainLevList: [],
+ HCheckFileList: [],
+ attachmentInfo: [],
- hform: {
- HBarCode: "",
- HBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HQty: 1,
- HBillNo: "",
- HInterID: 0,
- HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HMaintainLevName: "",
- HMaintainLevID: 0,
- HRemark: "",
- HBarName: "",
- HMouldID: 0,
- HBarSpec: "",
- HBarModel: "",
- HPlanNo: "",
- HPlanInterID: 0,
- HMouldMaintainRuleInterID: 0,
- HMouldMaintainRuleInterNo: "",
- HRequestComDate: dayjs(new Date()).format("YYYY-MM-DD"),
- HRecentMainModule: 0,
- HCumulativeModule: 0,
- HProductionModule: 0,
- HExplanation: "",
- HInnerBillNo: "",
- HMainSourceInterID: 0,
- HMainSourceEntryID: 0,
- HMainSourceBillNo: "",
- HMaker: getUserInfo()['Czymc'],
- HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
- HUpDater: "",
- HUpDateDate: "",
- HChecker: "",
- HCheckDate: "",
- HDeleteMan: "",
- HDeleteDate: "",
- lngBillKey: 0,
- lngBillSubKey: 0,
- HLastResult: "OK"
- }
- };
- },
- computed: {
- containerHeight: {
- get() {
- return this.btnTop - this.tabsBottom - 5
- }
- }
- },
- methods: {
- goBack() {
- uni.navigateBack()
- },
- checkBoxChangeHandler(index, e) {
- let cr = e.detail.value
- if (cr.length == 0) {
- this.HCheckFileList[index]["HMaintainResult"] = false
- } else {
- this.HCheckFileList[index]["HMaintainResult"] = true
- }
- },
- uploadFile(index) {
- console.log('filePath: ', this.attachmentInfo[index].filePath);
- // 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
- uni.uploadFile({
- url: CommonUtils.getServerUrl() + "/Sc_MouldMaintainBill/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: {
+ HBarCode: "",
+ HBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HQty: 1,
+ HBillNo: "",
+ HInterID: 0,
+ HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HMaintainLevName: "",
+ HMaintainLevID: 0,
+ HRemark: "",
+ HBarName: "",
+ HMouldID: 0,
+ HBarSpec: "",
+ HBarModel: "",
+ HPlanNo: "",
+ HPlanInterID: 0,
+ HMouldMaintainRuleInterID: 0,
+ HMouldMaintainRuleInterNo: "",
+ HRequestComDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HRecentMainModule: 0,
+ HCumulativeModule: 0,
+ HProductionModule: 0,
+ HExplanation: "",
+ HInnerBillNo: "",
+ HMainSourceInterID: 0,
+ HMainSourceEntryID: 0,
+ HMainSourceBillNo: "",
+ HMaker: getUserInfo()['Czymc'],
+ HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HUpDater: "",
+ HUpDateDate: "",
+ HChecker: "",
+ HCheckDate: "",
+ HDeleteMan: "",
+ HDeleteDate: "",
+ lngBillKey: 0,
+ lngBillSubKey: 0,
+ HLastResult: "OK"
+ }
+ };
+ },
+ computed: {
+ containerHeight: {
+ get() {
+ return this.btnTop - this.tabsBottom - 5
+ }
+ }
+ },
+ methods: {
+ addNew() {
+ uni.redirectTo({
+ url: "./Sc_MouldMaintainBill?operationType=1"
+ })
+ },
+ goBack() {
+ uni.navigateBack()
+ },
+ checkBoxChangeHandler(index, e) {
+ let cr = e.detail.value
+ if (cr.length == 0) {
+ this.HCheckFileList[index]["HMaintainResult"] = false
+ } else {
+ this.HCheckFileList[index]["HMaintainResult"] = true
+ }
+ },
+ uploadFile(index) {
+ console.log('filePath: ', this.attachmentInfo[index].filePath);
+ // 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
+ uni.uploadFile({
+ url: CommonUtils.getServerUrl() + "/Sc_MouldMaintainBill/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 getHMaintainLevList() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: '/Gy_BadReason/Gy_MaintainLevList',
- data: {
- sWhere: " and HUSEORGID = " + uni.getStorageSync('OrganizationID'),
- user: uni.getStorageSync('HUserName')
- }
- })
+ },
+ 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 getHMaintainLevList() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_BadReason/Gy_MaintainLevList',
+ data: {
+ sWhere: " and HUSEORGID = " + uni.getStorageSync('OrganizationID'),
+ user: uni.getStorageSync('HUserName')
+ }
+ })
- let {
- data,
- count,
- Message
- } = res.data
- if (count == 1) {
- this.HMaintainLevList = 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: "/QJ_PDA_MouldDotCheckBill/txtHBarCode_KeyDown",
- data: {
- HBarCode: HBarCode,
- user: uni.getStorageSync('HUserName')
- },
- })
- if (!res) {
- return
- }
- let {
- data,
- count,
- Message
- } = res.data
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ this.HMaintainLevList = data
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: err
+ })
+ }
+ },
+ toScanCode() {
+ MpaasScan.scanCode(cb => {
+ this.hform.HBarCode = cb
+ this.GetMessageByBarCode(cb)
+ })
+ },
+ async GetMessageByBarCode(HBarCode) {
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/QJ_PDA_MouldDotCheckBill/txtHBarCode_KeyDown",
+ data: {
+ HBarCode: HBarCode,
+ user: uni.getStorageSync('HUserName')
+ },
+ })
+ if (!res) {
+ return
+ }
+ let {
+ data,
+ count,
+ Message
+ } = res.data
- console.log('data: ', data);
- this.hform.HMouldID = data[0].HInterID
- this.hform.HBarName = data[0].HName
- this.hform.HBarSpec = data[0].HModel
- this.hform.HBarModel = data[0].HModel2
- this.hform.HQty = 1
- // 鑾峰彇妫�楠岃绋�
- this.GetItemByMouldFile()
- } catch (err) {
+ console.log('data: ', data);
+ this.hform.HMouldID = data[0].HInterID
+ this.hform.HBarName = data[0].HName
+ this.hform.HBarSpec = data[0].HModel
+ this.hform.HBarModel = data[0].HModel2
+ this.hform.HQty = 1
+ // 鑾峰彇妫�楠岃绋�
+ this.GetItemByMouldFile()
+ } catch (err) {
- }
- },
- async GetItemByMouldFile() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Web/GetItemByMouldFile",
- data: {
- "MouldProjectID": this.hform.HMouldID,
- "Type": "BY",
- "HDate": this.hform.HBeginDate
- }
- })
+ }
+ },
+ async GetItemByMouldFile() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Web/GetItemByMouldFile",
+ data: {
+ "MouldProjectID": this.hform.HMouldID,
+ "Type": "BY",
+ "HDate": this.hform.HBeginDate
+ }
+ })
- let {
- data,
- Message,
- count
- } = res.data
- if (count == 1) {
- this.hform.HMouldMaintainRuleInterID = data[0].HMouldMaintainRuleID
- this.hform.HMouldMaintainRuleInterNo = data[0].鍣ㄥ叿淇濆吇瑙勭▼
- this.hform.HPlanNo = data[0].鍗曟嵁鍙�
- this.hform.HMouldMaintainPlanInterID = (data[0].hmainid == null ? 0 : data[0].hmainid) == "" ?
- 0 : data[0].hmainid
- this.hform.HMouldMaintainPlanEntryID = (data[0].HEntryID == null ? 0 : data[0].HEntryID) ==
- "" ? 0 : data[0].HEntryID
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ if (count == 1) {
+ this.hform.HMouldMaintainRuleInterID = data[0].HMouldMaintainRuleID
+ this.hform.HMouldMaintainRuleInterNo = data[0].鍣ㄥ叿淇濆吇瑙勭▼
+ this.hform.HPlanNo = data[0].鍗曟嵁鍙�
+ this.hform.HMouldMaintainPlanInterID = (data[0].hmainid == null ? 0 : data[0].hmainid) ==
+ "" ?
+ 0 : data[0].hmainid
+ this.hform.HMouldMaintainPlanEntryID = (data[0].HEntryID == null ? 0 : data[0].HEntryID) ==
+ "" ? 0 : data[0].HEntryID
- this.HCheckFileList = Array.from(data).map(item => {
- return {
- "HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
- "HMaintainItemID": item.淇濆吇椤圭洰ID,
- "HMaintainItem": item.淇濆吇椤圭洰鍚嶇О,
- "HMaintainPart": item.淇濆吇閮ㄤ綅, // 淇敼瀛楁鍚�
- "HClaim": item.鍏蜂綋瑕佹眰,
- "HManagerID": item.璐熻矗浜篒D,
- "HManagerName": item.璐熻矗浜哄悕绉�,
- "HSourceInterID": item.hmainid == null ? 0 : item.hmainid, // 闇�纭鏄惁姝ｇ‘
- "HSourceEntryID": item.HEntryID == null ? 0 : item.HEntryID, // 闇�纭鏄惁姝ｇ‘
- "HSourceBillNo": item.鍗曟嵁鍙� // 闇�纭鏄惁姝ｇ‘
+ this.HCheckFileList = Array.from(data).map(item => {
+ return {
+ "HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
+ "HMaintainItemID": item.淇濆吇椤圭洰ID,
+ "HMaintainItem": item.淇濆吇椤圭洰鍚嶇О,
+ "HMaintainPart": item.淇濆吇閮ㄤ綅, // 淇敼瀛楁鍚�
+ "HClaim": item.鍏蜂綋瑕佹眰,
+ "HManagerID": item.璐熻矗浜篒D,
+ "HManagerName": item.璐熻矗浜哄悕绉�,
+ "HSourceInterID": item.hmainid == null ? 0 : item.hmainid, // 闇�纭鏄惁姝ｇ‘
+ "HSourceEntryID": item.HEntryID == null ? 0 : item.HEntryID, // 闇�纭鏄惁姝ｇ‘
+ "HSourceBillNo": item.鍗曟嵁鍙�, // 闇�纭鏄惁姝ｇ‘
+ "HMaintainResult": item.榛樿淇濆吇缁撴灉 == 'OK' ? true : false
+ }
+ })
- }
- })
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇淇濆吇瑙勭▼閿欒锛� ${Message}`
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鑾峰彇淇濆吇瑙勭▼閿欒锛� ${err}`
+ })
+ }
+ },
+ toCheckFile() {
+ // 鍒ゆ柇鏄惁宸叉壂鎻忔ā鍏�
+ if (!this.hform.HMouldID || this.hform.HMouldID == 0) {
+ uni.showToast({
+ title: '璇峰厛鎵弿妯″叿浜岀淮鐮佸甫鍑烘ā鍏蜂俊鎭�',
+ icon: 'none'
+ });
+ return;
+ }
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇淇濆吇瑙勭▼閿欒锛� ${Message}`
- })
- }
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: `鑾峰彇淇濆吇瑙勭▼閿欒锛� ${err}`
- })
- }
- },
- toCheckFile() {
- // 鍒ゆ柇鏄惁宸叉壂鎻忔ā鍏�
- if (!this.hform.HMouldID || this.hform.HMouldID == 0) {
- uni.showToast({
- title: '璇峰厛鎵弿妯″叿浜岀淮鐮佸甫鍑烘ā鍏蜂俊鎭�',
- icon: 'none'
- });
- return;
- }
+ // 鎵撳紑淇濆吇瑙勭▼閫夋嫨椤甸潰
+ uni.navigateTo({
+ url: '/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList?mouldId=' + this.hform
+ .HMouldID,
+ success: (res) => {
+ // 閫氳繃浜嬩欢閫氶亾鐩戝惉杩斿洖鐨勬暟鎹�
+ res.eventChannel.on('selectedPlanData', (data) => {
+ console.log('鎺ユ敹鍒伴�夋嫨鐨勬暟鎹�:', data);
+ // 璧嬪�煎瓧娈�
+ this.hform.HMouldMaintainRuleInterNo = data.鍗曟嵁鍙�;
+ this.hform.HMouldMaintainRuleInterID = data.hmainid;
+ this.hform.HPlanNo = data.淇濆吇璁″垝鍙� == null ? "" : data.淇濆吇璁″垝鍙�;
+ this.hform.HPlanInterID = data.淇濆吇璁″垝id == null ? 0 : ata.淇濆吇璁″垝id,
+ this.hform.HMouldMaintainPlanInterID = data.淇濆吇璁″垝id == null ? 0 :
+ data.淇濆吇璁″垝id;
+ this.hform.HMouldMaintainPlanEntryID = data.淇濆吇璁″垝瀛恑d == null ? 0 : data
+ .淇濆吇璁″垝瀛恑d;
+ this.hform.HMainSourceBillNo = data.淇濆吇璁″垝鍙� == null ? "" : data.淇濆吇璁″垝鍙�;
+ this.hform.HMaintainLevName = data.淇濆吇绾у埆;
+ this.hform.HMaintainLevID = data.HMaintainLevID;
- // 鎵撳紑淇濆吇瑙勭▼閫夋嫨椤甸潰
- uni.navigateTo({
- url: '/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainRuleBillList?mouldId=' + this.hform
- .HMouldID,
- success: (res) => {
- // 閫氳繃浜嬩欢閫氶亾鐩戝惉杩斿洖鐨勬暟鎹�
- res.eventChannel.on('selectedPlanData', (data) => {
- console.log('鎺ユ敹鍒伴�夋嫨鐨勬暟鎹�:', data);
- // 璧嬪�煎瓧娈�
- this.hform.HMouldMaintainRuleInterNo = data.鍗曟嵁鍙�;
- this.hform.HMouldMaintainRuleInterID = data.hmainid;
- this.hform.HPlanNo = data.淇濆吇璁″垝鍙� == null ? "" : data.淇濆吇璁″垝鍙�;
- this.hform.HPlanInterID = data.淇濆吇璁″垝id == null ? 0 : ata.淇濆吇璁″垝id,
- this.hform.HMouldMaintainPlanInterID = data.淇濆吇璁″垝id == null ? 0 : data.淇濆吇璁″垝id;
- this.hform.HMouldMaintainPlanEntryID = data.淇濆吇璁″垝瀛恑d == null ? 0 : data.淇濆吇璁″垝瀛恑d;
- this.hform.HMainSourceBillNo = data.淇濆吇璁″垝鍙� == null ? "" : data.淇濆吇璁″垝鍙�;
- this.hform.HMaintainLevName = data.淇濆吇绾у埆;
- this.hform.HMaintainLevID = data.HMaintainLevID;
+ // 璋冪敤鑾峰彇淇濆吇椤圭洰鐨勬柟娉�
+ this.get_MaintainItem2();
+ });
- // 璋冪敤鑾峰彇淇濆吇椤圭洰鐨勬柟娉�
- this.get_MaintainItem2();
- });
+ res.eventChannel.on('closePage', () => {
+ console.log('鍏抽棴閫夋嫨椤甸潰');
+ });
+ }
+ });
+ },
- res.eventChannel.on('closePage', () => {
- console.log('鍏抽棴閫夋嫨椤甸潰');
- });
- }
- });
- },
+ // 鑾峰彇淇濆吇瑙勫垯椤圭洰
+ async get_MaintainItem2() {
+ try {
+ // 楠岃瘉鏄惁宸查�夋嫨淇濆吇瑙勭▼
+ if (!this.hform.HMouldMaintainRuleInterID || this.hform.HMouldMaintainRuleInterID == 0) {
+ uni.showToast({
+ title: '璇峰厛閫夋嫨淇濆吇瑙勭▼',
+ icon: 'none'
+ });
+ return;
+ }
- // 鑾峰彇淇濆吇瑙勫垯椤圭洰
- async get_MaintainItem2() {
- try {
- // 楠岃瘉鏄惁宸查�夋嫨淇濆吇瑙勭▼
- if (!this.hform.HMouldMaintainRuleInterID || this.hform.HMouldMaintainRuleInterID == 0) {
- uni.showToast({
- title: '璇峰厛閫夋嫨淇濆吇瑙勭▼',
- icon: 'none'
- });
- return;
- }
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Web/GetMaintainItemByMaintainRuleID/Mould',
+ data: {
+ "HMouldMaintainRuleInterID": this.hform.HMouldMaintainRuleInterID
+ }
+ });
- let res = await CommonUtils.doRequest2Async({
- url: '/Web/GetMaintainItemByMaintainRuleID/Mould',
- data: {
- "HMouldMaintainRuleInterID": this.hform.HMouldMaintainRuleInterID
- }
- });
+ let {
+ data,
+ count,
+ Message
+ } = res.data;
- let {
- data,
- count,
- Message
- } = res.data;
+ if (count == 1) {
+ if (data && data.length > 0) {
+ this.HCheckFileList = Array.from(data).map(item => {
+ return {
+ "HMaintainItemID": item.HMaintainItemID || 0,
+ "HMaintainItem": item.淇濆吇椤圭洰 || "",
+ "HMaintainPart": item.淇濆吇閮ㄤ綅 || "",
+ "HClaim": item.鍏蜂綋瑕佹眰 || "",
+ "HManagerID": item.璐熻矗浜篒D || 0,
+ "HManagerCode": item.璐熻矗浜轰唬鐮� || "",
+ "HManagerName": item.璐熻矗浜哄悕绉� || "",
+ "HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
+ "HRemark": item.琛ㄤ綋澶囨敞 || "",
+ };
+ });
+ } else {
+ this.HCheckFileList = [];
+ uni.showToast({
+ title: '璇ヤ繚鍏昏绋嬫殏鏃犱繚鍏婚」鐩褰�',
+ icon: 'none'
+ });
+ }
+ } else {
+ this.HCheckFileList = [];
+ uni.showToast({
+ title: Message || '鑾峰彇淇濆吇椤圭洰澶辫触',
+ icon: 'none'
+ });
+ }
+ } catch (err) {
+ this.HCheckFileList = [];
+ uni.showToast({
+ title: `鑾峰彇淇濆吇椤圭洰澶辫触: ${err}`,
+ icon: 'none'
+ });
+ }
+ },
+ radioChange(e) {
+ console.log('radioChange:', e.detail.value);
+ this.hform.HLastResult = e.detail.value;
+ },
+ getEditData(hmainid) {
+ // 涓昏〃鏁版嵁
+ uni.request({
+ url: CommonUtils.getServerUrl() +
+ '/Sc_MouldMaintainBill/Sc_MouldMaintainBillListCheckDetai',
+ data: {
+ HID: hmainid
+ },
+ success: (res) => {
+ console.log('缂栬緫鎺ュ彛杩斿洖鏁版嵁:', res.data);
+ if (res.data.code == 1) {
+ var data = res.data.data.h_v_Sc_MouldMaintain[0];
+ this.hform = {
+ HInterID: hmainid,
+ HBillNo: data.鍗曟嵁鍙�,
+ HDate: data.鏃ユ湡.substr(0, 10),
+ HMouldID: data.HMouldID || 0,
+ HBarCode: data.妯″叿鏉＄爜 || "",
+ HBarName: data.浜у搧妯″叿 || "",
+ HBarSpec: data.妯″叿瑙勬牸 || "",
+ HBarModel: data.妯″叿鍨嬪彿 || "",
+ HPlanNo: data.淇濆吇璁″垝缂栧彿 || "",
+ HPlanInterID: data.淇濆吇璁″垝鍐呯爜 || 0,
+ HBeginDate: data.淇濆吇寮�濮嬫棩鏈� ? data.淇濆吇寮�濮嬫棩鏈�.substr(0, 10) : dayjs(new Date())
+ .format("YYYY-MM-DD HH:mm:ss"),
+ HEndDate: data.淇濆吇缁撴潫鏃ユ湡 ? data.淇濆吇缁撴潫鏃ユ湡.substr(0, 10) : dayjs(new Date())
+ .format("YYYY-MM-DD HH:mm:ss"),
+ HLastResult: data.鏈�缁堢粨璁� === '鍚堟牸' ? 'OK' : (data.鏈�缁堢粨璁� === '涓嶅悎鏍�' ? 'NG' :
+ 'OK'),
+ HMouldMaintainRuleInterID: data.HMouldMaintainRuleInterID || 0,
+ HMouldMaintainRuleInterNo: data.鍣ㄥ叿淇濆吇瑙勭▼ || "",
+ HRemark: data.澶囨敞 || "",
+ HMaintainLevID: data.HMaintainLevID || 0,
+ HMaintainLevName: data.淇濆吇绾у埆鍚嶇О || "",
+ HQty: data.鏁伴噺 || 1,
+ HMaker: data.鍒跺崟浜� || getUserInfo()['Czymc'],
+ HMakeDate: data.鍒跺崟鏃ユ湡 ? data.鍒跺崟鏃ユ湡.substr(0, 10) : dayjs(new Date())
+ .format(
+ "YYYY-MM-DD"),
+ HUpDater: data.淇敼浜� || "",
+ HUpDateDate: data.淇敼鏃ユ湡 ? data.淇敼鏃ユ湡.substr(0, 10) : "",
+ HChecker: data.瀹℃牳浜� || "",
+ HCheckDate: data.瀹℃牳鏃ユ湡 ? data.瀹℃牳鏃ユ湡.substr(0, 10) : "",
+ HDeleteMan: data.浣滃簾浜� || "",
+ HDeleteDate: data.浣滃簾鏃ユ湡 ? data.浣滃簾鏃ユ湡.substr(0, 10) : "",
+ lngBillKey: 0,
+ lngBillSubKey: 0,
+ HInnerBillNo: data.鍐呴儴鍗曟嵁鍙� || "",
+ HExplanation: data.鎽樿 || "",
+ HRequestComDate: data.瑕佹眰瀹屾垚鏃ユ湡 ? data.瑕佹眰瀹屾垚鏃ユ湡.substr(0, 10) : "",
+ HRecentMainModule: data.鏈�杩戜繚鍏绘ā鏁� || 0,
+ HCumulativeModule: data.绱妯℃暟 || 0,
+ HProductionModule: data.鏈鐢熶骇妯℃暟 || 0
+ };
- if (count == 1) {
- if (data && data.length > 0) {
- this.HCheckFileList = Array.from(data).map(item => {
- return {
- "HMaintainItemID": item.HMaintainItemID || 0,
- "HMaintainItem": item.淇濆吇椤圭洰 || "",
- "HMaintainPart": item.淇濆吇閮ㄤ綅 || "",
- "HClaim": item.鍏蜂綋瑕佹眰 || "",
- "HManagerID": item.璐熻矗浜篒D || 0,
- "HManagerCode": item.璐熻矗浜轰唬鐮� || "",
- "HManagerName": item.璐熻矗浜哄悕绉� || "",
- "HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
- "HRemark": item.琛ㄤ綋澶囨敞 || ""
- };
- });
- } else {
- this.HCheckFileList = [];
- uni.showToast({
- title: '璇ヤ繚鍏昏绋嬫殏鏃犱繚鍏婚」鐩褰�',
- icon: 'none'
- });
- }
- } else {
- this.HCheckFileList = [];
- uni.showToast({
- title: Message || '鑾峰彇淇濆吇椤圭洰澶辫触',
- icon: 'none'
- });
- }
- } catch (err) {
- this.HCheckFileList = [];
- uni.showToast({
- title: `鑾峰彇淇濆吇椤圭洰澶辫触: ${err}`,
- icon: 'none'
- });
- }
- },
- radioChange(e) {
- console.log('radioChange:', e.detail.value);
- this.hform.HLastResult = e.detail.value;
- },
- getEditData(hmainid) {
- // 涓昏〃鏁版嵁
- uni.request({
- url: CommonUtils.getServerUrl() + '/Sc_MouldMaintainBill/Sc_MouldMaintainBillListCheckDetai',
- data: {
- HID: hmainid
- },
- success: (res) => {
- console.log('缂栬緫鎺ュ彛杩斿洖鏁版嵁:', res.data);
- if (res.data.code == 1) {
- var data = res.data.data.h_v_Sc_MouldMaintain[0];
- this.hform = {
- HInterID: hmainid,
- HBillNo: data.鍗曟嵁鍙�,
- HDate: data.鏃ユ湡.substr(0, 10),
- HMouldID: data.HMouldID || 0,
- HBarCode: data.妯″叿鏉＄爜 || "",
- HBarName: data.浜у搧妯″叿 || "",
- HBarSpec: data.妯″叿瑙勬牸 || "",
- HBarModel: data.妯″叿鍨嬪彿 || "",
- HPlanNo: data.淇濆吇璁″垝缂栧彿 || "",
- HPlanInterID: data.淇濆吇璁″垝鍐呯爜 || 0,
- HBeginDate: data.淇濆吇寮�濮嬫棩鏈� ? data.淇濆吇寮�濮嬫棩鏈�.substr(0, 10) : dayjs(new Date())
- .format("YYYY-MM-DD HH:mm:ss"),
- HEndDate: data.淇濆吇缁撴潫鏃ユ湡 ? data.淇濆吇缁撴潫鏃ユ湡.substr(0, 10) : dayjs(new Date())
- .format("YYYY-MM-DD HH:mm:ss"),
- HLastResult: data.鏈�缁堢粨璁� === '鍚堟牸' ? 'OK' : (data.鏈�缁堢粨璁� === '涓嶅悎鏍�' ? 'NG' :
- 'OK'),
- HMouldMaintainRuleInterID: data.HMouldMaintainRuleInterID || 0,
- HMouldMaintainRuleInterNo: data.鍣ㄥ叿淇濆吇瑙勭▼ || "",
- HRemark: data.澶囨敞 || "",
- HMaintainLevID: data.HMaintainLevID || 0,
- HMaintainLevName: data.淇濆吇绾у埆鍚嶇О || "",
- HQty: data.鏁伴噺 || 1,
- HMaker: data.鍒跺崟浜� || getUserInfo()['Czymc'],
- HMakeDate: data.鍒跺崟鏃ユ湡 ? data.鍒跺崟鏃ユ湡.substr(0, 10) : dayjs(new Date()).format(
- "YYYY-MM-DD"),
- HUpDater: data.淇敼浜� || "",
- HUpDateDate: data.淇敼鏃ユ湡 ? data.淇敼鏃ユ湡.substr(0, 10) : "",
- HChecker: data.瀹℃牳浜� || "",
- HCheckDate: data.瀹℃牳鏃ユ湡 ? data.瀹℃牳鏃ユ湡.substr(0, 10) : "",
- HDeleteMan: data.浣滃簾浜� || "",
- HDeleteDate: data.浣滃簾鏃ユ湡 ? data.浣滃簾鏃ユ湡.substr(0, 10) : "",
- lngBillKey: 0,
- lngBillSubKey: 0,
- HInnerBillNo: data.鍐呴儴鍗曟嵁鍙� || "",
- HExplanation: data.鎽樿 || "",
- HRequestComDate: data.瑕佹眰瀹屾垚鏃ユ湡 ? data.瑕佹眰瀹屾垚鏃ユ湡.substr(0, 10) : "",
- HRecentMainModule: data.鏈�杩戜繚鍏绘ā鏁� || 0,
- HCumulativeModule: data.绱妯℃暟 || 0,
- HProductionModule: data.鏈鐢熶骇妯℃暟 || 0
- };
+ // 鑾峰彇閮ㄩ棬鍒楄〃骞惰缃繚鍏荤骇鍒�
+ if (data.HMaintainLevID) {
+ this.$nextTick(() => {
+ this.hform.HMaintainLevID = data.HMaintainLevID;
+ });
+ }
+ } else {
+ uni.showToast({
+ title: res.data.Message || '鑾峰彇鏁版嵁澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log('涓昏〃璇锋眰澶辫触:', res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ complete: () => {
+ // 鑾峰彇瀛愯〃鏁版嵁
+ this.getSubEditData(hmainid);
+ }
+ });
+ },
- // 鑾峰彇閮ㄩ棬鍒楄〃骞惰缃繚鍏荤骇鍒�
- if (data.HMaintainLevID) {
- this.$nextTick(() => {
- this.hform.HMaintainLevID = data.HMaintainLevID;
- });
- }
- } else {
- uni.showToast({
- title: res.data.Message || '鑾峰彇鏁版嵁澶辫触',
- icon: 'none'
- })
- }
- },
- fail: (res) => {
- console.log('涓昏〃璇锋眰澶辫触:', res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- },
- complete: () => {
- // 鑾峰彇瀛愯〃鏁版嵁
- this.getSubEditData(hmainid);
- }
- });
- },
+ // 鑾峰彇瀛愯〃鏁版嵁
+ getSubEditData(hmainid) {
+ uni.request({
+ url: CommonUtils.getServerUrl() +
+ '/Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetaiNew',
+ data: {
+ "HInterID": hmainid
+ },
+ success: (res) => {
+ console.log('瀛愯〃鏁版嵁:', res.data);
+ if (res.data.count == 1) {
+ this.HCheckFileList = res.data.list[0].map(item => {
+ const isChecked = item.HMaintainResult === '鍚堟牸' ? true : false;
+ return {
+ "HMaintainItemID": item.HMaintainItemID || 0,
+ "HMaintainItem": item.HMaintainItem || "",
+ "HMaintainPart": item.HMaintainPart || "",
+ "HClaim": item.HClaim || "",
+ "HManagerID": item.HManagerID || 0,
+ "HManagerName": item.HManagerName || "",
+ "HMaintainResult": isChecked,
+ "HRemark": item.HManagerName || ""
+ };
+ });
+ } else {
+ console.log('瀛愯〃鏁版嵁涓虹┖鎴栬幏鍙栧け璐�:', res.data.Message);
+ this.HCheckFileList = [];
+ }
+ },
+ fail: (res) => {
+ console.log('瀛愯〃璇锋眰澶辫触:', res);
+ this.HCheckFileList = [];
+ }
+ });
+ },
+ async getMaxNum() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Web/GetMAXNum",
+ data: {
+ "HBillType": this.HBillType
+ }
+ })
- // 鑾峰彇瀛愯〃鏁版嵁
- getSubEditData(hmainid) {
- uni.request({
- url: CommonUtils.getServerUrl() +
- '/Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetaiNew',
- data: {
- "HInterID":hmainid
- },
- success: (res) => {
- console.log('瀛愯〃鏁版嵁:', res.data);
- if (res.data.count == 1) {
- this.HCheckFileList = res.data.list[0].map(item => {
- const isChecked = item.HMaintainResult === '鍚堟牸' ? true : false;
- return {
- "HMaintainItemID": item.HMaintainItemID || 0,
- "HMaintainItem": item.HMaintainItem || "",
- "HMaintainPart": item.HMaintainPart || "",
- "HClaim": item.HClaim || "",
- "HManagerID": item.HManagerID || 0,
- "HManagerName": item.HManagerName || "",
- "HMaintainResult": isChecked,
- "HRemark": item.HManagerName || ""
- };
- });
- } else {
- console.log('瀛愯〃鏁版嵁涓虹┖鎴栬幏鍙栧け璐�:', res.data.Message);
- this.HCheckFileList = [];
- }
- },
- fail: (res) => {
- console.log('瀛愯〃璇锋眰澶辫触:', res);
- this.HCheckFileList = [];
- }
- });
- },
- 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() {
+ try {
+ let oMain = JSON.stringify(this.hform);
+ let sSubStr = JSON.stringify(this.HCheckFileList);
+ let sMainSub = oMain + ';' + sSubStr + ';' + uni.getStorageSync('HUserName');
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Sc_MouldMaintainBill/SaveGetMouldMaintainBillListAPP",
+ data: {
+ "msg": sMainSub
+ },
+ method: "POST"
+ })
- 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() {
- try {
- let oMain = JSON.stringify(this.hform);
- let sSubStr = JSON.stringify(this.HCheckFileList);
- let sMainSub = oMain + ';' + sSubStr + ';' + uni.getStorageSync('HUserName');
- let res = await CommonUtils.doRequest2Sync({
- url: "/Sc_MouldMaintainBill/SaveGetMouldMaintainBillListAPP",
- data: {
- "msg": sMainSub
- },
- method: "POST"
- })
+ if (!res) {
+ return
+ }
- 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/mujubaoyangjiludan/Sc_MouldMaintainBill?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) {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url: '/pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill?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);
- this.getHMaintainLevList()
- if (!e.operationType) {
- this.operationType = 1
- } else {
- this.operationType = e.operationType
- }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鎻愪氦鍗曟嵁澶辫触: " + err
+ })
+ }
+ }
+ },
+ onLoad(e) {
+ console.log('e: ', e);
+ this.getHMaintainLevList()
+ 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) {
- // 缂栬緫
- this.getEditData(e.hmainid)
- } else if (this.operationType == 4) {
- // 娴忚
+ if (this.operationType == 1) {
+ // 鏂板
+ this.getMaxNum()
+ } else if (this.operationType == 2) {
+ // 澶嶅埗
+ } else if (this.operationType == 3) {
+ // 缂栬緫
+ this.getEditData(e.hmainid)
+ } else if (this.operationType == 4) {
+ // 娴忚
+ // 涓嬫帹
+ let HBarCode = e.HBarCode
+ this.getMaxNum()
+ if (HBarCode) {
+ this.GetMessageByBarCode(HBarCode)
+ }
- }
- },
- 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)
- })
- }
- }
+ }
+ },
+ 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">
diff --git a/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue b/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue
index dc6f68a..678ab03 100644
--- a/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue
+++ b/pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue
@@ -380,6 +380,11 @@
}
},
methods: {
+ addNew() {
+ uni.redirectTo({
+ url: "./Sc_MouldDotCheckBill?operationType=1"
+ })
+ },
goBack() {
uni.navigateBack()
},
@@ -509,7 +514,7 @@
},
toScanCode() {
MpaasScan.scanCode(cb => {
- this.hfrom.HBarCode = cb
+ this.hform.HBarCode = cb
this.GetMessageByBarCode(cb)
})
},
@@ -583,7 +588,8 @@
"HDotCheckItemClassName": item.鐐规椤圭洰鍒嗙被鍚嶇О || "",
"HDotCheckItemMethodID": item.鐐规鏂规硶id || 0,
"HDotCheckItemMethodName": item.鐐规鏂规硶 || "",
- "HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
+ // "HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
+ "HDotCheckResult": item.榛樿鐐规缁撴灉 == 'OK' ? true : false
}
})
this.tabs = 1
diff --git a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
index 0734c9f..7d435de 100644
--- a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
+++ b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
@@ -466,6 +466,7 @@
},
//浠撳簱鐩戝惉浜嬩欢
HWHNameChange(e) {
+ console.log('e: ',e);
for (var i = 0; i < this.HWHNameList.length; i++) {
if (this.HWHNameList[i]["HName"] == e) {
this.hform.HWHName = this.HWHNameList[i]["HName"]
@@ -517,6 +518,7 @@
for (var i = 0; i < data.length; i++) {
this.arrayHWHName[i] = data[i]["HName"]
}
+ this.HWHNameChange(data[0]['HName'])
}
},
)
diff --git a/pages/MJGL/shangmudan/MouldUpperBill.vue b/pages/MJGL/shangmudan/MouldUpperBill.vue
index 514dd2e..597c282 100644
--- a/pages/MJGL/shangmudan/MouldUpperBill.vue
+++ b/pages/MJGL/shangmudan/MouldUpperBill.vue
@@ -55,7 +55,7 @@
</view>
</view>
<view class="form-item">
- <view class="title">鐢熶骇璧勬簮:</view>
+ <view class="title"><text>*</text>鐢熶骇璧勬簮:</view>
<view class="right">
<uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
@input="HSourceNameChange"></uni-combox>
@@ -317,7 +317,7 @@
this.hform.HDate = e.detail.value
},
getHBarCodeData(HBarCode) {
- if (uni.getStorageSync('Organization') != "浜嬩笟涓�澶�") {
+ if (uni.getStorageSync('Organization') == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�") {
if (!this.hform.HSourceName) {
uni.showToast({
title: '璇峰厛閫夋嫨鎴栨壂鎻忕敓浜ц祫婧�',
@@ -365,12 +365,13 @@
var data = res.data.data[0];
var num = data.Num;
switch (num) {
+ //鐢熶骇璧勬簮
case 1:
this.hform.HSourceID = data.HItemID;
this.hform.HSourceName = data.HName;
this.refreshBarCodeState();
break;
-
+ //鐢熶骇璁㈠崟
case 2:
this.hform.HICMOBillNo = data.鍗曟嵁鍙�;
this.hform.HICMOInterID = data.hmainid;
@@ -383,7 +384,7 @@
this.GetMaterialMouldList();
}
break;
-
+ //妯″叿
case 3:
if (!this.hform.HICMOBillNo && !this.hform.HProcExchBillNo) {
uni.showToast({
@@ -414,6 +415,7 @@
this.handleMouldData(data);
}
break;
+ //娴佽浆鍗�
case 4:
this.hform.HProcExchBillNo = data.鍗曟嵁鍙�;
this.hform.HProcExchInterID = data.hmainid;
@@ -422,6 +424,8 @@
this.hform.HICMOInterID = data.hicmointerid;
this.hform.HICMOEntryID = data.HICMOEntryID;
this.hform.HMaterID = data.HMaterID;
+ this.hform.HSourceID = data.HSourceID;
+ this.hform.HSourceName = data.HSourceName;
this.refreshBarCodeState();
if (uni.getStorageSync('OrganizationID') == "100007" && uni.getStorageSync(
'Organization') == "浜嬩笟涓�澶�") {
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue
index 553f399..da967e7 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue
@@ -80,13 +80,6 @@
</view>
</view>
<view class="form-item">
- <view class="title">闂鏉ユ簮:</view>
- <view class="right">
- <uni-combox :candidates="arrayHForm" placeholder="璇烽�夋嫨闂鏉ユ簮" v-model="hform.HForm"
- @input="HFormChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
<view class="title">鐢熶骇璧勬簮:</view>
<view class="right">
<uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨" v-model="hform.HSourceName"
@@ -150,6 +143,13 @@
<template v-if="tabs == 1">
<view class="form">
<view class="form-item">
+ <view class="title">闂鏉ユ簮:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHForm" placeholder="璇烽�夋嫨闂鏉ユ簮" v-model="hform.HForm"
+ @input="HFormChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
<view class="title">鎺ユ敹閮ㄩ棬:</view>
<view class="right">
<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HRecDeptName"
diff --git a/pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue b/pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue
index bf4ee68..575616f 100644
--- a/pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue
+++ b/pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue
@@ -72,6 +72,7 @@
<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="selected(item)">鏌ョ湅鏄庣粏</button>
<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
</uni-card>
@@ -119,10 +120,13 @@
listData: [],
showList: [],
page: 1,
- HSourceBillTypeList: {棣栦欢妫�楠屽崟:'8505',鏈欢妫�楠屽崟:'8507'},
+ HSourceBillTypeList: {棣栦欢妫�楠屽崟:'8505',鏈欢妫�楠屽崟:'8507',閲囪喘璁㈠崟:'1102',閿�鍞鍗�:'1401',鐗规壒鍗�:'1422'},
arrayHSourceBillTypeName: [
"棣栦欢妫�楠屽崟",
"鏈欢妫�楠屽崟",
+ "閲囪喘璁㈠崟",
+ "閿�鍞鍗�",
+ "鐗规壒鍗�"
],
}
},
@@ -250,6 +254,30 @@
CurUserName: getUserInfo()["Czymc"],
CurUserID:getUserInfo()["Czybm"],
}
+ }else if(this.hform.HSourceBillType=='1102'){
+ url = 'Cg_POOrderBill/AuditCg_POOrderBill_Flow',
+ ajaxData= {
+ HInterID: item["hmainid"],
+ IsAudit: mode,
+ CurUserName: getUserInfo()["Czymc"],
+ CurUserID:getUserInfo()["Czybm"],
+ }
+ }else if(this.hform.HSourceBillType=='1401'){
+ url = 'Xs_SeOrderBill/AuditXs_SeOrderBill_Flow',
+ ajaxData= {
+ HInterID: item["hmainid"],
+ IsAudit: mode,
+ CurUserName: getUserInfo()["Czymc"],
+ CurUserID:getUserInfo()["Czybm"],
+ }
+ }else if(this.hform.HSourceBillType=='1422'){
+ url = 'Xs_ExceptiveCheckRequestBill/AuditXs_ExceptiveCheckRequestBill',
+ ajaxData= {
+ HInterID: item["hmainid"],
+ IsAudit: mode,
+ CurUserName: getUserInfo()["Czymc"],
+ //CurUserID:getUserInfo()["Czybm"],
+ }
}
try{
let res = await CommonUtils.doRequest2Sync({
@@ -303,6 +331,18 @@
}
}else if(this.hform.HSourceBillType=='8507'){
url = 'QC_ProcessCheckBill/RejectCheckFlow',
+ ajaxData= {
+ HInterID: item["hmainid"],
+ CurUserID:getUserInfo()["Czybm"],
+ }
+ }else if(this.hform.HSourceBillType=='1401'){
+ url = 'Xs_SeOrderBill/RejectCheckFlow_POOrderBill',
+ ajaxData= {
+ HInterID: item["hmainid"],
+ CurUserID:getUserInfo()["Czybm"],
+ }
+ }else if(this.hform.HSourceBillType=='1102'){
+ url = 'Cg_POOrderBill/RejectCheckFlow_POOrderBill',
ajaxData= {
HInterID: item["hmainid"],
CurUserID:getUserInfo()["Czybm"],
@@ -403,6 +443,29 @@
}
})
},
+ async selected(item)
+ {
+ if(this.hform.HSourceBillType=='1401') //閿�鍞�
+ {
+ console.log(item)
+ uni.navigateTo({
+ url: '/pages/xiaoshoudingdan/xiaoshoudingdanListEdit?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
+ })
+ }else if(this.hform.HSourceBillType=='1102') //閲囪喘
+ {
+ console.log(item)
+ uni.navigateTo({
+ url: '/pages/caigoudingdan/caigoudingdanListEdit?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
+ })
+ }else if(this.hform.HSourceBillType=='1422') //閲囪喘
+ {
+ console.log(item)
+ uni.navigateTo({
+ url: '/pages/tepidan/TePiDanEdit?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
+ })
+ }
+
+ },
// 涓婁紶鏂囦欢
fileUpload(item) {
this.uploadOptions.formData.HBillNo = item.鍗曟嵁鍙�
@@ -476,6 +539,7 @@
}
}
},
+
onShow() {
this.$nextTick(() => {
this.cmdSearch()
diff --git a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
index e7daec9..a5ac33c 100644
--- a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
+++ b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
@@ -652,6 +652,8 @@
message: `涓婁紶鎴愬姛`
})
this.attachmentInfo = []
+ // 鍒锋柊鍗曟嵁鍙凤紝闃叉鍗曟嵁鍙烽噸澶�
+ this.GetMaxNumPDA()
} else {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
diff --git a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
index e7dbd6e..f076bce 100644
--- a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
+++ b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -1951,6 +1951,22 @@
return true;
},
+ async auditBill() {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/QC_ProcessCheckBill/QC_ProcessCheckBillMainValue",
+ data: {
+ HInterID: this.hform.HInterID,
+ IsAudit: 0,
+ CurUserName: getUserInfo()['Czymc']
+ }
+ })
+
+ if (res.data.count == 1) {
+ return true
+ } else {
+ return false
+ }
+ },
async submit() {
if (!this.checkSubmitValidate()) {
return;
@@ -1982,7 +1998,8 @@
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({
@@ -2000,26 +2017,58 @@
let {
count,
Message,
- data
+ data,
+ Verify = 'N'
} = res.data;
if (count == 1) {
- uni.showModal({
- title: "鎻愮ず",
- content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
- success: (res) => {
- if (res.confirm) {
- console.log("鐢ㄦ埛鐐瑰嚮纭畾");
- uni.redirectTo({
- url: "/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=1",
- });
- } else if (res.cancel) {
- console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
- setTimeout(() => {
- uni.navigateBack();
- }, 50)
- }
- },
- });
+ // 鍒ゆ柇鏄惁鑷姩瀹℃牳
+ if (Verify == 'Y') {
+ let AuditSuccess = await this.auditBill()
+ if (AuditSuccess) {
+ console.log("瀹℃牳鎴愬姛");
+ uni.showModal({
+ title: "鎻愮ず",
+ content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
+ success: (res) => {
+ if (res.confirm) {
+ console.log("鐢ㄦ埛鐐瑰嚮纭畾");
+ uni.redirectTo({
+ url: "/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=1",
+ });
+ } else if (res.cancel) {
+ console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ }
+ },
+ });
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: '瀹℃牳澶辫触'
+ })
+ }
+ } else {
+ uni.showModal({
+ title: "鎻愮ず",
+ content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
+ success: (res) => {
+ if (res.confirm) {
+ console.log("鐢ㄦ埛鐐瑰嚮纭畾");
+ uni.redirectTo({
+ url: "/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=1",
+ });
+ } else if (res.cancel) {
+ console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ }
+ },
+ });
+ }
+
} else {
CommonUtils.showTips({
title: "娓╅Θ鎻愮ず",
@@ -2250,28 +2299,28 @@
});
}
},
- // 璁剧疆涓鸿嚜鍔�
- setAuto() {
- if (uni.getSystemInfoSync().platform === 'android' ||
- uni.getSystemInfoSync().platform === 'ios') {
- plus.screen.unlockOrientation();
- }
- },
- // 璁剧疆涓虹珫灞�
- setPortrait() {
- if (uni.getSystemInfoSync().platform === 'android' ||
- uni.getSystemInfoSync().platform === 'ios') {
- plus.screen.lockOrientation('portrait');
- }
- },
+ // 璁剧疆涓鸿嚜鍔�
+ setAuto() {
+ if (uni.getSystemInfoSync().platform === 'android' ||
+ uni.getSystemInfoSync().platform === 'ios') {
+ plus.screen.unlockOrientation();
+ }
+ },
+ // 璁剧疆涓虹珫灞�
+ setPortrait() {
+ if (uni.getSystemInfoSync().platform === 'android' ||
+ uni.getSystemInfoSync().platform === 'ios') {
+ plus.screen.lockOrientation('portrait');
+ }
+ },
},
async onLoad(e) {
- this.setAuto();
+ // this.setAuto();
this.operationType = e.operationType || 1;
this.hform.HInterID = e.linterid || 0;
if (this.operationType == 1) {
await this.getMaxBillNo();
-
+
if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
this.HSourceBillType = "宸ュ簭鍑虹珯姹囨姤鍗�"; // 鏄剧ず鍚嶇О
this.hform.HSourceBillType = "3791"; // 瀵瑰簲鐨勫��
@@ -2300,9 +2349,9 @@
await this.InitHEmp();
await this.loadCache();
},
- onUnload(){
- this.setPortrait();
- }
+ onUnload() {
+ this.setPortrait();
+ }
};
</script>
@@ -2345,68 +2394,74 @@
}
}
- .bill-main-content{
- box-sizing: border-box;
- padding: 0 30rpx 0 30rpx;
- display: flex;
- flex-direction: row;
- flex-wrap: wrap; /* 瓒呭嚭鑷姩鎹㈣ */
- /* 鍙�夛細璁剧疆鎹㈣鍚庣殑瀵归綈鏂瑰紡 */
- align-content: flex-start; /* 澶氳瀵归綈鏂瑰紡 */
- .form-item {
- width: 600rpx;
- display: flex;
- align-items: center;
- font-size: 26rpx;
- padding: 6rpx 0;
- margin-right: 20rpx;
- .left {
- width: 208rpx;
-
- text {
- color: red;
- font-weight: bold;
- }
- }
-
- .right {
- // width: 450rpx;
- padding: 8rpx 20rpx;
- font-size: 26rpx;
- flex: 1;
- border-radius: 22rpx;
- border: 1px solid #acacac;
-
- .uni-combox {
- padding: 0;
- height: auto;
-
- .uni-input-placeholder,
- .uni-input-input {
- font-size: 26rpx;
- }
- }
-
- .uni-combox::v-deep input {
- height: inherit;
- font-size: 26rpx;
- }
- }
- .right-select {
- //padding: 8rpx 20rpx;
- font-size: 26rpx;
- flex: 1;
-
- }
- .disabled {
- border: 1px solid #e4e4e4;
- background-color: #e4e4e4;
- }
-
- .none-border {
- border: none;
- }
- }
+ .bill-main-content {
+ box-sizing: border-box;
+ padding: 0 30rpx 0 30rpx;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ /* 瓒呭嚭鑷姩鎹㈣ */
+ /* 鍙�夛細璁剧疆鎹㈣鍚庣殑瀵归綈鏂瑰紡 */
+ align-content: flex-start;
+
+ /* 澶氳瀵归綈鏂瑰紡 */
+ .form-item {
+ width: 600rpx;
+ display: flex;
+ align-items: center;
+ font-size: 26rpx;
+ padding: 6rpx 0;
+ margin-right: 20rpx;
+
+ .left {
+ width: 208rpx;
+
+ text {
+ color: red;
+ font-weight: bold;
+ }
+ }
+
+ .right {
+ // width: 450rpx;
+ padding: 8rpx 20rpx;
+ font-size: 26rpx;
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+
+ .uni-combox {
+ padding: 0;
+ height: auto;
+
+ .uni-input-placeholder,
+ .uni-input-input {
+ font-size: 26rpx;
+ }
+ }
+
+ .uni-combox::v-deep input {
+ height: inherit;
+ font-size: 26rpx;
+ }
+ }
+
+ .right-select {
+ //padding: 8rpx 20rpx;
+ font-size: 26rpx;
+ flex: 1;
+
+ }
+
+ .disabled {
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
+
+ .none-border {
+ border: none;
+ }
+ }
}
.bottom-btn {
@@ -2486,14 +2541,18 @@
}
::v-deep .uni-card {
- flex: 500rpx;
+ flex: 500rpx;
}
+
.list {
width: 100%;
- display: flex; /* 娣诲姞flex甯冨眬 */
- flex-wrap: wrap; /* 鍏佽鎹㈣ */
- gap: 20rpx; /* 璁剧疆鍗＄墖闂磋窛 */
-
+ display: flex;
+ /* 娣诲姞flex甯冨眬 */
+ flex-wrap: wrap;
+ /* 鍏佽鎹㈣ */
+ gap: 20rpx;
+ /* 璁剧疆鍗＄墖闂磋窛 */
+
.card-detail {
width: 500rpx;
display: flex;
@@ -2503,34 +2562,34 @@
line-height: 120%;
padding: 20rpx 10rpx;
gap: 10rpx 0;
-
+
input {
font-size: 26rpx;
}
-
+
.detail {
// width: 50%;
box-sizing: border-box;
font-size: 26rpx;
color: #555;
padding-right: 20rpx;
-
+
text {
color: #999;
font-size: 26rpx;
}
}
-
+
.editable {
width: 50%;
display: inline-flex;
flex-direction: row;
align-items: center;
-
+
text {
flex-shrink: 0;
}
-
+
.editable-input {
border: 1px solid #acacac;
border-radius: 5rpx;
diff --git a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
index d94b470..99c211b 100644
--- a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
+++ b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -1,790 +1,788 @@
<template>
- <view>
- <!-- 涓昏〃鍖哄煙 -->
- <view class="bill-main-area">
- <!-- 涓昏〃椤电 -->
- <view class="bill-main-tabs">
- <view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">鍩烘湰淇℃伅</view>
- <view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鍏朵粬淇℃伅</view>
- <view :class="mainTabSelected == 3 ? 'selected' : ''" @tap="mainTabSelected = 3">鍒跺崟淇℃伅</view>
- </view>
- <!-- 涓昏〃鍐呭 -->
- <view class="bill-main-contents">
- <!-- 鍩烘湰淇℃伅 -->
- <view class="bill-main-content" v-if="mainTabSelected == 1">
- <view class="form-item">
- <view class="left">鍗曟嵁鍙�</view>
- <view class="right disabled">
- <input type="text" :value="hform.HBillNo" disabled />
- </view>
- </view>
+ <view>
+ <!-- 涓昏〃鍖哄煙 -->
+ <view class="bill-main-area">
+ <!-- 涓昏〃椤电 -->
+ <view class="bill-main-tabs">
+ <view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">鍩烘湰淇℃伅</view>
+ <view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鍏朵粬淇℃伅</view>
+ <view :class="mainTabSelected == 3 ? 'selected' : ''" @tap="mainTabSelected = 3">鍒跺崟淇℃伅</view>
+ </view>
+ <!-- 涓昏〃鍐呭 -->
+ <view class="bill-main-contents">
+ <!-- 鍩烘湰淇℃伅 -->
+ <view class="bill-main-content" v-if="mainTabSelected == 1">
+ <view class="form-item">
+ <view class="left">鍗曟嵁鍙�</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HBillNo" disabled />
+ </view>
+ </view>
- <view class="form-item">
- <view class="left">鏃ユ湡</view>
- <view class="right">
- <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HDate">
- <view>{{ hform.HDate }}</view>
- </uni-datetime-picker>
- </view>
- </view>
- <view class="form-item">
- <view class="left">婧愬崟鍗曞彿</view>
- <view class="right" :class="!hasSourceBill?'':'disabled'">
- <input type="text" :disabled="hasSourceBill" placeholder="璇疯緭鍏ユ垨鎵弿婧愬崟鍙�"
- v-model="hform.HSourceBillNo" @confirm="getSourceBillInfo(hform.HSourceBillNo)" />
- </view>
- <view class="icon-wrapper-big">
- <uni-icons class="right-icon" type="scan"
- :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
- :disabled="hasSourceBill" size="20" @click="toScanCode"></uni-icons>
- </view>
- <view class="icon-wrapper-big">
- <uni-icons class="right-icon" type="search"
- :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
- :disabled="hasSourceBill" size="20" @click="toBillSelector"></uni-icons>
- </view>
- </view>
+ <view class="form-item">
+ <view class="left">鏃ユ湡</view>
+ <view class="right">
+ <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HDate">
+ <view>{{ hform.HDate }}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">婧愬崟鍗曞彿</view>
+ <view class="right" :class="!hasSourceBill?'':'disabled'">
+ <input type="text" :disabled="hasSourceBill" placeholder="璇疯緭鍏ユ垨鎵弿婧愬崟鍙�"
+ v-model="hform.HSourceBillNo" @confirm="getSourceBillInfo(hform.HSourceBillNo)" />
+ </view>
+ <view class="icon-wrapper-big">
+ <uni-icons class="right-icon" type="scan"
+ :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
+ :disabled="hasSourceBill" size="20" @click="toScanCode"></uni-icons>
+ </view>
+ <view class="icon-wrapper-big">
+ <uni-icons class="right-icon" type="search"
+ :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
+ :disabled="hasSourceBill" size="20" @click="toBillSelector"></uni-icons>
+ </view>
+ </view>
- <view class="form-item">
- <view class="left">浠诲姟鍗曞彿</view>
- <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">
- <view class="left">娴佽浆鍗″彿</view>
- <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>
- <view class="right disabled">
- <input type="text" disabled :value="hform.HTakeSampleCheckBillNo" />
- <input type="text" style="display: none;" disabled :value="hform.HTakeSampleCheckBillID" />
- </view>
- </view>
- <view class="form-item">
- <view class="left">浜у搧浠ｇ爜</view>
- <view class="right disabled">
- <input type="text" disabled :value="hform.HMaterNumber" />
- </view>
- <view class="icon-wrapper-big">
- <uni-icons type="search" size="20"
- :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
- :disabled="hasSourceBill" @click="showSelectorModule(hform, 4)"></uni-icons>
- </view>
- </view>
- <view class="form-item">
- <view class="left">浜у搧鍚嶇О</view>
- <view class="right disabled">
- <input type="text" disabled :value="hform.HMaterName" />
- </view>
- </view>
- <view class="form-item">
- <view class="left required">妫�楠屾暟閲�</view>
- <view class="right">
- <input type="number" v-model="hform.HCheckQty" />
- </view>
- </view>
- <view class="form-item">
- <view class="left required">妫�楠屽憳</view>
- <view class="right">
- <uni-combox :candidates="GyFirstCheckEmpNameList" placeholder="璇烽�夋嫨妫�楠屽憳"
- v-model="hform.HFirstCheckEmpName"
- @update:modelValue="HFirstCheckEmpChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="left">妫�楠屾柟妗�</view>
- <view class="right disabled">
- <input type="text" disabled :value="this.hform.HQCSchemeName" />
- </view>
- <view class="icon-wrapper-big"><uni-icons type="search" size="20"
- @click="showSelectorModule(hform, 7)"></uni-icons></view>
- </view>
+ <view class="form-item">
+ <view class="left">浠诲姟鍗曞彿</view>
+ <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">
+ <view class="left">娴佽浆鍗″彿</view>
+ <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>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HTakeSampleCheckBillNo" />
+ <input type="text" style="display: none;" disabled :value="hform.HTakeSampleCheckBillID" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">浜у搧浠ｇ爜</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HMaterNumber" />
+ </view>
+ <view class="icon-wrapper-big">
+ <uni-icons type="search" size="20"
+ :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'"
+ :disabled="hasSourceBill" @click="showSelectorModule(hform, 4)"></uni-icons>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">浜у搧鍚嶇О</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HMaterName" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left required">妫�楠屾暟閲�</view>
+ <view class="right">
+ <input type="number" v-model="hform.HCheckQty" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left required">妫�楠屽憳</view>
+ <view class="right">
+ <uni-combox :candidates="GyFirstCheckEmpNameList" placeholder="璇烽�夋嫨妫�楠屽憳"
+ v-model="hform.HFirstCheckEmpName"
+ @update:modelValue="HFirstCheckEmpChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">妫�楠屾柟妗�</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="this.hform.HQCSchemeName" />
+ </view>
+ <view class="icon-wrapper-big"><uni-icons type="search" size="20"
+ @click="showSelectorModule(hform, 7)"></uni-icons></view>
+ </view>
- <view class="form-item">
- <view class="left">鍒ゆ柇缁撹</view>
- <view class="right none-border">
- <radio-group @changer="checkResultChange">
- <label>
- <radio value="0" :checked="hform.HLastResult" /><text></text>
- 鍚堟牸
- </label>
- <view style="width: 20rpx; display: inline-block"></view>
- <label>
- <radio value="1" :checked="!hform.HLastResult" /><text></text>
- 涓嶅悎鏍�
- </label>
- </radio-group>
- </view>
- </view>
- <view class="form-item">
- <view class="left">宸ュ簭</view>
- <view class="right disabled">
- <input type="text" disabled :value="hform.HProcName" />
- </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, 8)"></uni-icons></view>
- </view>
+ <view class="form-item">
+ <view class="left">鍒ゆ柇缁撹</view>
+ <view class="right none-border">
+ <radio-group @changer="checkResultChange">
+ <label>
+ <radio value="0" :checked="hform.HLastResult" /><text></text>
+ 鍚堟牸
+ </label>
+ <view style="width: 20rpx; display: inline-block"></view>
+ <label>
+ <radio value="1" :checked="!hform.HLastResult" /><text></text>
+ 涓嶅悎鏍�
+ </label>
+ </radio-group>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">宸ュ簭</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HProcName" />
+ </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, 8)"></uni-icons></view>
+ </view>
- </view>
- <!-- 鍏朵粬淇℃伅 -->
- <view class="bill-main-content" v-if="mainTabSelected == 2">
- <view class="form-item">
- <view class="left">婧愬崟绫诲瀷</view>
- <view class="right" style="position: relative" :class="!hasSourceBill?'':'disabled'">
- <picker mode="selector" :range="HSourceBillTypeNameList" :disabled="hasSourceBill"
- @change="HSourceBillTypeNameChange">
- <input type="text" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" v-model="HSourceBillType" />
- <view class="picker-overlay"></view>
- </picker>
- </view>
- </view>
- <view class="form-item">
- <view class="left">鐢熶骇璧勬簮</view>
- <view class="right">
- <uni-combox :candidates="GySourceNameList" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
- @update:modelValue="HSourceChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="left">鐢熶骇鐝</view>
- <view class="right">
- <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
- v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="left">寮傚父涓存椂澶勭悊鏂规</view>
- <view class="right">
- <input type="text" v-model="hform.HErrTreatment" value="" />
- </view>
- </view>
- <!-- <view class="form-item">
+ </view>
+ <!-- 鍏朵粬淇℃伅 -->
+ <view class="bill-main-content" v-if="mainTabSelected == 2">
+ <view class="form-item">
+ <view class="left">婧愬崟绫诲瀷</view>
+ <view class="right" style="position: relative" :class="!hasSourceBill?'':'disabled'">
+ <picker mode="selector" :range="HSourceBillTypeNameList" :disabled="hasSourceBill"
+ @change="HSourceBillTypeNameChange">
+ <input type="text" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" v-model="HSourceBillType" />
+ <view class="picker-overlay"></view>
+ </picker>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鐢熶骇璧勬簮</view>
+ <view class="right">
+ <uni-combox :candidates="GySourceNameList" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
+ @update:modelValue="HSourceChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鐢熶骇鐝</view>
+ <view class="right">
+ <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
+ v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">寮傚父涓存椂澶勭悊鏂规</view>
+ <view class="right">
+ <input type="text" v-model="hform.HErrTreatment" value="" />
+ </view>
+ </view>
+ <!-- <view class="form-item">
<view class="left">浠诲姟鍗曟暟閲�</view>
<view class="right">
<input type="number" v-model="hform.HICMOQty" />
</view>
</view> -->
- <view class="form-item">
- <view class="left">娴佽浆鍗℃暟閲�</view>
- <view class="right">
- <input type="number" v-model="hform.HProcExchQty" />
- </view>
- </view>
- <view class="form-item">
- <view class="left">鎵瑰彿</view>
- <view class="right">
- <input type="text" v-model="hform.HBatchNo" />
- </view>
- </view>
- <view class="form-item">
- <view class="left">澶囨敞</view>
- <view class="right">
- <input type="text" v-model="hform.HRemark" value="" />
- </view>
- </view>
- </view>
- <!-- 鍒跺崟淇℃伅 -->
- <view class="bill-main-content" v-if="mainTabSelected == 3">
- <view class="form-item">
- <view class="left">鍒跺崟浜�</view>
- <view class="right disabled">
- <input type="text" :value="hform.HMaker" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">鍒跺崟鏃ユ湡</view>
- <view class="right disabled">
- <input type="text" :value="hform.HMakeDate" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">瀹℃牳浜�</view>
- <view class="right disabled">
- <input type="text" :value="hform.HChecker" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">瀹℃牳鏃ユ湡</view>
- <view class="right disabled">
- <input type="text" :value="hform.HCheckDate" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">鍏抽棴浜�</view>
- <view class="right disabled">
- <input type="text" :value="hform.HCloseMan" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">鍏抽棴鏃ユ湡</view>
- <view class="right disabled">
- <input type="text" :value="hform.HCloseDate" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">淇敼浜�</view>
- <view class="right disabled">
- <input type="text" :value="hform.HUpDater" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">淇敼鏃ユ湡</view>
- <view class="right disabled">
- <input type="text" :value="hform.HUpDateDate" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">浣滃簾浜�</view>
- <view class="right disabled">
- <input type="text" :value="hform.HDeleteMan" disabled />
- </view>
- </view>
- <view class="form-item">
- <view class="left">浣滃簾鏃ユ湡</view>
- <view class="right disabled">
- <input type="text" :value="hform.HDeleteDate" disabled />
- </view>
- </view>
- </view>
+ <view class="form-item">
+ <view class="left">娴佽浆鍗℃暟閲�</view>
+ <view class="right">
+ <input type="number" v-model="hform.HProcExchQty" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鎵瑰彿</view>
+ <view class="right">
+ <input type="text" v-model="hform.HBatchNo" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">澶囨敞</view>
+ <view class="right">
+ <input type="text" v-model="hform.HRemark" value="" />
+ </view>
+ </view>
+ </view>
+ <!-- 鍒跺崟淇℃伅 -->
+ <view class="bill-main-content" v-if="mainTabSelected == 3">
+ <view class="form-item">
+ <view class="left">鍒跺崟浜�</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HMaker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鍒跺崟鏃ユ湡</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HMakeDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">瀹℃牳浜�</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HChecker" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">瀹℃牳鏃ユ湡</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HCheckDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鍏抽棴浜�</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HCloseMan" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鍏抽棴鏃ユ湡</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HCloseDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">淇敼浜�</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HUpDater" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">淇敼鏃ユ湡</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HUpDateDate" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">浣滃簾浜�</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HDeleteMan" disabled />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">浣滃簾鏃ユ湡</view>
+ <view class="right disabled">
+ <input type="text" :value="hform.HDeleteDate" disabled />
+ </view>
+ </view>
+ </view>
- </view>
- </view>
- <!-- 瀛愯〃鍖哄煙 -->
- <view class="bill-sub-area">
- <!-- 瀛愯〃椤电 -->
- <view class="bill-sub-tabs">
- <view v-for="subTab in subTabs" :key="subTab.id" :class="subTab.id == subTabSelected ? 'selected' : ''"
- @tap="subTabSelected = subTab.id">{{ subTab.name }}</view>
- </view>
- <!-- 瀛愯〃鍐呭 -->
- <view class="bill-main-contents">
- <!-- 妫�楠岄」鐩� 鍛堢幇 -->
- <view v-if="subTabSelected == 1">
- <!-- 闇�閫氳繃鏄惧紡璋冪敤蹇界暐$event鍙傛暟 -->
- <view class="buttons" @tap="addCheckItem()">
- <uni-icons type="plus" style="margin-right: 10rpx" size="22"></uni-icons>鏂板
- </view>
- <view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
- <view class="list" v-else>
- <uni-card v-for="checkItem in checkItems" :key="checkItem.num">
- <view class="card-detail">
- <view class="detail"> <text>搴忓彿锛�</text>{{ checkItem.num }} </view>
- <view class="detail editable">
- <view style="flex-shrink: 0"><text>妫�楠岄」鐩細</text></view>
- <input type="text" :value="checkItem.HQCCheckItemName" disabled="" />
- <view class="icon-wrapper"><uni-icons type="search" size="16"
- @click="showSelectorModule(checkItem, 2)"></uni-icons></view>
- </view>
- <view class="detail editable">
- <view style="flex-shrink: 0"><text>妫�楠屼华鍣細</text></view>
- <input type="text" :value="checkItem.HInspectInstruMentName" disabled="" />
- <view class="icon-wrapper"><uni-icons type="search" size="16"
- @click="showSelectorModule(checkItem, 3)"></uni-icons></view>
- </view>
- <view class="detail editable">
- <view><text>缁撹锛�</text></view>
- <view style="width: 4em">
- {{ checkItem.HResult == 1 ? "鍚堟牸" : "涓嶅悎鏍�" }}
- </view>
- <view>
- <switch style="width: 2em; transform: scale(0.7)"
- :checked="checkItem.HResult == 1"
- @change="HResultChange(checkItem.num, $event)" />
- </view>
- </view>
- <view class="detail editable" style="position: relative">
- <view style="flex-shrink: 0"><text>鍒嗘瀽鏂规硶锛�</text></view>
- <picker :range="arrayAnalysisMethod" range-key="name"
- @change="HAnalysisMethodChange(checkItem.num, $event)">
- <input disabled :value="getAnalysisMethodDisplay(checkItem.HAnalysisMethod)"
- placeholder="璇烽�夋嫨" />
- <view class="picker-overlay"></view>
- </picker>
- </view>
- <view class="detail editable">
- <view style="flex-shrink: 0"><text>閲嶇偣妫�鏌ワ細</text></view>
- <view>
- <switch type="checkbox" style="transform: scale(0.7)"
- :checked="checkItem.HKeyInspect"
- @change="HKeyInspectChange(checkItem, $event)" />
- </view>
- </view>
- <view class="detail" v-if="checkItem.HQCStd">
- <text>妫�楠屾爣鍑嗭細</text>{{ checkItem.HQCStd }}
- </view>
- <view class="detail" v-if="checkItem.HUnit">
- <text>鍗曚綅锛�</text>{{ checkItem.HUnit }}
- </view>
- <!-- 鍙湁瀹氶噺鍒嗘瀽鎵嶅惎鐢ㄦ楠屽�� -->
- <view class="detail editable" v-show="checkItem.HAnalysisMethod == 2">
- <text>妫�楠屽�硷細</text>
- <input type="text" class="editable-input" @blur="calcHResult(checkItem)"
- v-model="checkItem.HInspectValQ" />
+ </view>
+ </view>
+ <!-- 瀛愯〃鍖哄煙 -->
+ <view class="bill-sub-area">
+ <!-- 瀛愯〃椤电 -->
+ <view class="bill-sub-tabs">
+ <view v-for="subTab in subTabs" :key="subTab.id" :class="subTab.id == subTabSelected ? 'selected' : ''"
+ @tap="subTabSelected = subTab.id">{{ subTab.name }}</view>
+ </view>
+ <!-- 瀛愯〃鍐呭 -->
+ <view class="bill-main-contents">
+ <!-- 妫�楠岄」鐩� 鍛堢幇 -->
+ <view v-if="subTabSelected == 1">
+ <!-- 闇�閫氳繃鏄惧紡璋冪敤蹇界暐$event鍙傛暟 -->
+ <view class="buttons" @tap="addCheckItem()">
+ <uni-icons type="plus" style="margin-right: 10rpx" size="22"></uni-icons>鏂板
+ </view>
+ <view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
+ <view class="list" v-else>
+ <uni-card v-for="checkItem in checkItems" :key="checkItem.num">
+ <view class="card-detail">
+ <view class="detail"> <text>搴忓彿锛�</text>{{ checkItem.num }} </view>
+ <view class="detail editable">
+ <view style="flex-shrink: 0"><text>妫�楠岄」鐩細</text></view>
+ <input type="text" :value="checkItem.HQCCheckItemName" disabled="" />
+ <view class="icon-wrapper"><uni-icons type="search" size="16"
+ @click="showSelectorModule(checkItem, 2)"></uni-icons></view>
+ </view>
+ <view class="detail editable">
+ <view style="flex-shrink: 0"><text>妫�楠屼华鍣細</text></view>
+ <input type="text" :value="checkItem.HInspectInstruMentName" disabled="" />
+ <view class="icon-wrapper"><uni-icons type="search" size="16"
+ @click="showSelectorModule(checkItem, 3)"></uni-icons></view>
+ </view>
+ <view class="detail editable">
+ <view><text>缁撹锛�</text></view>
+ <view style="width: 4em">
+ {{ checkItem.HResult == 1 ? "鍚堟牸" : "涓嶅悎鏍�" }}
+ </view>
+ <view>
+ <switch style="width: 2em; transform: scale(0.7)"
+ :checked="checkItem.HResult == 1"
+ @change="HResultChange(checkItem.num, $event)" />
+ </view>
+ </view>
+ <view class="detail editable" style="position: relative">
+ <view style="flex-shrink: 0"><text>鍒嗘瀽鏂规硶锛�</text></view>
+ <picker :range="arrayAnalysisMethod" range-key="name"
+ @change="HAnalysisMethodChange(checkItem.num, $event)">
+ <input disabled :value="getAnalysisMethodDisplay(checkItem.HAnalysisMethod)"
+ placeholder="璇烽�夋嫨" />
+ <view class="picker-overlay"></view>
+ </picker>
+ </view>
+ <view class="detail editable">
+ <view style="flex-shrink: 0"><text>閲嶇偣妫�鏌ワ細</text></view>
+ <view>
+ <switch type="checkbox" style="transform: scale(0.7)"
+ :checked="checkItem.HKeyInspect"
+ @change="HKeyInspectChange(checkItem, $event)" />
+ </view>
+ </view>
+ <view class="detail" v-if="checkItem.HQCStd">
+ <text>妫�楠屾爣鍑嗭細</text>{{ checkItem.HQCStd }}
+ </view>
+ <view class="detail" v-if="checkItem.HUnit">
+ <text>鍗曚綅锛�</text>{{ checkItem.HUnit }}
+ </view>
+ <!-- 鍙湁瀹氶噺鍒嗘瀽鎵嶅惎鐢ㄦ楠屽�� -->
+ <view class="detail editable" v-show="checkItem.HAnalysisMethod == 2">
+ <text>妫�楠屽�硷細</text>
+ <input type="text" class="editable-input" @blur="calcHResult(checkItem)"
+ v-model="checkItem.HInspectValQ" />
- </view>
- <view class="detail" v-if="checkItem.HQCNote">
- <text>妫�楠岃褰曪細</text>{{ checkItem.HQCNote }}
- </view>
- <view class="detail" v-if="checkItem.HTargetVal">
- <text>鐩爣鍊硷細</text>{{ checkItem.HTargetVal }}
- </view>
- <view class="detail" v-if="checkItem.HUpLimit">
- <text>涓婇檺鍊硷細</text>{{ checkItem.HUpLimit }}
- </view>
- <view class="detail" v-if="checkItem.HDownLimit">
- <text>涓嬮檺鍊硷細</text>{{ checkItem.HDownLimit }}
- </view>
- <view class="detail" v-if="checkItem.HMax">
- <text>鏈�澶у�硷細</text>{{ checkItem.HMax }}
- </view>
- <view class="detail" v-if="checkItem.HMin">
- <text>鏈�灏忓�硷細</text>{{ checkItem.HMin }}
- </view>
- <view class="detail" v-if="checkItem.HAvg">
- <text>骞冲潎鍊硷細</text>{{ checkItem.HAvg }}
- </view>
- </view>
- <view style="height: 20rpx"></view>
- <view class="more">
- <view class="part" style="color: #da0000" @tap.stop="removeCheckItem(checkItem)">
- <uni-icons type="trash" style="color: #da0000; margin-right: 10rpx"
- size="18"></uni-icons>鍒犻櫎
- </view>
- </view>
- </uni-card>
- </view>
- </view>
- <!-- 鎶芥牱妫�楠� 鍛堢幇 -->
- <view v-if="subTabSelected == 2">
- <view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
- <view class="list" v-else>
- <uni-card v-for="SamplingItem in checkItems" :key="SamplingItem.num">
- <view class="card-detail">
- <view class="detail"> <text>搴忓彿锛�</text>{{ SamplingItem.num }} </view>
- <view class="detail editable">
- <text>妫�楠岄」鐩細</text>{{ SamplingItem.HQCCheckItemName }}
- </view>
- <view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
- <view class="detail editable" style="width: 100%">
- <view style="flex-shrink: 0"><text>鎶芥牱鏂规锛�</text></view>
- <input type="text" :value="SamplingItem.HSampleSchemeName" disabled />
- <view class="icon-wrapper"><uni-icons type="search" size="16"
- @click="showSelectorModule(SamplingItem, 1)"></uni-icons></view>
- </view>
- <view class="detail editable">
- <text>鎶芥牱绫诲瀷锛�</text>{{ SamplingItem.HSamplingType }}
- </view>
- <view class="detail editable">
- <text>妫�楠屾按骞筹細</text>{{ SamplingItem.HInspectionLevel }}
- </view>
- <view class="detail editable">
- <text>涓ユ牸搴︼細</text>{{ SamplingItem.HStrictness }}
- </view>
- <view class="detail editable">
- <text>AQL锛�</text>{{ SamplingItem.HAQL }}
- </view>
- <view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
- <view class="detail editable">
- <text>鏍锋湰閲忥細</text>{{ SamplingItem.HSampleQty }}
- </view>
- <view class="detail editable">
- <text>鍏佽鏁帮細</text>{{ SamplingItem.HAcceptQty }}
- </view>
- <view class="detail editable">
- <text>鎷掔粷鏁帮細</text>{{ SamplingItem.HRejectQty }}
- </view>
- <view class="detail editable">
- <text>鏍锋湰涓嶅悎鏍兼暟锛�</text>{{ SamplingItem.HSampleUnRightQty }}
- </view>
- <view class="detail editable">
- <text>鏍锋湰鐮村潖鏁帮細</text>
- <view class="editable-input">
- <input type="number" v-model="SamplingItem.HSampleDamageQty" />
- </view>
- </view>
- <view class="detail editable">
- <text>妫�楠岀粨鏋滐細</text>
- <view style="border-radius: 15%; padding: 0 10rpx" :class="
+ </view>
+ <view class="detail" v-if="checkItem.HQCNote">
+ <text>妫�楠岃褰曪細</text>{{ checkItem.HQCNote }}
+ </view>
+ <view class="detail" v-if="checkItem.HTargetVal">
+ <text>鐩爣鍊硷細</text>{{ checkItem.HTargetVal }}
+ </view>
+ <view class="detail" v-if="checkItem.HUpLimit">
+ <text>涓婇檺鍊硷細</text>{{ checkItem.HUpLimit }}
+ </view>
+ <view class="detail" v-if="checkItem.HDownLimit">
+ <text>涓嬮檺鍊硷細</text>{{ checkItem.HDownLimit }}
+ </view>
+ <view class="detail" v-if="checkItem.HMax">
+ <text>鏈�澶у�硷細</text>{{ checkItem.HMax }}
+ </view>
+ <view class="detail" v-if="checkItem.HMin">
+ <text>鏈�灏忓�硷細</text>{{ checkItem.HMin }}
+ </view>
+ <view class="detail" v-if="checkItem.HAvg">
+ <text>骞冲潎鍊硷細</text>{{ checkItem.HAvg }}
+ </view>
+ </view>
+ <view style="height: 20rpx"></view>
+ <view class="more">
+ <view class="part" style="color: #da0000" @tap.stop="removeCheckItem(checkItem)">
+ <uni-icons type="trash" style="color: #da0000; margin-right: 10rpx"
+ size="18"></uni-icons>鍒犻櫎
+ </view>
+ </view>
+ </uni-card>
+ </view>
+ </view>
+ <!-- 鎶芥牱妫�楠� 鍛堢幇 -->
+ <view v-if="subTabSelected == 2">
+ <view class="over" v-if="!checkItems || getObjLength(checkItems) == 0">鏆傛棤鏁版嵁</view>
+ <view class="list" v-else>
+ <uni-card v-for="SamplingItem in checkItems" :key="SamplingItem.num">
+ <view class="card-detail">
+ <view class="detail"> <text>搴忓彿锛�</text>{{ SamplingItem.num }} </view>
+ <view class="detail editable">
+ <text>妫�楠岄」鐩細</text>{{ SamplingItem.HQCCheckItemName }}
+ </view>
+ <view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
+ <view class="detail editable" style="width: 100%">
+ <view style="flex-shrink: 0"><text>鎶芥牱鏂规锛�</text></view>
+ <input type="text" :value="SamplingItem.HSampleSchemeName" disabled />
+ <view class="icon-wrapper"><uni-icons type="search" size="16"
+ @click="showSelectorModule(SamplingItem, 1)"></uni-icons></view>
+ </view>
+ <view class="detail editable">
+ <text>鎶芥牱绫诲瀷锛�</text>{{ SamplingItem.HSamplingType }}
+ </view>
+ <view class="detail editable">
+ <text>妫�楠屾按骞筹細</text>{{ SamplingItem.HInspectionLevel }}
+ </view>
+ <view class="detail editable">
+ <text>涓ユ牸搴︼細</text>{{ SamplingItem.HStrictness }}
+ </view>
+ <view class="detail editable">
+ <text>AQL锛�</text>{{ SamplingItem.HAQL }}
+ </view>
+ <view style="width: 100%; height: 1px; border-bottom: 1px solid #e3e3e3"></view>
+ <view class="detail editable">
+ <text>鏍锋湰閲忥細</text>{{ SamplingItem.HSampleQty }}
+ </view>
+ <view class="detail editable">
+ <text>鍏佽鏁帮細</text>{{ SamplingItem.HAcceptQty }}
+ </view>
+ <view class="detail editable">
+ <text>鎷掔粷鏁帮細</text>{{ SamplingItem.HRejectQty }}
+ </view>
+ <view class="detail editable">
+ <text>鏍锋湰涓嶅悎鏍兼暟锛�</text>{{ SamplingItem.HSampleUnRightQty }}
+ </view>
+ <view class="detail editable">
+ <text>鏍锋湰鐮村潖鏁帮細</text>
+ <view class="editable-input">
+ <input type="number" v-model="SamplingItem.HSampleDamageQty" />
+ </view>
+ </view>
+ <view class="detail editable">
+ <text>妫�楠岀粨鏋滐細</text>
+ <view style="border-radius: 15%; padding: 0 10rpx" :class="
SamplingItem.HInspectResultToSee == '鍚堟牸'
? 'pass-background'
: SamplingItem.HInspectResultToSee == '涓嶅悎鏍�'
? 'unpass-background'
: ''
">
- {{ SamplingItem.HInspectResultToSee }}
- </view>
- </view>
- </view>
- </uni-card>
- </view>
- </view>
- <!-- 妫�娴嬪�� 鍛堢幇 -->
- <view v-else v-for="item in InspectModules" :key="item.id">
- <view v-if="subTabSelected == item.id">
- <InspectValueTemplateVue ref="InspectValueModules" :bind-key="item.id"
- @syncCheckData="InspectValueComplete" :bind-data="{
+ {{ SamplingItem.HInspectResultToSee }}
+ </view>
+ </view>
+ </view>
+ </uni-card>
+ </view>
+ </view>
+ <!-- 妫�娴嬪�� 鍛堢幇 -->
+ <view v-else v-for="item in InspectModules" :key="item.id">
+ <view v-if="subTabSelected == item.id">
+ <InspectValueTemplateVue ref="InspectValueModules" :bind-key="item.id"
+ @syncCheckData="InspectValueComplete" :bind-data="{
data: checkItems[item.checkItemId],
list: InspectValues[item.checkItemId],
mode: 1 // 棣栨妫�娴嬪�兼ā鍧�
}">
- </InspectValueTemplateVue>
- </view>
- </view>
- </view>
- </view>
- <view style="height: 120rpx"></view>
- <view class="bottom-btn">
- <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>
- <SampleSchemePopupVue v-if="enablePopupModule == PopupModuleNameList[1]" ref="listPopup"
- @update="SampleSchemeComplete" :bindKey="currentChechItemIDCache">
- </SampleSchemePopupVue>
- <CheckItemPopupVue v-if="enablePopupModule == PopupModuleNameList[2]" ref="listPopup"
- @update="CheckItemComplete" :bindKey="currentChechItemIDCache">
- </CheckItemPopupVue>
- <InspectMentPopupVue v-if="enablePopupModule == PopupModuleNameList[3]" ref="listPopup"
- @update="InspectMentComplete" :bindKey="currentChechItemIDCache">
- </InspectMentPopupVue>
- <MaterialPopupVue v-if="enablePopupModule == PopupModuleNameList[4]" ref="listPopup" @update="MaterComplete"
- :bindKey="0">
- </MaterialPopupVue>
- <ICMOBillPopupVue v-if="enablePopupModule == PopupModuleNameList[5]" ref="listPopup" @update="ICMOBillComplete"
- :bindKey="0"></ICMOBillPopupVue>
- <ProcExchBillPopupVue v-if="enablePopupModule == PopupModuleNameList[6]" ref="listPopup"
- @update="ProcExchBillComplete" :bindKey="0"></ProcExchBillPopupVue>
- <ProcessPopupVue v-if="enablePopupModule == PopupModuleNameList[8]" ref="listPopup" @update="HProcComplete"
- :bindKey="0"></ProcessPopupVue>
- <CheckProjectPopupVue v-if="enablePopupModule == PopupModuleNameList[7]" ref="listPopup"
- @update="HQCSchemeComplete" :bindKey="0"></CheckProjectPopupVue>
- <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HSourceBillType"
- :HStockOrgID="hform.HStockOrgID" @BillSelectComplete="HandleBillSelectComplete"></BillListPopupVue>
- </view>
+ </InspectValueTemplateVue>
+ </view>
+ </view>
+ </view>
+ </view>
+ <view style="height: 120rpx"></view>
+ <view class="bottom-btn">
+ <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>
+ <SampleSchemePopupVue v-if="enablePopupModule == PopupModuleNameList[1]" ref="listPopup"
+ @update="SampleSchemeComplete" :bindKey="currentChechItemIDCache">
+ </SampleSchemePopupVue>
+ <CheckItemPopupVue v-if="enablePopupModule == PopupModuleNameList[2]" ref="listPopup"
+ @update="CheckItemComplete" :bindKey="currentChechItemIDCache">
+ </CheckItemPopupVue>
+ <InspectMentPopupVue v-if="enablePopupModule == PopupModuleNameList[3]" ref="listPopup"
+ @update="InspectMentComplete" :bindKey="currentChechItemIDCache">
+ </InspectMentPopupVue>
+ <MaterialPopupVue v-if="enablePopupModule == PopupModuleNameList[4]" ref="listPopup" @update="MaterComplete"
+ :bindKey="0">
+ </MaterialPopupVue>
+ <ICMOBillPopupVue v-if="enablePopupModule == PopupModuleNameList[5]" ref="listPopup" @update="ICMOBillComplete"
+ :bindKey="0"></ICMOBillPopupVue>
+ <ProcExchBillPopupVue v-if="enablePopupModule == PopupModuleNameList[6]" ref="listPopup"
+ @update="ProcExchBillComplete" :bindKey="0"></ProcExchBillPopupVue>
+ <ProcessPopupVue v-if="enablePopupModule == PopupModuleNameList[8]" ref="listPopup" @update="HProcComplete"
+ :bindKey="0"></ProcessPopupVue>
+ <CheckProjectPopupVue v-if="enablePopupModule == PopupModuleNameList[7]" ref="listPopup"
+ @update="HQCSchemeComplete" :bindKey="0"></CheckProjectPopupVue>
+ <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HSourceBillType"
+ :HStockOrgID="hform.HStockOrgID" @BillSelectComplete="HandleBillSelectComplete"></BillListPopupVue>
+ </view>
</template>
<script>
- import dayjs from "dayjs";
- import {
- CommonUtils
- } from "../../../utils/common";
- import InspectValueTemplateVue from "@/components/ZLGL/InspectValueTemplate.vue";
- import SampleSchemePopupVue from "@/components/ZLGL/SampleSchemePopup.vue";
- import CheckItemPopupVue from "@/components/ZLGL/CheckItemPopup.vue";
- import InspectMentPopupVue from "../../../components/ZLGL/InspectMentPopup.vue";
- import MaterialPopupVue from "../../../components/ZLGL/MaterialPopup.vue";
- import ICMOBillPopupVue from "../../../components/ZLGL/ICMOBillPopup.vue";
- import ProcExchBillPopupVue from "../../../components/ZLGL/ProcExchBillPopup.vue";
- import ProcessPopupVue from "../../../components/ZLGL/ProcessPopup.vue";
- import CheckProjectPopupVue from "../../../components/ZLGL/CheckProjectPopup.vue";
- import BillListPopupVue from "../../../components/BillListPopup/BillListPopup.vue";
- import {
- getUserInfo
- } from "../../../utils/auth";
- import {
- MpaasScan
- } from "../../../utils/mpaasScan";
- export default {
- components: {
- InspectValueTemplateVue,
- SampleSchemePopupVue,
- CheckItemPopupVue,
- InspectMentPopupVue,
- MaterialPopupVue,
- ICMOBillPopupVue,
- ProcExchBillPopupVue,
- ProcessPopupVue,
- CheckProjectPopupVue,
- BillListPopupVue,
- },
- computed: {
- judgeConclusion: {
- get() {
- return true;
- },
- },
- },
- data() {
- return {
- operationType: 1,
+ import dayjs from "dayjs";
+ import {
+ CommonUtils
+ } from "../../../utils/common";
+ import InspectValueTemplateVue from "@/components/ZLGL/InspectValueTemplate.vue";
+ import SampleSchemePopupVue from "@/components/ZLGL/SampleSchemePopup.vue";
+ import CheckItemPopupVue from "@/components/ZLGL/CheckItemPopup.vue";
+ import InspectMentPopupVue from "../../../components/ZLGL/InspectMentPopup.vue";
+ import MaterialPopupVue from "../../../components/ZLGL/MaterialPopup.vue";
+ import ICMOBillPopupVue from "../../../components/ZLGL/ICMOBillPopup.vue";
+ import ProcExchBillPopupVue from "../../../components/ZLGL/ProcExchBillPopup.vue";
+ import ProcessPopupVue from "../../../components/ZLGL/ProcessPopup.vue";
+ import CheckProjectPopupVue from "../../../components/ZLGL/CheckProjectPopup.vue";
+ import BillListPopupVue from "../../../components/BillListPopup/BillListPopup.vue";
+ import {
+ getUserInfo
+ } from "../../../utils/auth";
+ import {
+ MpaasScan
+ } from "../../../utils/mpaasScan";
+ export default {
+ components: {
+ InspectValueTemplateVue,
+ SampleSchemePopupVue,
+ CheckItemPopupVue,
+ InspectMentPopupVue,
+ MaterialPopupVue,
+ ICMOBillPopupVue,
+ ProcExchBillPopupVue,
+ ProcessPopupVue,
+ CheckProjectPopupVue,
+ BillListPopupVue,
+ },
+ computed: {
+ judgeConclusion: {
+ get() {
+ return true;
+ },
+ },
+ },
+ data() {
+ return {
+ operationType: 1,
- mainTabSelected: 1,
- subTabSelected: 1,
+ mainTabSelected: 1,
+ subTabSelected: 1,
- // 婧愬崟鐘舵�佹帶鍒�
- hasSourceBill: false,
+ // 婧愬崟鐘舵�佹帶鍒�
+ hasSourceBill: false,
- // 鎺у埗褰撳墠鏄剧ず鐨勫脊绐楁ā鍧�
- enablePopupModule: "",
- PopupModuleNameList: [
- "",
- "SampleScheme",
- "CheckItem",
- "InspectMent",
- "Material",
- "ICMOBill",
- "ProcExchBill",
- "QCScheme",
- "Process",
- ],
- // 褰撳墠鎿嶄綔鐨勬楠屽崟ID缂撳瓨
- currentChechItemIDCache: -1,
+ // 鎺у埗褰撳墠鏄剧ず鐨勫脊绐楁ā鍧�
+ enablePopupModule: "",
+ PopupModuleNameList: [
+ "",
+ "SampleScheme",
+ "CheckItem",
+ "InspectMent",
+ "Material",
+ "ICMOBill",
+ "ProcExchBill",
+ "QCScheme",
+ "Process",
+ ],
+ // 褰撳墠鎿嶄綔鐨勬楠屽崟ID缂撳瓨
+ currentChechItemIDCache: -1,
- // uni-combox 閫夋嫨鍣ㄤ娇鐢�
- // 鐢熶骇璧勬簮
- GySourceList: [],
- GySourceNameList: [],
- // 鐝
- GyWorkShiftList: [],
- GyWorkShiftNameList: [],
- // 妫�楠屽憳
- GyFirstCheckEmpList: [],
- GyFirstCheckEmpNameList: [],
+ // uni-combox 閫夋嫨鍣ㄤ娇鐢�
+ // 鐢熶骇璧勬簮
+ GySourceList: [],
+ GySourceNameList: [],
+ // 鐝
+ GyWorkShiftList: [],
+ GyWorkShiftNameList: [],
+ // 妫�楠屽憳
+ GyFirstCheckEmpList: [],
+ GyFirstCheckEmpNameList: [],
- // 妫�楠屾柟妗�
- arrayAnalysisMethod: [{
- value: 1,
- name: "瀹氭�у垎鏋�",
- },
- {
- value: 2,
- name: "瀹氶噺鍒嗘瀽",
- },
- {
- value: 3,
- name: "鍏朵粬鍒嗘瀽",
- },
- ],
- ArrayAnalysisMethodValue: [1, 2, 3],
- // 瀛愯〃 椤电淇℃伅
- subTabs: {
- 1: {
- id: "1",
- name: "妫�楠岄」鐩�",
- },
- 2: {
- id: "2",
- name: "鎶芥牱妫�楠�",
- },
- },
+ // 妫�楠屾柟妗�
+ arrayAnalysisMethod: [{
+ value: 1,
+ name: "瀹氭�у垎鏋�",
+ },
+ {
+ value: 2,
+ name: "瀹氶噺鍒嗘瀽",
+ },
+ {
+ value: 3,
+ name: "鍏朵粬鍒嗘瀽",
+ },
+ ],
+ ArrayAnalysisMethodValue: [1, 2, 3],
+ // 瀛愯〃 椤电淇℃伅
+ subTabs: {
+ 1: {
+ id: "1",
+ name: "妫�楠岄」鐩�",
+ },
+ 2: {
+ id: "2",
+ name: "鎶芥牱妫�楠�",
+ },
+ },
- // 婧愬崟绫诲瀷
- HSourceBillType: "宸ュ簭杩涚珯鎺ユ敹鍗�",
- HSourceBillTypeValueList: ["3790", "3793", "3710", "3772", "7521"],
- HSourceBillTypeNameList: [
- "宸ュ簭杩涚珯鎺ユ敹鍗�",
- "宸ュ簭濮斿鎺ユ敹鍗�",
- "鐢熶骇璁㈠崟",
- "宸ュ簭娴佽浆鍗�",
- "鍙栨牱鍗�",
- ],
- // 涓昏〃灞炴��
- hform: {
- HBillType: '7505',
- HSourceBillType: "3790",
- HSourceBillNo: "",
- HSourceBillQty: 0,
- HBillNo: "",
- HInterID: "0",
- HDate: dayjs(new Date()).format("YYYY-MM-DD"),
- HSourceName: "",
- HSourceID: "0",
- HShiftsName: "",
- HShiftsID: "0",
- HICMOBillNo: "",
- HICMOInterID: "0",
- HICMOEntryID: "1",
- HICMOQty: "0",
- HProcExchBillNo: "",
- HProcExchInterID: "0",
- HProcExchEntryID: "0",
- HProcExchQty: "0",
- HMaterNumber: "",
- HMaterID: "0",
- HMaterName: "",
- HFirstCheckEmpName: getUserInfo().HEmpName,
- HFirstCheckEmp: getUserInfo().HEmpID,
- HQCSchemeName: "",
- HQCSchemeID: "0",
- HBatchNo: "",
- HLastResult: true, // 榛樿鍚堟牸
- HProcName: "",
- HProcID: "0",
- HTakeSampleCheckBillNo: "", // 鍙栨牱鍗�
- HTakeSampleCheckBillID: "0",
- HRemark: "",
- HErrTreatment: "", // 寮傚父涓存椂澶勭悊鏂规
- HMaker: getUserInfo()["Czymc"] || "",
- HChecker: "",
- HCloseMan: "",
- HMakeDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
- HCheckDate: "",
- HCloseDate: "",
- HUpDater: "",
- HDeleteMan: "",
- HUpDateDate: "",
- HDeleteDate: "",
- HResult: 1,
- HAnalysisMethod: "",
+ // 婧愬崟绫诲瀷
+ HSourceBillType: "宸ュ簭杩涚珯鎺ユ敹鍗�",
+ HSourceBillTypeValueList: ["3790", "3793", "3710", "3772", "7521"],
+ HSourceBillTypeNameList: [
+ "宸ュ簭杩涚珯鎺ユ敹鍗�",
+ "宸ュ簭濮斿鎺ユ敹鍗�",
+ "鐢熶骇璁㈠崟",
+ "宸ュ簭娴佽浆鍗�",
+ "鍙栨牱鍗�",
+ ],
+ // 涓昏〃灞炴��
+ hform: {
+ HBillType: '7505',
+ HSourceBillType: "3790",
+ HSourceBillNo: "",
+ HSourceBillQty: 0,
+ HBillNo: "",
+ HInterID: "0",
+ HDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HSourceName: "",
+ HSourceID: "0",
+ HShiftsName: "",
+ HShiftsID: "0",
+ HICMOBillNo: "",
+ HICMOInterID: "0",
+ HICMOEntryID: "1",
+ HICMOQty: "0",
+ HProcExchBillNo: "",
+ HProcExchInterID: "0",
+ HProcExchEntryID: "0",
+ HProcExchQty: "0",
+ HMaterNumber: "",
+ HMaterID: "0",
+ HMaterName: "",
+ HFirstCheckEmpName: getUserInfo().HEmpName,
+ HFirstCheckEmp: getUserInfo().HEmpID,
+ HQCSchemeName: "",
+ HQCSchemeID: "0",
+ HBatchNo: "",
+ HLastResult: true, // 榛樿鍚堟牸
+ HProcName: "",
+ HProcID: "0",
+ HTakeSampleCheckBillNo: "", // 鍙栨牱鍗�
+ HTakeSampleCheckBillID: "0",
+ HRemark: "",
+ HErrTreatment: "", // 寮傚父涓存椂澶勭悊鏂规
+ HMaker: getUserInfo()["Czymc"] || "",
+ HChecker: "",
+ HCloseMan: "",
+ HMakeDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
+ HCheckDate: "",
+ HCloseDate: "",
+ HUpDater: "",
+ HDeleteMan: "",
+ HUpDateDate: "",
+ HDeleteDate: "",
+ HResult: 1,
+ HAnalysisMethod: "",
- HCheckQty: 0,
+ HCheckQty: 0,
- HResDec: "",
- HStatus: 1,
+ HResDec: "",
+ HStatus: 1,
- HMainSourceBillType: "",
- HMainSourceInterID: "0",
- HMainSourceEntryID: "1",
- HMainSourceBillNo: "",
+ HMainSourceBillType: "",
+ HMainSourceInterID: "0",
+ HMainSourceEntryID: "1",
+ HMainSourceBillNo: "",
- HStockOrgID: uni.getStorageSync('OrganizationID'),
- },
- // 妫�楠岄」鐩拰鎶芥牱妫�楠� 鍊�
- checkItems: {},
- // 妫�娴嬪�兼ā鍧�
- InspectModules: {},
- // 妫�娴嬪��
- InspectValues: {},
- };
- },
- methods: {
- // 妫�楠屽�� 璁＄畻鏄惁鍚堟牸
- calcHResult(item) {
- // 闈炴娊妫�鏉′欢涓嬪垽鏂粨璁�
- console.log('item: ', item);
- if (!item.HSampleSchemeID) {
- return
- }
+ HStockOrgID: uni.getStorageSync('OrganizationID'),
+ },
+ // 妫�楠岄」鐩拰鎶芥牱妫�楠� 鍊�
+ checkItems: {},
+ // 妫�娴嬪�兼ā鍧�
+ InspectModules: {},
+ // 妫�娴嬪��
+ InspectValues: {},
+ };
+ },
+ methods: {
+ // 妫�楠屽�� 璁＄畻鏄惁鍚堟牸
+ calcHResult(item) {
+ // 闈炴娊妫�鏉′欢涓嬪垽鏂粨璁�
+ console.log('item: ', item);
+ if (!item.HSampleSchemeID) {
+ return
+ }
- if (item.HInspectValQ >= item.HDownLimit && item.HInspectValQ <= item.HUpLimit) {
- this.checkItems[item.num].HResult = 1
- return
- }
+ if (item.HInspectValQ >= item.HDownLimit && item.HInspectValQ <= item.HUpLimit) {
+ this.checkItems[item.num].HResult = 1
+ return
+ }
- this.checkItems[item.num].HResult = 2
- },
- // 璇诲彇缂撳瓨
- loadCache() {
- const pages = getCurrentPages()
- // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
- const currentPage = pages[pages.length - 1]
- let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`)
- if (HBillTypeCache) {
- this.HSourceBillType = HBillTypeCache.HSourceBillTypeName
- this.hform.HSourceBillType = HBillTypeCache.HSourceBillType
- this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType
- }
- },
- // 婧愬崟绫诲瀷閫夋嫨
- HSourceBillTypeNameChange(e) {
- this.HSourceBillType = this.HSourceBillTypeNameList[e.detail.value];
- this.hform.HSourceBillType = this.HSourceBillTypeValueList[e.detail.value];
- const pages = getCurrentPages()
- // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
- const currentPage = pages[pages.length - 1]
- // 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
- uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
- HSourceBillTypeName: this.HSourceBillType,
- HSourceBillType: this.hform.HSourceBillType
- })
- },
- // 鏍规嵁婧愬崟绫诲瀷閫夋嫨鍗曟嵁
- toBillSelector() {
- this.$refs['billList'].showPopup()
- },
- toScanCode() {
- MpaasScan.scanCode((res) => {
- if (res) {
- this.getSourceBillInfo(res);
- }
- });
- },
- async getSourceBillInfo(HBarCode) {
- console.log('HBarCode: ', HBarCode);
- let res = await CommonUtils.doRequest2Async({
- url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
- data: {
- HBillType: this.hform.HBillType,
- HSourceBillType: this.hform.HSourceBillType,
- HBarCode: HBarCode,
- HInterID: 0,
- HEntryID: 0,
- Mode: 1, //鎵爜妯″紡
- user: getUserInfo()["Czymc"]
- }
- })
+ this.checkItems[item.num].HResult = 2
+ },
+ // 璇诲彇缂撳瓨
+ loadCache() {
+ const pages = getCurrentPages()
+ // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+ const currentPage = pages[pages.length - 1]
+ let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`)
+ if (HBillTypeCache) {
+ this.HSourceBillType = HBillTypeCache.HSourceBillTypeName
+ this.hform.HSourceBillType = HBillTypeCache.HSourceBillType
+ this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType
+ }
+ },
+ // 婧愬崟绫诲瀷閫夋嫨
+ HSourceBillTypeNameChange(e) {
+ this.HSourceBillType = this.HSourceBillTypeNameList[e.detail.value];
+ this.hform.HSourceBillType = this.HSourceBillTypeValueList[e.detail.value];
+ const pages = getCurrentPages()
+ // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+ const currentPage = pages[pages.length - 1]
+ // 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
+ uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
+ HSourceBillTypeName: this.HSourceBillType,
+ HSourceBillType: this.hform.HSourceBillType
+ })
+ },
+ // 鏍规嵁婧愬崟绫诲瀷閫夋嫨鍗曟嵁
+ toBillSelector() {
+ this.$refs['billList'].showPopup()
+ },
+ toScanCode() {
+ MpaasScan.scanCode((res) => {
+ if (res) {
+ this.getSourceBillInfo(res);
+ }
+ });
+ },
+ async getSourceBillInfo(HBarCode) {
+ console.log('HBarCode: ', HBarCode);
+ let res = await CommonUtils.doRequest2Async({
+ url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
+ data: {
+ HBillType: this.hform.HBillType,
+ HSourceBillType: this.hform.HSourceBillType,
+ HBarCode: HBarCode,
+ HInterID: 0,
+ HEntryID: 0,
+ Mode: 1, //鎵爜妯″紡
+ user: getUserInfo()["Czymc"]
+ }
+ })
- console.log(res)
- let {
- data,
- Message,
- count
- } = res.data
- if (count == 1) {
- if(this.hform.HSourceBillType=="3772"){
- this.hform.HMaterID = data[0]['HMaterID']
- this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
- this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
- this.hform.HMainSourceBillNo = data[0]['HBillNo']
- this.hform.HSourceBillNo = data[0]['HBillNo']
- this.hform.HMainSourceInterID = data[0].HInterID
- this.hform.HMainSourceEntryID = data[0].HEntryID
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
- this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
- this.hform.HSourceBillQty = data[0].HSourceBillQty
- this.hasSourceBill = true
- this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
- this.hform.HICMOInterID = data[0].HICMOInterID
- this.hform.HICMOEntryID = data[0].HICMOEntryID
- this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
- this.hform.HProcExchBillNo = data[0].鍗曟嵁鍙�
- this.hform.HProcExchInterID = data[0].HInterID
- this.hform.HProcExchEntryID = data[0].HEntryID
- this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
- this.hform.HSourceName = data[0].鐢熶骇璧勬簮
- this.hform.HSourceID = data[0].HSourceID
- this.hform.HProcID = data[0].HProcID
- this.hform.HProcName = data[0].褰撳墠宸ュ簭
- }
- else if(this.hform.HSourceBillType=="7521"){
- this.hform.HMaterID = data[0]['HMaterID']
- this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
- this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
- this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�
- this.hform.HSourceBillNo = data[0].鍗曟嵁鍙�
- this.hform.HMainSourceInterID = data[0].HInterID
- this.hform.HMainSourceEntryID = data[0].HEntryID
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
- this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
- this.hform.HSourceBillQty = data[0].妫�楠屾暟閲�
- this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
- this.hform.HICMOInterID = data[0].HICMOInterID
- this.hform.HICMOEntryID = data[0].HICMOEntryID
- this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
- this.hform.HProcExchBillNo = data[0].HProcExchBillNo
- this.hform.HProcExchInterID = data[0].HProcExchInterID
- this.hform.HProcExchEntryID = data[0].HProcExchEntryID
- this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
- this.hform.HSourceName = data[0].鐢熶骇璧勬簮
- this.hform.HSourceID = data[0].HSourceID
- this.hform.HProcID = data[0].HProcID
- this.hform.HProcName = data[0].褰撳墠宸ュ簭
- this.hform.HTakeSampleCheckBillNo = data[0].鍗曟嵁鍙�
- this.hform.HTakeSampleCheckBillID = data[0].HInterID
- }
- else if(this.hform.HSourceBillType=="3790"){
+ console.log(res)
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ if (count == 1) {
+ if (this.hform.HSourceBillType == "3772") {
+ this.hform.HMaterID = data[0]['HMaterID']
+ this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+ this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+ this.hform.HMainSourceBillNo = data[0]['HBillNo']
+ this.hform.HSourceBillNo = data[0]['HBillNo']
+ this.hform.HMainSourceInterID = data[0].HInterID
+ this.hform.HMainSourceEntryID = data[0].HEntryID
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+ this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+ this.hform.HSourceBillQty = data[0].HSourceBillQty
+ this.hasSourceBill = true
+ this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
+ this.hform.HICMOInterID = data[0].HICMOInterID
+ this.hform.HICMOEntryID = data[0].HICMOEntryID
+ this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
+ this.hform.HProcExchBillNo = data[0].鍗曟嵁鍙�
+ this.hform.HProcExchInterID = data[0].HInterID
+ this.hform.HProcExchEntryID = data[0].HEntryID
+ this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
+ this.hform.HSourceName = data[0].鐢熶骇璧勬簮
+ this.hform.HSourceID = data[0].HSourceID
+ this.hform.HProcID = data[0].HProcID
+ this.hform.HProcName = data[0].褰撳墠宸ュ簭
+ } else if (this.hform.HSourceBillType == "7521") {
+ this.hform.HMaterID = data[0]['HMaterID']
+ this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+ this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+ this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�
+ this.hform.HSourceBillNo = data[0].鍗曟嵁鍙�
+ this.hform.HMainSourceInterID = data[0].HInterID
+ this.hform.HMainSourceEntryID = data[0].HEntryID
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+ this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+ this.hform.HSourceBillQty = data[0].妫�楠屾暟閲�
+ this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
+ this.hform.HICMOInterID = data[0].HICMOInterID
+ this.hform.HICMOEntryID = data[0].HICMOEntryID
+ this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
+ this.hform.HProcExchBillNo = data[0].HProcExchBillNo
+ this.hform.HProcExchInterID = data[0].HProcExchInterID
+ this.hform.HProcExchEntryID = data[0].HProcExchEntryID
+ this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
+ this.hform.HSourceName = data[0].鐢熶骇璧勬簮
+ this.hform.HSourceID = data[0].HSourceID
+ this.hform.HProcID = data[0].HProcID
+ this.hform.HProcName = data[0].褰撳墠宸ュ簭
+ this.hform.HTakeSampleCheckBillNo = data[0].鍗曟嵁鍙�
+ this.hform.HTakeSampleCheckBillID = data[0].HInterID
+ } else if (this.hform.HSourceBillType == "3790") {
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
@@ -810,1787 +808,1834 @@
this.hform.HProcName = data[0].褰撳墠宸ュ簭
this.hform.HTakeSampleCheckBillNo = data[0].鍗曟嵁鍙�
this.hform.HTakeSampleCheckBillID = data[0].HInterID
+ } else {
+ this.hform.HMaterID = data[0]['HMaterID']
+ this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+ this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+ this.hform.HMainSourceBillNo = data[0]['HBillNo']
+ this.hform.HSourceBillNo = data[0]['HBillNo']
+ this.hform.HMainSourceInterID = data[0].HInterID
+ this.hform.HMainSourceEntryID = data[0].HEntryID
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+ this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+ this.hform.HSourceBillQty = data[0].HSourceBillQty
+ this.hasSourceBill = true
+ this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
+ this.hform.HICMOInterID = data[0].HICMOInterID
+ this.hform.HICMOEntryID = data[0].HICMOEntryID
+ this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
+ this.hform.HProcExchBillNo = data[0].鍗曟嵁鍙�
+ this.hform.HProcExchInterID = data[0].HInterID
+ this.hform.HProcExchEntryID = data[0].HEntryID
+ this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
+ this.hform.HSourceName = data[0].鐢熶骇璧勬簮
+ this.hform.HSourceID = data[0].HSourceID
+ this.hform.HProcID = data[0].HProcID
+ this.hform.HProcName = data[0].褰撳墠宸ュ簭
}
- else{
- this.hform.HMaterID = data[0]['HMaterID']
- this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
- this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
- this.hform.HMainSourceBillNo = data[0]['HBillNo']
- this.hform.HSourceBillNo = data[0]['HBillNo']
- this.hform.HMainSourceInterID = data[0].HInterID
- this.hform.HMainSourceEntryID = data[0].HEntryID
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
- this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
- this.hform.HSourceBillQty = data[0].HSourceBillQty
- this.hasSourceBill = true
- this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
- this.hform.HICMOInterID = data[0].HICMOInterID
- this.hform.HICMOEntryID = data[0].HICMOEntryID
- this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
- this.hform.HProcExchBillNo = data[0].鍗曟嵁鍙�
- this.hform.HProcExchInterID = data[0].HInterID
- this.hform.HProcExchEntryID = data[0].HEntryID
- this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
- this.hform.HSourceName = data[0].鐢熶骇璧勬簮
- this.hform.HSourceID = data[0].HSourceID
- this.hform.HProcID = data[0].HProcID
- this.hform.HProcName = data[0].褰撳墠宸ュ簭
- }
- this.get_CheckItem();
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: Message
- })
- }
+ this.get_CheckItem();
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
- },
- async HandleBillSelectComplete(e) {
- console.log('e: ', e);
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
- data: {
- HBillType: this.hform.HBillType,
- HSourceBillType: this.hform.HSourceBillType,
- HBarCode: "",
- HInterID: e?.HInterID,
- HEntryID: e?.HEntryID,
- Mode: 2, //閫夊崟妯″紡
- user: getUserInfo()["Czymc"]
- }
- })
+ },
+ async HandleBillSelectComplete(e) {
+ console.log('e: ', e);
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
+ data: {
+ HBillType: this.hform.HBillType,
+ HSourceBillType: this.hform.HSourceBillType,
+ HBarCode: "",
+ HInterID: e?.HInterID,
+ HEntryID: e?.HEntryID,
+ Mode: 2, //閫夊崟妯″紡
+ user: getUserInfo()["Czymc"]
+ }
+ })
- let {
- data,
- Message,
- count
- } = res.data
- if (count == 1) {
- if(this.hform.HSourceBillType=="3772"){
- this.hform.HMaterID = data[0]['HMaterID']
- this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
- this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
- this.hform.HMainSourceBillNo = data[0]['HBillNo']
- this.hform.HSourceBillNo = data[0]['HBillNo']
- this.hform.HMainSourceInterID = data[0].HInterID
- this.hform.HMainSourceEntryID = data[0].HEntryID
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
- this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
- this.hform.HSourceBillQty = data[0].HSourceBillQty
- this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
- this.hform.HICMOInterID = data[0].HICMOInterID
- this.hform.HICMOEntryID = data[0].HICMOEntryID
- this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
- this.hform.HProcExchBillNo = data[0].鍗曟嵁鍙�
- this.hform.HProcExchInterID = data[0].HInterID
- this.hform.HProcExchEntryID = data[0].HEntryID
- this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
- this.hform.HSourceName = data[0].鐢熶骇璧勬簮
- this.hform.HSourceID = data[0].HSourceID
- this.hform.HProcID = data[0].HProcID
- this.hform.HProcName = data[0].褰撳墠宸ュ簭
- }else if(this.hform.HSourceBillType=="7521"){
- this.hform.HMaterID = data[0]['HMaterID']
- this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
- this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
- this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�
- this.hform.HSourceBillNo = data[0].鍗曟嵁鍙�
- this.hform.HMainSourceInterID = data[0].HInterID
- this.hform.HMainSourceEntryID = data[0].HEntryID
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
- this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
- this.hform.HSourceBillQty = data[0].妫�楠屾暟閲�
- this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
- this.hform.HICMOInterID = data[0].HICMOInterID
- this.hform.HICMOEntryID = data[0].HICMOEntryID
- this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
- this.hform.HProcExchBillNo = data[0].HProcExchBillNo
- this.hform.HProcExchInterID = data[0].HProcExchInterID
- this.hform.HProcExchEntryID = data[0].HProcExchEntryID
- this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
- this.hform.HSourceName = data[0].鐢熶骇璧勬簮
- this.hform.HSourceID = data[0].HSourceID
- this.hform.HProcID = data[0].HProcID
- this.hform.HProcName = data[0].褰撳墠宸ュ簭
- this.hform.HTakeSampleCheckBillNo = data[0].鍗曟嵁鍙�
- this.hform.HTakeSampleCheckBillID = data[0].HInterID
- }else{
- this.hform.HMaterID = data[0]['HMaterID']
- this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
- this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
- this.hform.HMainSourceBillNo = data[0]['HBillNo']
- this.hform.HSourceBillNo = data[0]['HBillNo']
- this.hform.HMainSourceInterID = data[0].HInterID
- this.hform.HMainSourceEntryID = data[0].HEntryID
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
- this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
- this.hform.HSourceBillQty = data[0].HSourceBillQty
- this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
- this.hform.HICMOInterID = data[0].HICMOInterID
- this.hform.HICMOEntryID = data[0].HICMOEntryID
- this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
- this.hform.HProcExchBillNo = data[0].鍗曟嵁鍙�
- this.hform.HProcExchInterID = data[0].HInterID
- this.hform.HProcExchEntryID = data[0].HEntryID
- this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
- this.hform.HSourceName = data[0].鐢熶骇璧勬簮
- this.hform.HSourceID = data[0].HSourceID
- this.hform.HProcID = data[0].HProcID
- this.hform.HProcName = data[0].褰撳墠宸ュ簭
- }
-
- console.log('鑾峰彇婧愬崟锛�', data)
-
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ if (count == 1) {
+ if (this.hform.HSourceBillType == "3772") {
+ this.hform.HMaterID = data[0]['HMaterID']
+ this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+ this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+ this.hform.HMainSourceBillNo = data[0]['HBillNo']
+ this.hform.HSourceBillNo = data[0]['HBillNo']
+ this.hform.HMainSourceInterID = data[0].HInterID
+ this.hform.HMainSourceEntryID = data[0].HEntryID
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+ this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+ this.hform.HSourceBillQty = data[0].HSourceBillQty
+ this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
+ this.hform.HICMOInterID = data[0].HICMOInterID
+ this.hform.HICMOEntryID = data[0].HICMOEntryID
+ this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
+ this.hform.HProcExchBillNo = data[0].鍗曟嵁鍙�
+ this.hform.HProcExchInterID = data[0].HInterID
+ this.hform.HProcExchEntryID = data[0].HEntryID
+ this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
+ this.hform.HSourceName = data[0].鐢熶骇璧勬簮
+ this.hform.HSourceID = data[0].HSourceID
+ this.hform.HProcID = data[0].HProcID
+ this.hform.HProcName = data[0].褰撳墠宸ュ簭
+ } else if (this.hform.HSourceBillType == "7521") {
+ this.hform.HMaterID = data[0]['HMaterID']
+ this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+ this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+ this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�
+ this.hform.HSourceBillNo = data[0].鍗曟嵁鍙�
+ this.hform.HMainSourceInterID = data[0].HInterID
+ this.hform.HMainSourceEntryID = data[0].HEntryID
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+ this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+ this.hform.HSourceBillQty = data[0].妫�楠屾暟閲�
+ this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
+ this.hform.HICMOInterID = data[0].HICMOInterID
+ this.hform.HICMOEntryID = data[0].HICMOEntryID
+ this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
+ this.hform.HProcExchBillNo = data[0].HProcExchBillNo
+ this.hform.HProcExchInterID = data[0].HProcExchInterID
+ this.hform.HProcExchEntryID = data[0].HProcExchEntryID
+ this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
+ this.hform.HSourceName = data[0].鐢熶骇璧勬簮
+ this.hform.HSourceID = data[0].HSourceID
+ this.hform.HProcID = data[0].HProcID
+ this.hform.HProcName = data[0].褰撳墠宸ュ簭
+ this.hform.HTakeSampleCheckBillNo = data[0].鍗曟嵁鍙�
+ this.hform.HTakeSampleCheckBillID = data[0].HInterID
+ } else {
+ this.hform.HMaterID = data[0]['HMaterID']
+ this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
+ this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
+ this.hform.HMainSourceBillNo = data[0]['HBillNo']
+ this.hform.HSourceBillNo = data[0]['HBillNo']
+ this.hform.HMainSourceInterID = data[0].HInterID
+ this.hform.HMainSourceEntryID = data[0].HEntryID
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�
+ this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D
+ this.hform.HSourceBillQty = data[0].HSourceBillQty
+ this.hform.HICMOBillNo = data[0].浠诲姟鍗曞彿
+ this.hform.HICMOInterID = data[0].HICMOInterID
+ this.hform.HICMOEntryID = data[0].HICMOEntryID
+ this.hform.HICMOQty = data[0].鐢熶骇鏁伴噺
+ this.hform.HProcExchBillNo = data[0].鍗曟嵁鍙�
+ this.hform.HProcExchInterID = data[0].HInterID
+ this.hform.HProcExchEntryID = data[0].HEntryID
+ this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲�
+ this.hform.HSourceName = data[0].鐢熶骇璧勬簮
+ this.hform.HSourceID = data[0].HSourceID
+ this.hform.HProcID = data[0].HProcID
+ this.hform.HProcName = data[0].褰撳墠宸ュ簭
+ }
- this.get_CheckItem();
- this.hasSourceBill = true
- this.$refs['billList'].exit()
- } else {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: Message
- })
- }
+ console.log('鑾峰彇婧愬崟锛�', data)
- } catch (err) {
- CommonUtils.showTips({
- title: '娓╅Θ鎻愮ず',
- message: "婧愬崟涓嬫帹閿欒: " + err
- })
- }
- },
- async GetCheckItemID() {
- if (!this.hform.HMaterName && !this.hform.HProcName) {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Web/GetCheckItemID",
- data: {
- HName: this.hform.HMaterName,
- HProName: this.hform.HProcName,
- HSourceID: this.hform.HSourceID,
- },
- });
+ this.get_CheckItem();
+ this.hasSourceBill = true
+ this.$refs['billList'].exit()
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: Message
+ })
+ }
- let {
- count,
- Message,
- data
- } = res.data;
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: "婧愬崟涓嬫帹閿欒: " + err
+ })
+ }
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${Message}`,
- });
- return;
- }
+ },
+ async GetCheckItemID() {
+ if (!this.hform.HMaterName && !this.hform.HProcName) {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Web/GetCheckItemID",
+ data: {
+ HName: this.hform.HMaterName,
+ HProName: this.hform.HProcName,
+ HSourceID: this.hform.HSourceID,
+ },
+ });
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
- this.hform.HQCSchemeID = data[0].hmainid;
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
- this.get_CheckItem();
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${err}`,
- });
- }
- }
- },
- async LoadingInformation_ProcExchange(HBarCode) {
- // 宸ュ簭娴佽浆鍗�
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/CheckBill/get_ProcessExchangeBill_ByBillNo",
- data: {
- HBillNo: HBarCode,
- user: getUserInfo()["Czymc"],
- },
- });
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${Message}`,
+ });
+ return;
+ }
- let {
- count,
- Message,
- data
- } = res.data;
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+ this.hform.HQCSchemeID = data[0].hmainid;
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${Message}`,
- });
- return;
- }
- this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
- this.hform.HProcExchInterID = data[0].HProcExchInterID;
- this.hform.HProcExchEntryID = data[0].HProcExchEntryID || 0;
- this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
- this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
- this.hform.HICMOInterID = data[0].HICMOInterID;
- this.hform.HICMOQty = data[0].HICMOQty || 0;
- this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
- this.hform.HSourceID = data[0].HSourceID || 0;
- this.hform.HMaterID = data[0].HMaterID;
- this.hform.HMaterName = data[0].浜у搧鍚嶇О;
- this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
- this.hform.HMainSourceBillType = data[0].HBillType;
- this.hform.HMainSourceInterID = data[0].HInterID;
- this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
- this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
- this.hform.HProcName = data[0].褰撳墠宸ュ簭;
- this.hform.HBatchNo = data[0].鎵瑰彿;
+ this.get_CheckItem();
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇妫�楠屾柟妗� 閿欒: ${err}`,
+ });
+ }
+ }
+ },
+ async LoadingInformation_ProcExchange(HBarCode) {
+ // 宸ュ簭娴佽浆鍗�
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/CheckBill/get_ProcessExchangeBill_ByBillNo",
+ data: {
+ HBillNo: HBarCode,
+ user: getUserInfo()["Czymc"],
+ },
+ });
- this.hasSourceBill = true
- this.get_CheckItem();
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${err}`,
- });
- }
- },
- async LoadingInformation_ICMO(HBarCode) {
- // 鐢熶骇璁㈠崟
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/QC_FirstPieceCheckBill/get_ICMOBill_ByBillNo",
- data: {
- HBillNo: HBarCode,
- user: getUserInfo()["Czymc"],
- },
- });
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
- let {
- count,
- Message,
- data
- } = res.data;
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${Message}`,
+ });
+ return;
+ }
+ this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
+ this.hform.HProcExchInterID = data[0].HProcExchInterID;
+ this.hform.HProcExchEntryID = data[0].HProcExchEntryID || 0;
+ this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+ this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
+ this.hform.HICMOInterID = data[0].HICMOInterID;
+ this.hform.HICMOQty = data[0].HICMOQty || 0;
+ this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
+ this.hform.HSourceID = data[0].HSourceID || 0;
+ this.hform.HMaterID = data[0].HMaterID;
+ this.hform.HMaterName = data[0].浜у搧鍚嶇О;
+ this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+ this.hform.HMainSourceBillType = data[0].HBillType;
+ this.hform.HMainSourceInterID = data[0].HInterID;
+ this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+ this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+ this.hform.HProcName = data[0].褰撳墠宸ュ簭;
+ this.hform.HBatchNo = data[0].鎵瑰彿;
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${Message}`,
- });
- return;
- }
- this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
- this.hform.HProcExchInterID = data[0].HProcExchInterID;
- this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
- this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
- this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
- this.hform.HICMOInterID = data[0].HICMOInterID;
- this.hform.HICMOQty = data[0].HICMOQty;
- this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
- this.hform.HSourceID = data[0].HSourceID;
- this.hform.HMaterID = data[0].HMaterID;
- this.hform.HMaterName = data[0].浜у搧鍚嶇О;
- this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
- this.hform.HMainSourceBillType = data[0].HBillType;
- this.hform.HMainSourceInterID = data[0].HInterID;
- this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
- this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
- this.hform.HProcName = data[0].褰撳墠宸ュ簭;
- this.hasSourceBill = true
- this.get_CheckItem();
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${err}`,
- });
- }
- },
- async LoadingInformation_StationEntrustOutBill(HBarCode) {
- // 宸ュ簭濮斿鎺ユ敹鍗�
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Cj_StationEntrustOutBill/list",
- data: {
- sWhere: ` and HBillNo = '${HBarCode}'`,
- },
- });
+ this.hasSourceBill = true
+ this.get_CheckItem();
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇宸ュ簭娴佽浆鍗� 閿欒: ${err}`,
+ });
+ }
+ },
+ async LoadingInformation_ICMO(HBarCode) {
+ // 鐢熶骇璁㈠崟
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/QC_FirstPieceCheckBill/get_ICMOBill_ByBillNo",
+ data: {
+ HBillNo: HBarCode,
+ user: getUserInfo()["Czymc"],
+ },
+ });
- let {
- count,
- Message,
- data
- } = res.data;
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${Message}`,
- });
- return;
- }
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${Message}`,
+ });
+ return;
+ }
+ this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
+ this.hform.HProcExchInterID = data[0].HProcExchInterID;
+ this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
+ this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+ this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
+ this.hform.HICMOInterID = data[0].HICMOInterID;
+ this.hform.HICMOQty = data[0].HICMOQty;
+ this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
+ this.hform.HSourceID = data[0].HSourceID;
+ this.hform.HMaterID = data[0].HMaterID;
+ this.hform.HMaterName = data[0].浜у搧鍚嶇О;
+ this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+ this.hform.HMainSourceBillType = data[0].HBillType;
+ this.hform.HMainSourceInterID = data[0].HInterID;
+ this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+ this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+ this.hform.HProcName = data[0].褰撳墠宸ュ簭;
+ this.hasSourceBill = true
+ this.get_CheckItem();
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鐢熶骇璁㈠崟 閿欒: ${err}`,
+ });
+ }
+ },
+ async LoadingInformation_StationEntrustOutBill(HBarCode) {
+ // 宸ュ簭濮斿鎺ユ敹鍗�
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Cj_StationEntrustOutBill/list",
+ data: {
+ sWhere: ` and HBillNo = '${HBarCode}'`,
+ },
+ });
- HProcExchBillNo = data[0].娴佽浆鍗″彿;
- HProcExchInterID = data[0].HProcExchInterID;
- HProcExchEntryID = data[0].HProcExchEntryID;
- HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
- HICMOBillNo = data[0].鐢熶骇璁㈠崟鍙�;
- HICMOInterID = data[0].HICMOInterID;
- HICMOQty = data[0].HICMOQty;
- HSourceName = data[0].鐢熶骇璧勬簮;
- HSourceID = data[0].HSourceID;
- HMaterID = data[0].HMaterID;
- HMaterName = data[0].浜у搧鍚嶇О;
- HMainSourceBillNo = data[0].鍗曟嵁鍙�;
- HMainSourceBillType = data[0].HBillType;
- HMainSourceInterID = data[0].HInterID;
- HICMOEntryID = data[0].HICMOEntryID || 1;
- this.hasSourceBill = true
- this.get_CheckItem();
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${err}`,
- });
- }
- },
- async LoadingInformation_StationInBill(HBarCode) {
- // 杩涚珯鎺ユ敹鍗�
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/QC_FirstPieceCheckBill/get_StationInBill_ByHBillNo",
- data: {
- HBillNo: HBarCode,
- user: getUserInfo()["Czymc"],
- },
- });
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
- let {
- count,
- Message,
- data
- } = res.data;
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${Message}`,
+ });
+ return;
+ }
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇杩涚珯鎺ユ敹鍗� 閿欒: ${Message}`,
- });
- return;
- }
- this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
- this.hform.HProcExchInterID = data[0].HProcExchInterID;
- this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
- this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
- this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
- this.hform.HICMOInterID = data[0].HICMOInterID;
- this.hform.HICMOQty = data[0].HICMOQty;
- this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
- this.hform.HSourceID = data[0].HSourceID;
- this.hform.HMaterID = data[0].HMaterID;
- this.hform.HMaterName = data[0].浜у搧鍚嶇О;
- this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
- this.hform.HMainSourceBillType = data[0].HBillType;
- this.hform.HMainSourceInterID = data[0].HInterID;
- this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
- this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
- this.hform.HProcName = data[0].褰撳墠宸ュ簭;
+ HProcExchBillNo = data[0].娴佽浆鍗″彿;
+ HProcExchInterID = data[0].HProcExchInterID;
+ HProcExchEntryID = data[0].HProcExchEntryID;
+ HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+ HICMOBillNo = data[0].鐢熶骇璁㈠崟鍙�;
+ HICMOInterID = data[0].HICMOInterID;
+ HICMOQty = data[0].HICMOQty;
+ HSourceName = data[0].鐢熶骇璧勬簮;
+ HSourceID = data[0].HSourceID;
+ HMaterID = data[0].HMaterID;
+ HMaterName = data[0].浜у搧鍚嶇О;
+ HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+ HMainSourceBillType = data[0].HBillType;
+ HMainSourceInterID = data[0].HInterID;
+ HICMOEntryID = data[0].HICMOEntryID || 1;
+ this.hasSourceBill = true
+ this.get_CheckItem();
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇宸ュ簭濮斿鎺ユ敹鍗� 閿欒: ${err}`,
+ });
+ }
+ },
+ async LoadingInformation_StationInBill(HBarCode) {
+ // 杩涚珯鎺ユ敹鍗�
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/QC_FirstPieceCheckBill/get_StationInBill_ByHBillNo",
+ data: {
+ HBillNo: HBarCode,
+ user: getUserInfo()["Czymc"],
+ },
+ });
- for (let i = 0; i < data.length; i++) {
- this.addCheckItem(data[i])
- }
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
- this.hasSourceBill = true
- this.get_CheckItem();
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇杩涚珯鎺ユ敹鍗� 閿欒: ${err}`,
- });
- }
- },
- async LoadingInformation_TakeSampleCheckBill(linterid) {
- // 鍙栨牱鍗�
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/QC_FirstPieceCheckBill/get_TakeSampleCheckBill",
- data: {
- HInterID: linterid,
- user: getUserInfo()["Czymc"],
- },
- });
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇杩涚珯鎺ユ敹鍗� 閿欒: ${Message}`,
+ });
+ return;
+ }
+ this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
+ this.hform.HProcExchInterID = data[0].HProcExchInterID;
+ this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
+ this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+ this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
+ this.hform.HICMOInterID = data[0].HICMOInterID;
+ this.hform.HICMOQty = data[0].HICMOQty;
+ this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
+ this.hform.HSourceID = data[0].HSourceID;
+ this.hform.HMaterID = data[0].HMaterID;
+ this.hform.HMaterName = data[0].浜у搧鍚嶇О;
+ this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+ this.hform.HMainSourceBillType = data[0].HBillType;
+ this.hform.HMainSourceInterID = data[0].HInterID;
+ this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+ this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+ this.hform.HProcName = data[0].褰撳墠宸ュ簭;
- let {
- count,
- Message,
- data
- } = res.data;
+ for (let i = 0; i < data.length; i++) {
+ this.addCheckItem(data[i])
+ }
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鍙栨牱鍗� 閿欒: ${Message}`,
- });
- return;
- }
- this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
- this.hform.HProcExchInterID = data[0].HProcExchInterID;
- this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
- this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
- this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
- this.hform.HICMOInterID = data[0].HICMOInterID;
- this.hform.HICMOQty = data[0].HICMOQty;
- this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
- this.hform.HSourceID = data[0].HSourceID;
- this.hform.HMaterID = data[0].HMaterID;
- this.hform.HMaterName = data[0].浜у搧鍚嶇О;
- this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
- this.hform.HMainSourceBillType = data[0].HBillType;
- this.hform.HMainSourceInterID = data[0].HInterID;
- this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
- this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
- this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
- this.hform.HProcName = data[0].褰撳墠宸ュ簭;
+ this.hasSourceBill = true
+ this.get_CheckItem();
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇杩涚珯鎺ユ敹鍗� 閿欒: ${err}`,
+ });
+ }
+ },
+ async LoadingInformation_TakeSampleCheckBill(linterid) {
+ // 鍙栨牱鍗�
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/QC_FirstPieceCheckBill/get_TakeSampleCheckBill",
+ data: {
+ HInterID: linterid,
+ user: getUserInfo()["Czymc"],
+ },
+ });
+
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
+
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鍙栨牱鍗� 閿欒: ${Message}`,
+ });
+ return;
+ }
+ this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
+ this.hform.HProcExchInterID = data[0].HProcExchInterID;
+ this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
+ this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
+ this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
+ this.hform.HICMOInterID = data[0].HICMOInterID;
+ this.hform.HICMOQty = data[0].HICMOQty;
+ this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
+ this.hform.HSourceID = data[0].HSourceID;
+ this.hform.HMaterID = data[0].HMaterID;
+ this.hform.HMaterName = data[0].浜у搧鍚嶇О;
+ this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
+ this.hform.HMainSourceBillType = data[0].HBillType;
+ this.hform.HMainSourceInterID = data[0].HInterID;
+ this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+ this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+ this.hform.HProcName = data[0].褰撳墠宸ュ簭;
this.hform.HCheckQty = data[0].鍙栨牱鏁伴噺
- this.hasSourceBill = true
- this.get_CheckItem();
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鍙栨牱鍗� 閿欒: ${err}`,
- });
- }
- },
- // 妫�楠屽憳鍒濆鍖�
- async InitHEmp() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Gy_Employee/list",
- data: {
- sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' `,
- user: getUserInfo()["Czymc"],
- Organization: uni.getStorageSync("Organization"),
- },
- });
+ this.hasSourceBill = true
+ this.get_CheckItem();
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鍙栨牱鍗� 閿欒: ${err}`,
+ });
+ }
+ },
+ // 妫�楠屽憳鍒濆鍖�
+ async InitHEmp() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Gy_Employee/list",
+ data: {
+ sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' `,
+ user: getUserInfo()["Czymc"],
+ Organization: uni.getStorageSync("Organization"),
+ },
+ });
- let {
- data,
- Message,
- count
- } = res.data;
+ let {
+ data,
+ Message,
+ count
+ } = res.data;
- if (count == 1) {
- console.log("data: ", data);
- this.GyFirstCheckEmpList = data;
- this.GyFirstCheckEmpNameList = Array.from(data).map((e) => e["鑱屽憳鍚嶇О"]);
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍒濆鍖栨楠屽憳澶辫触: ${Message}`,
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍒濆鍖栨楠屽憳澶辫触: ${err}`,
- });
- }
- },
- async HFirstCheckEmpChange(e) {
- console.log("閫変腑妫�楠屽憳: ", e);
- let index = this.GyFirstCheckEmpList.findIndex((elem) => elem["鑱屽憳鍚嶇О"] == e);
- if (index == -1) {
- this.hform.HFirstCheckEmp = 0;
- this.hform.HFirstCheckEmpName = "";
- return;
- }
+ if (count == 1) {
+ console.log("data: ", data);
+ this.GyFirstCheckEmpList = data;
+ this.GyFirstCheckEmpNameList = Array.from(data).map((e) => e["鑱屽憳鍚嶇О"]);
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栨楠屽憳澶辫触: ${Message}`,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栨楠屽憳澶辫触: ${err}`,
+ });
+ }
+ },
+ async HFirstCheckEmpChange(e) {
+ console.log("閫変腑妫�楠屽憳: ", e);
+ let index = this.GyFirstCheckEmpList.findIndex((elem) => elem["鑱屽憳鍚嶇О"] == e);
+ if (index == -1) {
+ this.hform.HFirstCheckEmp = 0;
+ this.hform.HFirstCheckEmpName = "";
+ return;
+ }
- this.hform.HFirstCheckEmp = this.GyFirstCheckEmpList[index]["HItemID"];
- this.hform.HFirstCheckEmpName = this.GyFirstCheckEmpList[index]["鑱屽憳鍚嶇О"];
- },
- // 鐢熶骇鐝鍒濆鍖�
- async InitHWorkShift() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Gy_ShiftsController/Get_Gy_WorkShiftList",
- data: {
- sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}'`,
- HMaker: getUserInfo()["Czymc"],
- },
- });
+ this.hform.HFirstCheckEmp = this.GyFirstCheckEmpList[index]["HItemID"];
+ this.hform.HFirstCheckEmpName = this.GyFirstCheckEmpList[index]["鑱屽憳鍚嶇О"];
+ },
+ // 鐢熶骇鐝鍒濆鍖�
+ async InitHWorkShift() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Gy_ShiftsController/Get_Gy_WorkShiftList",
+ data: {
+ sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}'`,
+ HMaker: getUserInfo()["Czymc"],
+ },
+ });
- let {
- data,
- Message,
- count
- } = res.data;
+ let {
+ data,
+ Message,
+ count
+ } = res.data;
- if (count == 1) {
- console.log("data: ", data);
- this.GyWorkShiftList = data;
- this.GyWorkShiftNameList = Array.from(data).map((e) => e["鐝鍚嶇О"]);
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍒濆鍖栫彮娆″け璐�: ${Message}`,
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍒濆鍖栫彮娆″け璐�: ${err}`,
- });
- }
- },
- async HWorkShiftChange(e) {
- let index = this.GyWorkShiftList.findIndex((elem) => elem["鐝鍚嶇О"] == e);
- if (index == -1) {
- this.hform.HWorkShiftID = 0;
- this.hform.HWorkShiftName = "";
- return;
- }
+ if (count == 1) {
+ console.log("data: ", data);
+ this.GyWorkShiftList = data;
+ this.GyWorkShiftNameList = Array.from(data).map((e) => e["鐝鍚嶇О"]);
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栫彮娆″け璐�: ${Message}`,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栫彮娆″け璐�: ${err}`,
+ });
+ }
+ },
+ async HWorkShiftChange(e) {
+ let index = this.GyWorkShiftList.findIndex((elem) => elem["鐝鍚嶇О"] == e);
+ if (index == -1) {
+ this.hform.HWorkShiftID = 0;
+ this.hform.HWorkShiftName = "";
+ return;
+ }
- this.hform.HWorkShiftID = this.GySourceList[index]["HInterID"];
- this.hform.HWorkShiftName = this.GySourceList[index]["鐝鍚嶇О"];
- },
- // 鐢熶骇璧勬簮鍒濆鍖�
- async InitHSource() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Gy_Source/list",
- data: {
- sWhere: `and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'') != '' and HUSEORGID = '100038'`,
- user: getUserInfo()["Czymc"],
- },
- });
+ this.hform.HWorkShiftID = this.GySourceList[index]["HInterID"];
+ this.hform.HWorkShiftName = this.GySourceList[index]["鐝鍚嶇О"];
+ },
+ // 鐢熶骇璧勬簮鍒濆鍖�
+ async InitHSource() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Gy_Source/list",
+ data: {
+ sWhere: `and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'') != '' and HUSEORGID = '100038'`,
+ user: getUserInfo()["Czymc"],
+ },
+ });
- let {
- data,
- Message,
- count
- } = res.data;
+ let {
+ data,
+ Message,
+ count
+ } = res.data;
- if (count == 1) {
- this.GySourceList = data;
- this.GySourceNameList = Array.from(data).map((e) => e["鐢熶骇璧勬簮鍚嶇О"]);
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${Message}`,
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${err}`,
- });
- }
- },
- // 鐢熶骇璧勬簮鏇存柊
- async HSourceChange(e) {
- console.log("閫変腑鐢熶骇璧勬簮: ", e);
- let index = this.GySourceList.findIndex((elem) => elem["鐢熶骇璧勬簮鍚嶇О"] == e);
- if (index == -1) {
- this.hform.HSourceID = 0;
- this.hform.HSourceName = "";
- return;
- }
+ if (count == 1) {
+ this.GySourceList = data;
+ this.GySourceNameList = Array.from(data).map((e) => e["鐢熶骇璧勬簮鍚嶇О"]);
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${Message}`,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍒濆鍖栫敓浜ц祫婧愬け璐�: ${err}`,
+ });
+ }
+ },
+ // 鐢熶骇璧勬簮鏇存柊
+ async HSourceChange(e) {
+ console.log("閫変腑鐢熶骇璧勬簮: ", e);
+ let index = this.GySourceList.findIndex((elem) => elem["鐢熶骇璧勬簮鍚嶇О"] == e);
+ if (index == -1) {
+ this.hform.HSourceID = 0;
+ this.hform.HSourceName = "";
+ return;
+ }
- this.hform.HSourceID = this.GySourceList[index]["HItemID"];
- this.hform.HSourceName = this.GySourceList[index]["鐢熶骇璧勬簮鍚嶇О"];
+ this.hform.HSourceID = this.GySourceList[index]["HItemID"];
+ this.hform.HSourceName = this.GySourceList[index]["鐢熶骇璧勬簮鍚嶇О"];
- this.get_ICMOBillStatusList();
- this.get_QC_TakeSampleCheckBillList();
- this.GetCheckItemID();
- },
- // 鏄剧ず寮圭獥
- async showSelectorModule(item, index) {
- this.currentChechItemIDCache = item.num || 0; // 0 琛ㄧず娌℃湁浠讳綍瀛愯〃琚�変腑
- this.enablePopupModule = this.PopupModuleNameList[index];
- console.log("this.$refs: ", this.$refs);
- await this.$nextTick();
- if (index == 7) {
- // 妫�楠屾柟妗堥渶瑕侀澶栦紶閫掑伐搴忓拰鐗╂枡鍚嶇О涓や釜鍙傛暟
- this.$refs.listPopup.setRequiredInfo(item.HMaterName, item.HProcName);
- }
+ this.get_ICMOBillStatusList();
+ this.get_QC_TakeSampleCheckBillList();
+ this.GetCheckItemID();
+ },
+ // 鏄剧ず寮圭獥
+ async showSelectorModule(item, index) {
+ this.currentChechItemIDCache = item.num || 0; // 0 琛ㄧず娌℃湁浠讳綍瀛愯〃琚�変腑
+ this.enablePopupModule = this.PopupModuleNameList[index];
+ console.log("this.$refs: ", this.$refs);
+ await this.$nextTick();
+ if (index == 7) {
+ // 妫�楠屾柟妗堥渶瑕侀澶栦紶閫掑伐搴忓拰鐗╂枡鍚嶇О涓や釜鍙傛暟
+ this.$refs.listPopup.setRequiredInfo(item.HMaterName, item.HProcName);
+ }
- this.$refs.listPopup.showPopup();
- },
- getAnalysisMethodDisplay(val) {
- console.log("AnalysisMethod: ", val);
- if (val) {
- return this.arrayAnalysisMethod.find((e) => e.value == val).name;
- }
- return "";
- },
- checkResultChange(event) {
- console.log("event: ", event);
- },
- // 妫�楠岄」鐩柊澧炶
- addCheckItem(resource) {
- let ordinal = this.getObjLength(this.checkItems) + 1;
- let checkItem = {
- num: ordinal,
- HInterID: this.hform.HInterID,
- HQCCheckItemID: "",
- HQCCheckItemNumber: "",
- HQCCheckItemName: "",
- HInspectInstruMentID: "0",
- HInspectInstruMentNumber: "",
- HInspectInstruMentName: "",
- HQCStd: "",
- HUnit: "",
- HQCNote: "",
- HAnalysisMethod: "",
- HResult: 1,
- HMax: "",
- HMin: "",
- HAvg: "",
- HRemark: "",
- HKeyInspect: false,
- HStatus: 1,
- HSampleSchemeID: "",
- HUnitID: 0,
- HInspectVal: "",
- HTargetVal: "",
- HUpLimit: "",
- HDownLimit: "",
- HUpOffSet: "",
- HDownOffSet: "",
- HSampleDamageQty: 0,
- HSampleSchemeName: "",
- HSampleQty: 0,
- HAcceptQty: 0,
- HInspectionLevel: "",
- HRejectQty: 0,
- HStrictness: "",
- HSampleUnRightQty: 0,
- HAQL: "",
- HSamplingType: "",
- HInspectResultToSee: "",
- };
- if (resource) {
- // 閫氳繃涓昏〃妫�楠屾柟妗堝甫鍑虹殑妫�楠岄」鐩�
- Object.assign(checkItem, resource);
- }
- this.$set(this.checkItems, ordinal, checkItem);
- this.$nextTick(() => {
- // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
- this.setInspectValModule(this.checkItems[ordinal]);
- });
- },
- // 妫�楠岄」鐩垹闄よ
- removeCheckItem(item) {
- uni.showModal({
- title: "娓╅Θ鎻愮ず",
- content: `纭瑕佸垹闄ょ${item.num}琛屽悧锛熷垹闄ゅ悗涓嶈兘鎭㈠`,
- success: (res) => {
- if (res.confirm) {
- this.$delete(this.checkItems, item.num);
- this.$delete(this.subTabs, `_${item.num}`);
- this.$forceUpdate();
- this.refreshCheckItemNum();
- }
- },
- });
- },
- async refreshCheckItemNum() {
- await this.$nextTick();
- // 閲嶆帓搴忓彿
- let num = 1;
- let checkItemsCache = {};
- for (let s in this.checkItems) {
- checkItemsCache[num] = this.checkItems[s];
- checkItemsCache[num].num = num;
- num++;
- }
- this.checkItems = checkItemsCache;
- },
- getObjLength(obj) {
- return Object.keys(obj).length;
- },
- // 缁撹淇敼
- HResultChange(id, e) {
- console.log("e: ", e);
- this.checkItems[id]["HResult"] = e.detail.value ? 1 : 2;
+ this.$refs.listPopup.showPopup();
+ },
+ getAnalysisMethodDisplay(val) {
+ console.log("AnalysisMethod: ", val);
+ if (val) {
+ return this.arrayAnalysisMethod.find((e) => e.value == val).name;
+ }
+ return "";
+ },
+ checkResultChange(event) {
+ console.log("event: ", event);
+ },
+ // 妫�楠岄」鐩柊澧炶
+ addCheckItem(resource) {
+ let ordinal = this.getObjLength(this.checkItems) + 1;
+ let checkItem = {
+ num: ordinal,
+ HInterID: this.hform.HInterID,
+ HQCCheckItemID: "",
+ HQCCheckItemNumber: "",
+ HQCCheckItemName: "",
+ HInspectInstruMentID: "0",
+ HInspectInstruMentNumber: "",
+ HInspectInstruMentName: "",
+ HQCStd: "",
+ HUnit: "",
+ HQCNote: "",
+ HAnalysisMethod: "",
+ HResult: 1,
+ HMax: "",
+ HMin: "",
+ HAvg: "",
+ HRemark: "",
+ HKeyInspect: false,
+ HStatus: 1,
+ HSampleSchemeID: "",
+ HUnitID: 0,
+ HInspectVal: "",
+ HTargetVal: "",
+ HUpLimit: "",
+ HDownLimit: "",
+ HUpOffSet: "",
+ HDownOffSet: "",
+ HSampleDamageQty: 0,
+ HSampleSchemeName: "",
+ HSampleQty: 0,
+ HAcceptQty: 0,
+ HInspectionLevel: "",
+ HRejectQty: 0,
+ HStrictness: "",
+ HSampleUnRightQty: 0,
+ HAQL: "",
+ HSamplingType: "",
+ HInspectResultToSee: "",
+ };
+ if (resource) {
+ // 閫氳繃涓昏〃妫�楠屾柟妗堝甫鍑虹殑妫�楠岄」鐩�
+ Object.assign(checkItem, resource);
+ }
+ this.$set(this.checkItems, ordinal, checkItem);
+ this.$nextTick(() => {
+ // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
+ this.setInspectValModule(this.checkItems[ordinal]);
+ });
+ },
+ // 妫�楠岄」鐩垹闄よ
+ removeCheckItem(item) {
+ uni.showModal({
+ title: "娓╅Θ鎻愮ず",
+ content: `纭瑕佸垹闄ょ${item.num}琛屽悧锛熷垹闄ゅ悗涓嶈兘鎭㈠`,
+ success: (res) => {
+ if (res.confirm) {
+ this.$delete(this.checkItems, item.num);
+ this.$delete(this.subTabs, `_${item.num}`);
+ this.$forceUpdate();
+ this.refreshCheckItemNum();
+ }
+ },
+ });
+ },
+ async refreshCheckItemNum() {
+ await this.$nextTick();
+ // 閲嶆帓搴忓彿
+ let num = 1;
+ let checkItemsCache = {};
+ for (let s in this.checkItems) {
+ checkItemsCache[num] = this.checkItems[s];
+ checkItemsCache[num].num = num;
+ num++;
+ }
+ this.checkItems = checkItemsCache;
+ },
+ getObjLength(obj) {
+ return Object.keys(obj).length;
+ },
+ // 缁撹淇敼
+ HResultChange(id, e) {
+ console.log("e: ", e);
+ this.checkItems[id]["HResult"] = e.detail.value ? 1 : 2;
- this.HCheckLastResult();
- },
- // 姣忔妫�楠岄」鐩殑缁撹鏇存柊锛岄兘瑕佸垽鏂渶缁堢粨璁�
- HCheckLastResult() {
- let unPassNum = 0;
- for (var key in this.checkItems) {
- if (!(this.checkItems[key]["HResult"] == 1)) {
- unPassNum++;
- }
- }
+ this.HCheckLastResult();
+ },
+ // 姣忔妫�楠岄」鐩殑缁撹鏇存柊锛岄兘瑕佸垽鏂渶缁堢粨璁�
+ HCheckLastResult() {
+ let unPassNum = 0;
+ for (var key in this.checkItems) {
+ if (!(this.checkItems[key]["HResult"] == 1)) {
+ unPassNum++;
+ }
+ }
- if (unPassNum > 0) {
- this.hform.HLastResult = false;
- return;
- }
- this.hform.HLastResult = true;
- },
- // 妫�楠屾柟妗堜慨鏀�
- HAnalysisMethodChange(id, e) {
- console.log("e: ", e);
- this.checkItems[id]["HAnalysisMethod"] = this.arrayAnalysisMethod[e.detail.value][
- "value"
- ];
+ if (unPassNum > 0) {
+ this.hform.HLastResult = false;
+ return;
+ }
+ this.hform.HLastResult = true;
+ },
+ // 妫�楠屾柟妗堜慨鏀�
+ HAnalysisMethodChange(id, e) {
+ console.log("e: ", e);
+ this.checkItems[id]["HAnalysisMethod"] = this.arrayAnalysisMethod[e.detail.value][
+ "value"
+ ];
- // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
- this.setInspectValModule(this.checkItems[id]);
- },
- // 閲嶇偣妫�鏌ヤ慨鏀�
- HKeyInspectChange(id, e) {
- console.log("e: ", e);
- this.checkItems[id]["HKeyInspect"] = e.detail.value;
- },
- // 妫�楠岄」鐩繑鍥�
- async CheckItemComplete(e) {
- console.log("CheckItemRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.checkItems[key], {
- HQCCheckItemID: data["HItemID"],
- HQCCheckItemNumber: data["浠ｇ爜"],
- HQCCheckItemName: data["鍚嶇О"],
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- }
- },
- // 妫�楠屾柟妗堣繑鍥�
- async SampleSchemeComplete(e) {
- console.log("SampleSchemeRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.checkItems[key], {
- HSampleSchemeID: data["hmainid"],
- HSampleSchemeNumber: data["鎶芥牱鏂规浠ｇ爜"],
- HSampleSchemeName: data["鎶芥牱鏂规鍚嶇О"],
- HSampleQty: data["鏍锋湰閲�"] || 0,
- HAcceptQty: data["鍏佽鏁�"] || 0,
- HInspectionLevel: data["妫�楠屾按骞�"],
- HRejectQty: data["鎷掔粷鏁�"] || 0,
- HStrictness: data["涓ユ牸搴�"],
- HSampleUnRightQty: data["鏍锋湰涓嶅悎鏍兼暟"] || 0,
- HAQL: data["AQL"],
- HSamplingType: data["鎶芥牱绫诲瀷"],
- HInspectResultToSee: data["妫�楠岀粨鏋�"],
- HUpLimit: data["涓婇檺鍊�"] || 0,
- HDownLimit: data["涓嬮檺鍊�"] || 0,
- HSampleDamageQty: data["鏍锋湰鐮村潖鏁�"] || 0,
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- this.setInspectValModule(this.checkItems[key]);
+ // 妫�鏌ユ槸鍚﹀彲浠ユ柊澧炴楠屽�奸」
+ this.setInspectValModule(this.checkItems[id]);
+ },
+ // 閲嶇偣妫�鏌ヤ慨鏀�
+ HKeyInspectChange(id, e) {
+ console.log("e: ", e);
+ this.checkItems[id]["HKeyInspect"] = e.detail.value;
+ },
+ // 妫�楠岄」鐩繑鍥�
+ async CheckItemComplete(e) {
+ console.log("CheckItemRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.checkItems[key], {
+ HQCCheckItemID: data["HItemID"],
+ HQCCheckItemNumber: data["浠ｇ爜"],
+ HQCCheckItemName: data["鍚嶇О"],
+ });
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ }
+ },
+ // 妫�楠屾柟妗堣繑鍥�
+ async SampleSchemeComplete(e) {
+ console.log("SampleSchemeRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.checkItems[key], {
+ HSampleSchemeID: data["hmainid"],
+ HSampleSchemeNumber: data["鎶芥牱鏂规浠ｇ爜"],
+ HSampleSchemeName: data["鎶芥牱鏂规鍚嶇О"],
+ HSampleQty: data["鏍锋湰閲�"] || 0,
+ HAcceptQty: data["鍏佽鏁�"] || 0,
+ HInspectionLevel: data["妫�楠屾按骞�"],
+ HRejectQty: data["鎷掔粷鏁�"] || 0,
+ HStrictness: data["涓ユ牸搴�"],
+ HSampleUnRightQty: data["鏍锋湰涓嶅悎鏍兼暟"] || 0,
+ HAQL: data["AQL"],
+ HSamplingType: data["鎶芥牱绫诲瀷"],
+ HInspectResultToSee: data["妫�楠岀粨鏋�"],
+ HUpLimit: data["涓婇檺鍊�"] || 0,
+ HDownLimit: data["涓嬮檺鍊�"] || 0,
+ HSampleDamageQty: data["鏍锋湰鐮村潖鏁�"] || 0,
+ });
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ this.setInspectValModule(this.checkItems[key]);
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- }
- },
- // 妫�楠屼华鍣ㄨ繑鍥�
- async InspectMentComplete(e) {
- console.log("InspectInstruMentRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.checkItems[key], {
- HInspectInstruMentID: data["HItemID"],
- HInspectInstruMentNumber: data["妫�楠屼华鍣ㄤ唬鐮�"],
- HInspectInstruMentName: data["妫�楠屼华鍣ㄥ悕绉�"],
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- }
- },
- // 浜у搧浠ｇ爜杩斿洖
- async MaterComplete(e) {
- console.log("MaterRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.hform, {
- HMaterNumber: data["鐗╂枡浠ｇ爜"],
- HMaterName: data["鐗╂枡鍚嶇О"],
- HMaterID: data["HItemID"],
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- this.GetCheckItemID();
- }
- },
- // 浠诲姟鍗曡繑鍥�
- async ICMOBillComplete(e) {
- console.log("ICMOBillRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.hform, {
- HICMOInterID: data.hmainid,
- HICMOEntryID: data.HEntryID || 1,
- HICMOBillNo: data.鍗曟嵁鍙�,
- HMaterNumber: data.浜у搧浠ｇ爜,
- HMaterName: data.浜у搧鍚嶇О,
- HMaterID: data.HMaterID,
- HICMOQty: data.鐢熶骇浠诲姟鍗曟暟閲�,
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- }
- },
- // 娴佽浆鍗¤繑鍥�
- async ProcExchBillComplete(e) {
- console.log("ProcExchBillRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.hform, {
- HProcExchInterID: data.hmainid,
- HProcExchEntryID: data.hsubid,
- HProcExchBillNo: data.鍗曟嵁鍙�,
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- }
- },
- // 妫�楠屾柟妗�(涓昏〃)杩斿洖
- async HQCSchemeComplete(e) {
- console.log("HQCSchemeRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.hform, {
- HQCSchemeID: data.hmainid,
- HQCSchemeName: data.妫�楠屾柟妗堝悕绉�,
- });
- await this.get_CheckItem();
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- }
- },
- // 宸ュ簭杩斿洖
- async HProcComplete(e) {
- console.log(" HProcRet: ", e);
- for (var key in e["retVal"]) {
- let data = e["retVal"][key];
- Object.assign(this.hform, {
- HProcName: data["宸ュ簭鍚嶇О"],
- HProcID: data["HItemID"],
- });
- await this.$nextTick();
- this.$refs.listPopup.exit();
- // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
- await this.$nextTick();
- this.enablePopupModule = this.PopupModuleNameList[0];
- await this.GetCheckItemID();
- await this.get_ICMOBillStatusList();
- await this.get_QC_TakeSampleCheckBillList();
- }
- },
- async get_QC_TakeSampleCheckBillList() {
- // 鍙栨牱鍗曟煡璇�
- let HProcID = this.hform.HProcID;
- let HProcExchInterId = this.hform.HProcExchInterID;
- let sWhere = "";
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ }
+ },
+ // 妫�楠屼华鍣ㄨ繑鍥�
+ async InspectMentComplete(e) {
+ console.log("InspectInstruMentRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.checkItems[key], {
+ HInspectInstruMentID: data["HItemID"],
+ HInspectInstruMentNumber: data["妫�楠屼华鍣ㄤ唬鐮�"],
+ HInspectInstruMentName: data["妫�楠屼华鍣ㄥ悕绉�"],
+ });
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ }
+ },
+ // 浜у搧浠ｇ爜杩斿洖
+ async MaterComplete(e) {
+ console.log("MaterRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.hform, {
+ HMaterNumber: data["鐗╂枡浠ｇ爜"],
+ HMaterName: data["鐗╂枡鍚嶇О"],
+ HMaterID: data["HItemID"],
+ });
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ this.GetCheckItemID();
+ }
+ },
+ // 浠诲姟鍗曡繑鍥�
+ async ICMOBillComplete(e) {
+ console.log("ICMOBillRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.hform, {
+ HICMOInterID: data.hmainid,
+ HICMOEntryID: data.HEntryID || 1,
+ HICMOBillNo: data.鍗曟嵁鍙�,
+ HMaterNumber: data.浜у搧浠ｇ爜,
+ HMaterName: data.浜у搧鍚嶇О,
+ HMaterID: data.HMaterID,
+ HICMOQty: data.鐢熶骇浠诲姟鍗曟暟閲�,
+ });
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ }
+ },
+ // 娴佽浆鍗¤繑鍥�
+ async ProcExchBillComplete(e) {
+ console.log("ProcExchBillRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.hform, {
+ HProcExchInterID: data.hmainid,
+ HProcExchEntryID: data.hsubid,
+ HProcExchBillNo: data.鍗曟嵁鍙�,
+ });
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ }
+ },
+ // 妫�楠屾柟妗�(涓昏〃)杩斿洖
+ async HQCSchemeComplete(e) {
+ console.log("HQCSchemeRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.hform, {
+ HQCSchemeID: data.hmainid,
+ HQCSchemeName: data.妫�楠屾柟妗堝悕绉�,
+ });
+ await this.get_CheckItem();
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ }
+ },
+ // 宸ュ簭杩斿洖
+ async HProcComplete(e) {
+ console.log(" HProcRet: ", e);
+ for (var key in e["retVal"]) {
+ let data = e["retVal"][key];
+ Object.assign(this.hform, {
+ HProcName: data["宸ュ簭鍚嶇О"],
+ HProcID: data["HItemID"],
+ });
+ await this.$nextTick();
+ this.$refs.listPopup.exit();
+ // 纭繚鍦ㄥ脊绐楃粨鏉熷悗锛屽啀灏嗛〉闈笂鎸傚湪鐨勭粍浠剁疆绌�
+ await this.$nextTick();
+ this.enablePopupModule = this.PopupModuleNameList[0];
+ await this.GetCheckItemID();
+ await this.get_ICMOBillStatusList();
+ await this.get_QC_TakeSampleCheckBillList();
+ }
+ },
+ async get_QC_TakeSampleCheckBillList() {
+ // 鍙栨牱鍗曟煡璇�
+ let HProcID = this.hform.HProcID;
+ let HProcExchInterId = this.hform.HProcExchInterID;
+ let sWhere = "";
- if (HProcID == "0" || HProcID == "") {
- CommonUtils.showTips({
- message: "璇烽�夋嫨宸ュ簭",
- });
- return;
- }
+ if (HProcID == "0" || HProcID == "") {
+ CommonUtils.showTips({
+ message: "璇烽�夋嫨宸ュ簭",
+ });
+ return;
+ }
- sWhere = " and 宸ュ簭娴佽浆鍗′富鍐呯爜='" + HProcExchInterID + "' and HProcID=" + HProcID;
+ sWhere = " and 宸ュ簭娴佽浆鍗′富鍐呯爜='" + HProcExchInterID + "' and HProcID=" + HProcID;
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "//QC_TakeSampleCheckBill/QC_TakeSampleCheckBillMainList",
- data: {
- sWhere: sWhere,
- user: getUserInfo()["Czymc"],
- },
- });
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "//QC_TakeSampleCheckBill/QC_TakeSampleCheckBillMainList",
+ data: {
+ sWhere: sWhere,
+ user: getUserInfo()["Czymc"],
+ },
+ });
- let {
- data,
- count,
- Message
- } = res.data;
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${Message}`,
- });
- }
+ let {
+ data,
+ count,
+ Message
+ } = res.data;
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${Message}`,
+ });
+ }
- this.hform.HTakeSampleCheckBillID = data[0]["hmainid"];
- this.hform.HTakeSampleCheckBillNo = data[0]["鍗曟嵁鍙�"];
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${err}`,
- });
- }
- },
- async get_ICMOBillStatusList() {
- let sWhere = "";
- let HProcID = this.hform.HProcID;
- let HSourceID = this.hform.HSourceID;
- let HProcExchInterId = this.hform.HProcExchInterID;
+ this.hform.HTakeSampleCheckBillID = data[0]["hmainid"];
+ this.hform.HTakeSampleCheckBillNo = data[0]["鍗曟嵁鍙�"];
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鍙栨牱鍗曚俊鎭け璐�: ${err}`,
+ });
+ }
+ },
+ async get_ICMOBillStatusList() {
+ let sWhere = "";
+ let HProcID = this.hform.HProcID;
+ let HSourceID = this.hform.HSourceID;
+ let HProcExchInterId = this.hform.HProcExchInterID;
- if (HProcID != "0") {
- sWhere += " and HProcID=" + HProcID;
- }
- if (HSourceID != "0") {
- sWhere += " and HSourceID=" + HSourceID;
- }
+ if (HProcID != "0") {
+ sWhere += " and HProcID=" + HProcID;
+ }
+ if (HSourceID != "0") {
+ sWhere += " and HSourceID=" + HSourceID;
+ }
- sWhere += " and HSourceInterID=" + HProcExchInterID;
+ sWhere += " and HSourceInterID=" + HProcExchInterID;
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/CheckBill/GetICMOBillStatusList",
- data: {
- sWhere: sWhere,
- user: getUserInfo()["Czymc"],
- },
- });
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/CheckBill/GetICMOBillStatusList",
+ data: {
+ sWhere: sWhere,
+ user: getUserInfo()["Czymc"],
+ },
+ });
- let {
- data,
- count,
- Message
- } = res.data;
- if (count != 1) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${Message}`,
- });
- }
+ let {
+ data,
+ count,
+ Message
+ } = res.data;
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${Message}`,
+ });
+ }
- this.hform.HProcID = data[0]["HProcID"];
- this.hform.HProcName = data[0]["宸ュ簭"];
- this.hform.HSourceID = data[0]["HSourceID"];
- this.hform.HSourceName = data[0]["鐢熶骇璧勬簮"];
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${err}`,
- });
- }
- },
- setInspectValModule(checkItem) {
- console.log("checkItem: ", checkItem);
- if (!checkItem.HAnalysisMethod || !checkItem.HSampleSchemeID) {
- return;
- }
- // 鍖哄垎妫�楠屽�奸〉绛惧拰闈欐�侀〉绛撅紝妫�楠屽�奸〉绛剧殑id浠寮�澶�
- this.$set(this.InspectModules, `_${checkItem.num}`, {
- id: `_${checkItem.num}`,
- checkItemId: checkItem.num,
- });
- console.log(" this.arrayAnalysisMethod: ", checkItem.HAnalysisMethod);
- let analysisMethodName = this.arrayAnalysisMethod.find(
- (e) => e.value == checkItem.HAnalysisMethod
- ).name;
- this.$set(this.subTabs, `_${checkItem.num}`, {
- id: `_${checkItem.num}`,
- name: `${analysisMethodName}-${checkItem.HQCCheckItemName}`,
- });
- },
- InspectValueUpdate(e) {
- console.log("e: ", e);
- let {
- data,
- list
- } = e;
- this.checkItems[data.num] = Object.assign(this.checkItems[data.num], data);
- this.$set(this.InspectValues, `${data.num}`, list);
- },
- // 甯﹀嚭妫�楠岄」鐩�
- async get_CheckItem() {
- // 棣栧厛娓呯┖妫�楠岄」鐩� 鍜� 妫�楠屽��
- this.checkItems = {}
- for (let key in this.subTabs) {
- if (key.substring(1) == "_") {
- this.$delete(this.subTabs, key)
- }
- }
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/Web/GetCheckItemByCheckProjectID_Sec",
- data: {
- CheckProjectID: this.hform.HQCSchemeID || 0,
- HBatchQty: this.hform.HProcExchQty || 0,
- HMaterID: this.hform.HMaterID,
- HBillType: '棣栦欢妫�鏂规'
- },
- });
+ this.hform.HProcID = data[0]["HProcID"];
+ this.hform.HProcName = data[0]["宸ュ簭"];
+ this.hform.HSourceID = data[0]["HSourceID"];
+ this.hform.HSourceName = data[0]["鐢熶骇璧勬簮"];
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鐢熶骇宸ュ崟淇℃伅澶辫触: ${err}`,
+ });
+ }
+ },
+ setInspectValModule(checkItem) {
+ console.log("checkItem: ", checkItem);
+ if (!checkItem.HAnalysisMethod || !checkItem.HSampleSchemeID) {
+ return;
+ }
+ // 鍖哄垎妫�楠屽�奸〉绛惧拰闈欐�侀〉绛撅紝妫�楠屽�奸〉绛剧殑id浠寮�澶�
+ this.$set(this.InspectModules, `_${checkItem.num}`, {
+ id: `_${checkItem.num}`,
+ checkItemId: checkItem.num,
+ });
+ console.log(" this.arrayAnalysisMethod: ", checkItem.HAnalysisMethod);
+ let analysisMethodName = this.arrayAnalysisMethod.find(
+ (e) => e.value == checkItem.HAnalysisMethod
+ ).name;
+ this.$set(this.subTabs, `_${checkItem.num}`, {
+ id: `_${checkItem.num}`,
+ name: `${analysisMethodName}-${checkItem.HQCCheckItemName}`,
+ });
+ },
+ InspectValueUpdate(e) {
+ console.log("e: ", e);
+ let {
+ data,
+ list
+ } = e;
+ this.checkItems[data.num] = Object.assign(this.checkItems[data.num], data);
+ this.$set(this.InspectValues, `${data.num}`, list);
+ },
+ // 甯﹀嚭妫�楠岄」鐩�
+ async get_CheckItem() {
+ // 棣栧厛娓呯┖妫�楠岄」鐩� 鍜� 妫�楠屽��
+ this.checkItems = {}
+ for (let key in this.subTabs) {
+ if (key.substring(1) == "_") {
+ this.$delete(this.subTabs, key)
+ }
+ }
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/Web/GetCheckItemByCheckProjectID_Sec",
+ data: {
+ CheckProjectID: this.hform.HQCSchemeID || 0,
+ HBatchQty: this.hform.HProcExchQty || 0,
+ HMaterID: this.hform.HMaterID,
+ HBillType: '棣栦欢妫�鏂规'
+ },
+ });
- let {
- data,
- count,
- Message
- } = res.data;
+ let {
+ data,
+ count,
+ Message
+ } = res.data;
- if (count == 1) {
- for (var i = 0; i < data.length; i++) {
- let checkItem = {
- HQCCheckItemID: data[i]["HQCCheckItemID"],
- HQCCheckItemNumber: data[i]["妫�楠岄」鐩唬鐮�"],
- HQCCheckItemName: data[i]["妫�楠岄」鐩�"],
- HInspectInstruMentID: data[i]["HInspectInstruMentID"],
- HInspectInstruMentNumber: data[i]["妫�楠屼华鍣ㄤ唬鐮�"],
- HInspectInstruMentName: data[i]["妫�楠屼华鍣�"],
- HQCStd: data[i]["HQCStd"],
- HUnit: data[i]["鍗曚綅鍚嶇О"],
- HQCNote: "",
- HAnalysisMethod: data[i]["鍒嗘瀽鏂规硶"],
- HResult: data[i]["HResult"],
- HMax: "",
- HMin: "",
- HAvg: "",
- HRemark: "",
- HKeyInspect: data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false,
- HStatus: 0,
- HSampleSchemeID: data[i]["HSampleSchemeID"],
- HUnitID: data[i]["HUnitID"],
- HInspectVal: "",
- HTargetVal: "",
- HUpLimit: data[i].涓婇檺鍊�,
- HDownLimit: data[i].涓嬮檺鍊�,
- HUpOffSet: "",
- HDownOffSet: "",
- HSampleDamageQty: "0",
- HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
- HSampleQty: data[i].鏍锋湰閲�,
- HAcceptQty: data[i].鍏佽鏁�,
- HInspectionLevel: data[i].妫�楠屾按骞�,
- HRejectQty: data[i].鎷掔粷鏁�,
- HStrictness: data[i].涓ユ牸搴�,
- HSampleUnRightQty: 0,
- HAQL: data[i].AQL,
- HSamplingType: data[i].鎶芥牱绫诲瀷,
- HCompareSymbol: data[i].姣旇緝绗�,
- HTargetVal: data[i].鐩爣鍊� || 0,
- };
+ if (count == 1) {
+ for (var i = 0; i < data.length; i++) {
+ let checkItem = {
+ HQCCheckItemID: data[i]["HQCCheckItemID"],
+ HQCCheckItemNumber: data[i]["妫�楠岄」鐩唬鐮�"],
+ HQCCheckItemName: data[i]["妫�楠岄」鐩�"],
+ HInspectInstruMentID: data[i]["HInspectInstruMentID"],
+ HInspectInstruMentNumber: data[i]["妫�楠屼华鍣ㄤ唬鐮�"],
+ HInspectInstruMentName: data[i]["妫�楠屼华鍣�"],
+ HQCStd: data[i]["HQCStd"],
+ HUnit: data[i]["鍗曚綅鍚嶇О"],
+ HQCNote: "",
+ HAnalysisMethod: data[i]["鍒嗘瀽鏂规硶"],
+ HResult: data[i]["HResult"],
+ HMax: "",
+ HMin: "",
+ HAvg: "",
+ HRemark: "",
+ HKeyInspect: data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false,
+ HStatus: 0,
+ HSampleSchemeID: data[i]["HSampleSchemeID"],
+ HUnitID: data[i]["HUnitID"],
+ HInspectVal: "",
+ HTargetVal: "",
+ HUpLimit: data[i].涓婇檺鍊�,
+ HDownLimit: data[i].涓嬮檺鍊�,
+ HUpOffSet: "",
+ HDownOffSet: "",
+ HSampleDamageQty: "0",
+ HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
+ HSampleQty: data[i].鏍锋湰閲�,
+ HAcceptQty: data[i].鍏佽鏁�,
+ HInspectionLevel: data[i].妫�楠屾按骞�,
+ HRejectQty: data[i].鎷掔粷鏁�,
+ HStrictness: data[i].涓ユ牸搴�,
+ HSampleUnRightQty: 0,
+ HAQL: data[i].AQL,
+ HSamplingType: data[i].鎶芥牱绫诲瀷,
+ HCompareSymbol: data[i].姣旇緝绗�,
+ HTargetVal: data[i].鐩爣鍊� || 0,
+ };
- this.addCheckItem(checkItem);
- }
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${Message} `,
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${err} `,
- });
- }
- },
- async getMaxBillNo() {
- try {
- let res = await CommonUtils.doRequest2Sync({
- url: "/Web/GetMAXNum",
- data: {
- HBillType: "7505",
- },
- });
+ this.addCheckItem(checkItem);
+ }
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${Message} `,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇妫�楠岄」鐩俊鎭け璐�: ${err} `,
+ });
+ }
+ },
+ async getMaxBillNo() {
+ try {
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/Web/GetMAXNum",
+ data: {
+ HBillType: "7505",
+ },
+ });
- if (!res) {
- return;
- }
+ if (!res) {
+ return;
+ }
- let {
- data,
- Message,
- count
- } = res.data;
- if (count == 1) {
- this.hform.HInterID = data[0].HInterID;
- this.hform.HBillNo = data[0].HBillNo;
- } else {
- throw Message;
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: "鑾峰彇鍗曟嵁鍙峰紓甯�: " + err,
- });
- }
- },
- // 妫�楠屽�艰繑鍥炲��
- InspectValueComplete(e) {
- console.log("e: ", e);
- let key = e.num;
- e.HStatus = e.HStatus ? 1 : 0
- if (e.HResult2 == '') {
- e.HResult2 = this.checkItems[key].HResult
- }
- Object.assign(this.checkItems[key], e);
- this.checkItems[key].HInspectResultToSee = this.checkItems[key].HResult2;
- this.checkItems[key].HResult = this.checkItems[key].HResult2 == '鍚堟牸' ? 1 : 2;
+ let {
+ data,
+ Message,
+ count
+ } = res.data;
+ if (count == 1) {
+ this.hform.HInterID = data[0].HInterID;
+ this.hform.HBillNo = data[0].HBillNo;
+ } else {
+ throw Message;
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: "鑾峰彇鍗曟嵁鍙峰紓甯�: " + err,
+ });
+ }
+ },
+ // 妫�楠屽�艰繑鍥炲��
+ InspectValueComplete(e) {
+ console.log("e: ", e);
+ let key = e.num;
+ e.HStatus = e.HStatus ? 1 : 0
+ if (e.HResult2 == '') {
+ e.HResult2 = this.checkItems[key].HResult
+ }
+ Object.assign(this.checkItems[key], e);
+ this.checkItems[key].HInspectResultToSee = this.checkItems[key].HResult2;
+ this.checkItems[key].HResult = this.checkItems[key].HResult2 == '鍚堟牸' ? 1 : 2;
- this.HCheckLastResult();
+ this.HCheckLastResult();
- },
- checkSubmitValidate() {
- // if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
- // CommonUtils.showTips({
- // message: "浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�",
- // });
- // return false;
- // }
+ },
+ checkSubmitValidate() {
+ // if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
+ // CommonUtils.showTips({
+ // message: "浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�",
+ // });
+ // return false;
+ // }
- if (this.hform.HFirstCheckEmp == 0) {
- CommonUtils.showTips({
- message: "妫�楠屽憳鏈�夋嫨锛�",
- });
- return false;
- }
- if (this.hform.HCheckQty == 0) {
- CommonUtils.showTips({
- message: "妫�楠屾暟閲忎笉寰椾负0锛�",
- });
- return false;
- }
+ if (this.hform.HFirstCheckEmp == 0) {
+ CommonUtils.showTips({
+ message: "妫�楠屽憳鏈�夋嫨锛�",
+ });
+ return false;
+ }
+ if (this.hform.HCheckQty == 0) {
+ CommonUtils.showTips({
+ message: "妫�楠屾暟閲忎笉寰椾负0锛�",
+ });
+ return false;
+ }
- for (let key in this.checkItems) {
- if (!this.checkItems[key].HQCCheckItemID) {
- CommonUtils.showTips({
- message: `绗�${this.checkItems[key].num}琛屾楠岄」鐩笉鑳戒负绌�!`,
- });
- return false;
- }
+ for (let key in this.checkItems) {
+ if (!this.checkItems[key].HQCCheckItemID) {
+ CommonUtils.showTips({
+ message: `绗�${this.checkItems[key].num}琛屾楠岄」鐩笉鑳戒负绌�!`,
+ });
+ return false;
+ }
- if (
- this.checkItems[key].HSampleSchemeID == "" ||
- this.checkItems[key].HSampleSchemeID == null
- ) {
- this.checkItems[key].HSampleSchemeID = 0;
- }
- if (
- this.checkItems[key].HSampleQty == "" ||
- this.checkItems[key].HSampleQty == null
- ) {
- this.checkItems[key].HSampleQty = 0;
- }
- if (
- this.checkItems[key].HSampleDamageQty == "" ||
- this.checkItems[key].HSampleDamageQty == null
- ) {
- this.checkItems[key].HSampleDamageQty = 0;
- }
- if (
- this.checkItems[key].HAcceptQty == "" ||
- this.checkItems[key].HAcceptQty == null
- ) {
- this.checkItems[key].HAcceptQty = 0;
- }
- if (
- this.checkItems[key].HRejectQty == "" ||
- this.checkItems[key].HRejectQty == null
- ) {
- this.checkItems[key].HRejectQty = 0;
- }
- if (
- this.checkItems[key].HSampleUnRightQty == "" ||
- this.checkItems[key].HSampleUnRightQty == 0
- ) {
- this.checkItems[key].HSampleUnRightQty = 0;
- }
- if (this.checkItems[key].HUnitID == "") {
- this.checkItems[key].HUnitID = 0;
- }
- }
+ if (
+ this.checkItems[key].HSampleSchemeID == "" ||
+ this.checkItems[key].HSampleSchemeID == null
+ ) {
+ this.checkItems[key].HSampleSchemeID = 0;
+ }
+ if (
+ this.checkItems[key].HSampleQty == "" ||
+ this.checkItems[key].HSampleQty == null
+ ) {
+ this.checkItems[key].HSampleQty = 0;
+ }
+ if (
+ this.checkItems[key].HSampleDamageQty == "" ||
+ this.checkItems[key].HSampleDamageQty == null
+ ) {
+ this.checkItems[key].HSampleDamageQty = 0;
+ }
+ if (
+ this.checkItems[key].HAcceptQty == "" ||
+ this.checkItems[key].HAcceptQty == null
+ ) {
+ this.checkItems[key].HAcceptQty = 0;
+ }
+ if (
+ this.checkItems[key].HRejectQty == "" ||
+ this.checkItems[key].HRejectQty == null
+ ) {
+ this.checkItems[key].HRejectQty = 0;
+ }
+ if (
+ this.checkItems[key].HSampleUnRightQty == "" ||
+ this.checkItems[key].HSampleUnRightQty == 0
+ ) {
+ this.checkItems[key].HSampleUnRightQty = 0;
+ }
+ if (this.checkItems[key].HUnitID == "") {
+ this.checkItems[key].HUnitID = 0;
+ }
+ }
- return true;
- },
- async submit() {
- if (!this.checkSubmitValidate()) {
- return;
- }
- try {
- console.log('this.$refs: ', this.$refs);
- // 妫�鏌ユ槸鍚︽湁鏈垏鎹㈢殑妫�楠屽�兼ā鍧�(鏄惁鍖呭惈set_SaveValue鏂规硶),濡傛灉鏈夛紝鍒欒繍琛屼竴娆′繚瀛樻楠屽�肩殑鏂规硶锛屾牴鎹楠屽�兼槸鍚︿繚瀛樻垚鍔熷啀鎵ц涓嬩竴姝�
- if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules
- .length > 0) {
- // 鍔犺浇鏈夋楠屽�兼ā鍧�
- await this.$refs.InspectValueModules[0].set_SaveValue();
- this.InspectValues[0] = this.$refs.InspectValueModules[0].InSpectValues;
- await this.InspectValueComplete(this.$refs.InspectValueModules[0].checkData)
- }
- let InspectValuesTrans = [];
- let HInterID = this.hform.HInterID;
- for (let key in this.InspectValues) {
- let HEntryID = key;
+ return true;
+ },
+ async submit() {
+ if (!this.checkSubmitValidate()) {
+ return;
+ }
+ try {
+ console.log('this.$refs: ', this.$refs);
+ // 妫�鏌ユ槸鍚︽湁鏈垏鎹㈢殑妫�楠屽�兼ā鍧�(鏄惁鍖呭惈set_SaveValue鏂规硶),濡傛灉鏈夛紝鍒欒繍琛屼竴娆′繚瀛樻楠屽�肩殑鏂规硶锛屾牴鎹楠屽�兼槸鍚︿繚瀛樻垚鍔熷啀鎵ц涓嬩竴姝�
+ if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules
+ .length > 0) {
+ // 鍔犺浇鏈夋楠屽�兼ā鍧�
+ await this.$refs.InspectValueModules[0].set_SaveValue();
+ this.InspectValues[0] = this.$refs.InspectValueModules[0].InSpectValues;
+ await this.InspectValueComplete(this.$refs.InspectValueModules[0].checkData)
+ }
+ let InspectValuesTrans = [];
+ let HInterID = this.hform.HInterID;
+ for (let key in this.InspectValues) {
+ let HEntryID = key;
- InspectValuesTrans.push(
- `${JSON.stringify(this.InspectValues[key])}`
- );
- }
- let checkItemsArray = [];
- for (var key in this.checkItems) {
- let checkItem = JSON.parse(JSON.stringify(this.checkItems[key]))
- delete checkItem.data
- checkItemsArray.push(checkItem);
- }
- console.log('checkItemsArray: ', checkItemsArray);
- let sMainSub = `${JSON.stringify(this.hform)};${JSON.stringify(checkItemsArray)};${this.operationType};${getUserInfo()["Czymc"]};${InspectValuesTrans[0]}`;
- console.log("this.checkItems: ", this.checkItems);
+ InspectValuesTrans.push(
+ `${JSON.stringify(this.InspectValues[key])}`
+ );
+ }
+ let checkItemsArray = [];
+ for (var key in this.checkItems) {
+ let checkItem = JSON.parse(JSON.stringify(this.checkItems[key]))
+ delete checkItem.data
+ checkItemsArray.push(checkItem);
+ }
+ console.log('checkItemsArray: ', checkItemsArray);
+ let sMainSub =
+ `${JSON.stringify(this.hform)};${JSON.stringify(checkItemsArray)};${this.operationType};${getUserInfo()["Czymc"]};${InspectValuesTrans[0]}`;
+ console.log("this.checkItems: ", this.checkItems);
- let res = await CommonUtils.doRequest2Sync({
- url: "/QC_FirstPieceCheckBill/set_SaveBill",
- data: {
- sMainSub: sMainSub,
- },
- method: "POST",
- });
+ let res = await CommonUtils.doRequest2Sync({
+ url: "/QC_FirstPieceCheckBill/set_SaveBill",
+ data: {
+ sMainSub: sMainSub,
+ },
+ method: "POST",
+ });
- if (!res) {
- return;
- }
+ if (!res) {
+ return;
+ }
- let {
- count,
- Message,
- data
- } = res.data;
- if (count == 1) {
- uni.showModal({
- title: "鎻愮ず",
- content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
- success: (res) => {
- if (res.confirm) {
- console.log("鐢ㄦ埛鐐瑰嚮纭畾");
- uni.redirectTo({
- url: "/pages/ZLGL/shoujianjianyan/form?operationType=1",
- });
- } else if (res.cancel) {
- console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
- setTimeout(() => {
- uni.navigateBack();
- }, 50)
- }
- },
- });
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `棣栦欢妫�楠屽崟淇濆瓨閿欒: ${Message}`,
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `棣栦欢妫�楠屽崟淇濆瓨閿欒: ${err}`,
- });
- }
- },
- addNew() {
- uni.redirectTo({
- url: "/pages/ZLGL/shoujianjianyan/firstCheckBill?operationType=1",
- });
- },
- goBack() {
- uni.navigateBack();
- },
- async RoadBillMain() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBill_Edit",
- data: {
- sWhere: ` and hmainid=${this.hform.HInterID}`,
- user: getUserInfo()["Czymc"],
- },
- });
+ let {
+ count,
+ Message,
+ data,
+ Verify = 'N'
+ } = res.data;
+ if (count == 1) {
+ // 鍒ゆ柇鏄惁鑷姩瀹℃牳
+ if (Verify == 'Y') {
+ let AuditSuccess = await this.auditBill()
+ if (AuditSuccess) {
+ console.log("瀹℃牳鎴愬姛");
+ uni.showModal({
+ title: "鎻愮ず",
+ content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
+ success: (res) => {
+ if (res.confirm) {
+ console.log("鐢ㄦ埛鐐瑰嚮纭畾");
+ uni.redirectTo({
+ url: "/pages/ZLGL/shoujianjianyan/form?operationType=1",
+ });
+ } else if (res.cancel) {
+ console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ }
+ },
+ });
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: '瀹℃牳澶辫触'
+ })
+ }
+ } else {
+ uni.showModal({
+ title: "鎻愮ず",
+ content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
+ success: (res) => {
+ if (res.confirm) {
+ console.log("鐢ㄦ埛鐐瑰嚮纭畾");
+ uni.redirectTo({
+ url: "/pages/ZLGL/shoujianjianyan/form?operationType=1",
+ });
+ } else if (res.cancel) {
+ console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ }
+ },
+ });
+ }
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `棣栦欢妫�楠屽崟淇濆瓨閿欒: ${Message}`,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `棣栦欢妫�楠屽崟淇濆瓨閿欒: ${err}`,
+ });
+ }
+ },
+ async auditBill() {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/QC_ValueTable/QC_FirstPieceCheckValue",
+ data: {
+ HInterID: this.hform.HInterID,
+ IsAudit: 0,
+ CurUserName: getUserInfo()['Czymc']
+ }
+ })
- let {
- data,
- count,
- Message
- } = res.data;
+ if (res.data.count == 1) {
+ return true
+ } else {
+ return false
+ }
+ },
+ addNew() {
+ uni.redirectTo({
+ url: "/pages/ZLGL/shoujianjianyan/firstCheckBill?operationType=1",
+ });
+ },
+ goBack() {
+ uni.navigateBack();
+ },
+ async RoadBillMain() {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBill_Edit",
+ data: {
+ sWhere: ` and hmainid=${this.hform.HInterID}`,
+ user: getUserInfo()["Czymc"],
+ },
+ });
- if (count == 1) {
- console.log("RoadBillMain: : ", data);
- Object.assign(this.hform, {
- HInterID: data[0].hmainid,
- HBillNo: data[0].鍗曟嵁鍙�,
- HDate: dayjs(data[0].鏃ユ湡).format("YYYY-MM-DD"),
- HSourceID: data[0].HSourceID,
- HSourceName: data[0].鐢熶骇璧勬簮鍚嶇О,
- HICMOBillNo: data[0].浠诲姟鍗曞彿,
- HICMOQty: data[0].浠诲姟鍗曟暟閲�,
- HICMOInterID: data[0].HICMOInterID,
- HICMOEntryID: data[0].HICMOEntryID || 1,
- HMaterID: data[0].HMaterID,
- HMaterName: data[0].鐗╂枡鍚嶇О,
- HMaterNumber: data[0].鐗╂枡浠ｇ爜,
- HProcID: data[0].HProcID,
- HProcName: data[0].HProcName,
- HProcExchQty: data[0].HProcExchQty || 0,
- HProcExchBillNo: data[0].HProcExchBillNo,
- HProcExchInterID: data[0].HProcExchInterID,
- HProcExchEntryID: data[0].HProcExchEntryID || 0,
- HFirstCheckEmp: data[0].HFirstCheckEmp,
- HFirstCheckEmpName: data[0].璐ㄦ鍛樺悕绉�,
- HQCSchemeID: data[0].妫�楠屾柟妗圛D,
- HQCSchemeName: data[0].妫�楠屾柟妗堝悕绉�,
- HRemark: data[0].琛ㄥご澶囨敞,
- HMaker: data[0].鍒跺崟浜�,
- HMakeDate: data[0].鍒跺崟鏃ユ湡,
- HChecker: data[0].瀹℃牳浜�,
- HCheckDate: data[0].瀹℃牳鏃ユ湡,
- HCloseMan: data[0].鍏抽棴浜�,
- HCloseDate: data[0].鍏抽棴鏃ユ湡,
- HUpDateDate: data[0].淇敼鏃ユ湡,
- HDeleteDate: data[0].浣滃簾鏃ユ湡,
- HSampleSchemeID: data[0].HSampleSchemeID,
- HSampleSchemeName: data[0].鎶芥牱鏂规鍚嶇О,
- HSampleQty: data[0].鏍锋湰閲�,
- HSampleQty2: data[0].鏍锋湰閲�,
- HSampleDamageQty: data[0].鏍锋湰鐮村潖鏁�,
- HSamplingType: data[0].鎶芥牱绫诲瀷,
- HAcceptQty: data[0].鍏佽鏁�,
- HInspectionLevel: data[0].妫�楠屾按骞�,
- HRejectQty: data[0].鎷掔粷鏁�,
- HStrictness: data[0].涓ユ牸搴�,
- HSampleUnRightQty: data[0].鏍锋湰涓嶅悎鏍兼暟 || 0,
- HSampleUnRightQty2: data[0].鏍锋湰涓嶅悎鏍兼暟,
- HAQL: data[0].AQL,
- HUnitID: data[0].HUnitID,
- HUnit: data[0].鍗曚綅,
- HInspectValB: data[0].妫�娴嬪�煎熀纭�璧勬枡,
- HInspectVal: data[0].妫�娴嬪��,
- HTargetValB: data[0].鐩爣鍊煎熀纭�璧勬枡,
- HTargetVal: data[0].鐩爣鍊�,
- HUpLimit: data[0].涓婇檺鍊�,
- HDownLimit: data[0].涓嬮檺鍊�,
- HUpOffSet: data[0].涓婂亸宸�,
- HDownOffSet: data[0].涓嬪亸宸�,
- HEntryID: data[0].hsubid,
- HQCCheckItemName: data[0].妫�楠岄」鐩悕绉�,
- HQCCheckItemID: data[0].HQCCheckItemID,
- HShiftsID: data[0].HShiftsID,
- HShiftsName: data[0].鐝鍚嶇О,
- HErrTreatment: data[0].寮傚父涓存椂澶勭悊鏂规,
- HBatchNo: data[0].鎵瑰彿,
- HLastResult: data[0].鍒ゅ畾缁撹 == "鍚堟牸" ? true : false,
- HTakeSampleCheckBillID: data[0].HTakeSampleCheckBillID,
- HTakeSampleCheckBillNo: data[0].HTakeSampleCheckBillNo,
- HAnalysisMethod: function() {
- if (data[0].HAnalysisMethod == 1) {
- return '瀹氭�ф楠�'
- } else if (data[0].HAnalysisMethod == 2) {
- return '瀹氶噺妫�楠�'
- } else {
- return '鍏朵粬妫�楠�'
- }
- }(),
- });
+ let {
+ data,
+ count,
+ Message
+ } = res.data;
- for (let i = 0; i < data.length; i++) {
- this.addCheckItem({
- HQCCheckItemID: data[i].HQCCheckItemID,
- HQCCheckItemNumber: data[i].妫�楠岄」鐩唬鐮�,
- HQCCheckItemName: data[i].妫�楠岄」鐩悕绉�,
- HInspectInstruMentID: data[i].HInspectInstruMentID,
- HInspectInstruMentNumber: data[i].妫�楠屼华鍣ㄤ唬鐮�,
- HInspectInstruMentName: data[i].妫�楠屼华鍣ㄥ悕绉�,
- HQCStd: data[i].妫�楠屾爣鍑�,
- HUnit: data[i].鍗曚綅鍚嶇О,
- HQCNote: data[i].妫�楠岃褰�,
- HResult: data[i].缁撹 == "鍚堟牸" ? 1 : 0,
- HMax: data[i].鏈�澶у��,
- HMin: data[i].鏈�灏忓��,
- HAvg: data[i].骞冲潎鍊�,
- HRemark: data[i].琛ㄤ綋澶囨敞,
- HAnalysisMethod: data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ?
- 1 : data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ?
- 2 : 3,
- HKeyInspect: data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
- HSampleSchemeID: data[i].HSampleSchemeID,
- HUnitID: data[i].HUnitID,
- HInspectVal: data[i].妫�娴嬪��,
- HTargetVal: data[i].鐩爣鍊�,
- HUpLimit: data[i].涓婇檺鍊�,
- HDownLimit: data[i].涓嬮檺鍊�,
- HUpOffSet: data[i].涓婂亸宸�,
- HDownOffSet: data[i].涓嬪亸宸�,
- HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
- HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
- HSampleQty: data[i].鏍锋湰閲�,
- HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
- HAcceptQty: data[i].鍏佽鏁�,
- HInspectionLevel: 0,
- HRejectQty: data[i].鎷掔粷鏁�,
- HStrictness: 0,
- HSampleUnRightQty: data[i].鏍锋湰涓嶅悎鏍兼暟,
- HAQL: data[i].AQL,
- HSamplingType: 0,
- HSamplingType: data[i].鎶芥牱绫诲瀷,
- HStrictness: data[i].涓ユ牸搴�,
- HInspectResultToSee: data[i].妫�楠岀粨鏋�
- });
- }
+ if (count == 1) {
+ console.log("RoadBillMain: : ", data);
+ Object.assign(this.hform, {
+ HInterID: data[0].hmainid,
+ HBillNo: data[0].鍗曟嵁鍙�,
+ HDate: dayjs(data[0].鏃ユ湡).format("YYYY-MM-DD"),
+ HSourceID: data[0].HSourceID,
+ HSourceName: data[0].鐢熶骇璧勬簮鍚嶇О,
+ HICMOBillNo: data[0].浠诲姟鍗曞彿,
+ HICMOQty: data[0].浠诲姟鍗曟暟閲�,
+ HICMOInterID: data[0].HICMOInterID,
+ HICMOEntryID: data[0].HICMOEntryID || 1,
+ HMaterID: data[0].HMaterID,
+ HMaterName: data[0].鐗╂枡鍚嶇О,
+ HMaterNumber: data[0].鐗╂枡浠ｇ爜,
+ HProcID: data[0].HProcID,
+ HProcName: data[0].HProcName,
+ HProcExchQty: data[0].HProcExchQty || 0,
+ HProcExchBillNo: data[0].HProcExchBillNo,
+ HProcExchInterID: data[0].HProcExchInterID,
+ HProcExchEntryID: data[0].HProcExchEntryID || 0,
+ HFirstCheckEmp: data[0].HFirstCheckEmp,
+ HFirstCheckEmpName: data[0].璐ㄦ鍛樺悕绉�,
+ HQCSchemeID: data[0].妫�楠屾柟妗圛D,
+ HQCSchemeName: data[0].妫�楠屾柟妗堝悕绉�,
+ HRemark: data[0].琛ㄥご澶囨敞,
+ HMaker: data[0].鍒跺崟浜�,
+ HMakeDate: data[0].鍒跺崟鏃ユ湡,
+ HChecker: data[0].瀹℃牳浜�,
+ HCheckDate: data[0].瀹℃牳鏃ユ湡,
+ HCloseMan: data[0].鍏抽棴浜�,
+ HCloseDate: data[0].鍏抽棴鏃ユ湡,
+ HUpDateDate: data[0].淇敼鏃ユ湡,
+ HDeleteDate: data[0].浣滃簾鏃ユ湡,
+ HSampleSchemeID: data[0].HSampleSchemeID,
+ HSampleSchemeName: data[0].鎶芥牱鏂规鍚嶇О,
+ HSampleQty: data[0].鏍锋湰閲�,
+ HSampleQty2: data[0].鏍锋湰閲�,
+ HSampleDamageQty: data[0].鏍锋湰鐮村潖鏁�,
+ HSamplingType: data[0].鎶芥牱绫诲瀷,
+ HAcceptQty: data[0].鍏佽鏁�,
+ HInspectionLevel: data[0].妫�楠屾按骞�,
+ HRejectQty: data[0].鎷掔粷鏁�,
+ HStrictness: data[0].涓ユ牸搴�,
+ HSampleUnRightQty: data[0].鏍锋湰涓嶅悎鏍兼暟 || 0,
+ HSampleUnRightQty2: data[0].鏍锋湰涓嶅悎鏍兼暟,
+ HAQL: data[0].AQL,
+ HUnitID: data[0].HUnitID,
+ HUnit: data[0].鍗曚綅,
+ HInspectValB: data[0].妫�娴嬪�煎熀纭�璧勬枡,
+ HInspectVal: data[0].妫�娴嬪��,
+ HTargetValB: data[0].鐩爣鍊煎熀纭�璧勬枡,
+ HTargetVal: data[0].鐩爣鍊�,
+ HUpLimit: data[0].涓婇檺鍊�,
+ HDownLimit: data[0].涓嬮檺鍊�,
+ HUpOffSet: data[0].涓婂亸宸�,
+ HDownOffSet: data[0].涓嬪亸宸�,
+ HEntryID: data[0].hsubid,
+ HQCCheckItemName: data[0].妫�楠岄」鐩悕绉�,
+ HQCCheckItemID: data[0].HQCCheckItemID,
+ HShiftsID: data[0].HShiftsID,
+ HShiftsName: data[0].鐝鍚嶇О,
+ HErrTreatment: data[0].寮傚父涓存椂澶勭悊鏂规,
+ HBatchNo: data[0].鎵瑰彿,
+ HLastResult: data[0].鍒ゅ畾缁撹 == "鍚堟牸" ? true : false,
+ HTakeSampleCheckBillID: data[0].HTakeSampleCheckBillID,
+ HTakeSampleCheckBillNo: data[0].HTakeSampleCheckBillNo,
+ HAnalysisMethod: function() {
+ if (data[0].HAnalysisMethod == 1) {
+ return '瀹氭�ф楠�'
+ } else if (data[0].HAnalysisMethod == 2) {
+ return '瀹氶噺妫�楠�'
+ } else {
+ return '鍏朵粬妫�楠�'
+ }
+ }(),
+ });
- this.hasSourceBill = true
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍔犺浇鍗曟嵁澶辫触: ${Message}`,
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍔犺浇鍗曟嵁澶辫触: ${err}`,
- });
- }
- },
- },
- async onLoad(e) {
- this.operationType = e.operationType || 1;
- if (this.operationType == 1) {
- await this.getMaxBillNo();
- } else if (this.operationType == 2) {
- //鏈夋簮鍗曚笅鎺�
- await this.getMaxBillNo();
-
- if(e.HSouceBillType=="7521"){
- if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
- this.HSourceBillType = "鍙栨牱鍗�"; // 鏄剧ず鍚嶇О
- this.hform.HSourceBillType = "7521"; // 瀵瑰簲鐨勫��
+ for (let i = 0; i < data.length; i++) {
+ this.addCheckItem({
+ HQCCheckItemID: data[i].HQCCheckItemID,
+ HQCCheckItemNumber: data[i].妫�楠岄」鐩唬鐮�,
+ HQCCheckItemName: data[i].妫�楠岄」鐩悕绉�,
+ HInspectInstruMentID: data[i].HInspectInstruMentID,
+ HInspectInstruMentNumber: data[i].妫�楠屼华鍣ㄤ唬鐮�,
+ HInspectInstruMentName: data[i].妫�楠屼华鍣ㄥ悕绉�,
+ HQCStd: data[i].妫�楠屾爣鍑�,
+ HUnit: data[i].鍗曚綅鍚嶇О,
+ HQCNote: data[i].妫�楠岃褰�,
+ HResult: data[i].缁撹 == "鍚堟牸" ? 1 : 0,
+ HMax: data[i].鏈�澶у��,
+ HMin: data[i].鏈�灏忓��,
+ HAvg: data[i].骞冲潎鍊�,
+ HRemark: data[i].琛ㄤ綋澶囨敞,
+ HAnalysisMethod: data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ?
+ 1 : data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ?
+ 2 : 3,
+ HKeyInspect: data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
+ HSampleSchemeID: data[i].HSampleSchemeID,
+ HUnitID: data[i].HUnitID,
+ HInspectVal: data[i].妫�娴嬪��,
+ HTargetVal: data[i].鐩爣鍊�,
+ HUpLimit: data[i].涓婇檺鍊�,
+ HDownLimit: data[i].涓嬮檺鍊�,
+ HUpOffSet: data[i].涓婂亸宸�,
+ HDownOffSet: data[i].涓嬪亸宸�,
+ HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
+ HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
+ HSampleQty: data[i].鏍锋湰閲�,
+ HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
+ HAcceptQty: data[i].鍏佽鏁�,
+ HInspectionLevel: 0,
+ HRejectQty: data[i].鎷掔粷鏁�,
+ HStrictness: 0,
+ HSampleUnRightQty: data[i].鏍锋湰涓嶅悎鏍兼暟,
+ HAQL: data[i].AQL,
+ HSamplingType: 0,
+ HSamplingType: data[i].鎶芥牱绫诲瀷,
+ HStrictness: data[i].涓ユ牸搴�,
+ HInspectResultToSee: data[i].妫�楠岀粨鏋�
+ });
+ }
+
+ this.hasSourceBill = true
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍔犺浇鍗曟嵁澶辫触: ${Message}`,
+ });
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鍔犺浇鍗曟嵁澶辫触: ${err}`,
+ });
+ }
+ },
+ },
+ async onLoad(e) {
+ this.operationType = e.operationType || 1;
+ if (this.operationType == 1) {
+ await this.getMaxBillNo();
+ } else if (this.operationType == 2) {
+ //鏈夋簮鍗曚笅鎺�
+ await this.getMaxBillNo();
+
+ if (e.HSouceBillType == "7521") {
+ if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
+ this.HSourceBillType = "鍙栨牱鍗�"; // 鏄剧ず鍚嶇О
+ this.hform.HSourceBillType = "7521"; // 瀵瑰簲鐨勫��
this.hform.HSourceBillNo = e.HBillNo
}
-
- this.hform.HTakeSampleCheckBillNo=e.HBillNo;
- this.hform.HTakeSampleCheckBillID=e.linterid;
- //鍙栨牱鍗曟煡璇㈡暟鎹�
- await this.LoadingInformation_TakeSampleCheckBill(e.linterid);
- }
- } else if (this.operationType == 3) {
- this.hform.HInterID = e.linterid || 0;
- await this.RoadBillMain();
- }
- await this.InitHSource();
- await this.InitHWorkShift();
- await this.InitHEmp();
- await this.loadCache();
- },
- };
+ this.hform.HTakeSampleCheckBillNo = e.HBillNo;
+ this.hform.HTakeSampleCheckBillID = e.linterid;
+ //鍙栨牱鍗曟煡璇㈡暟鎹�
+ await this.LoadingInformation_TakeSampleCheckBill(e.linterid);
+ }
+ } else if (this.operationType == 3) {
+ this.hform.HInterID = e.linterid || 0;
+ await this.RoadBillMain();
+ }
+
+ await this.InitHSource();
+ await this.InitHWorkShift();
+ await this.InitHEmp();
+ await this.loadCache();
+ },
+ };
</script>
<style lang="scss" scoped>
- input {
- width: inherit;
- font-size: 26rpx;
- }
+ input {
+ width: inherit;
+ font-size: 26rpx;
+ }
- .uni-input {
- padding: 0;
- }
+ .uni-input {
+ padding: 0;
+ }
- .bill-main-tabs,
- .bill-sub-tabs {
- box-sizing: border-box;
- width: 730rpx;
- display: flex;
- flex-direction: row;
- flex-wrap: nowrap;
- gap: 20rpx;
- flex-shrink: 0;
- overflow-x: auto;
- border-bottom: 1px solid #ddd;
- padding: 20rpx 10rpx;
- white-space: nowrap;
+ .bill-main-tabs,
+ .bill-sub-tabs {
+ box-sizing: border-box;
+ width: 730rpx;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: nowrap;
+ gap: 20rpx;
+ flex-shrink: 0;
+ overflow-x: auto;
+ border-bottom: 1px solid #ddd;
+ padding: 20rpx 10rpx;
+ white-space: nowrap;
- view {
- width: auto;
- font-size: 26rpx;
- color: #555;
- text-align: center;
- padding: 16rpx 0;
- }
+ view {
+ width: auto;
+ font-size: 26rpx;
+ color: #555;
+ text-align: center;
+ padding: 16rpx 0;
+ }
- .selected {
- color: #3a78ff;
- font-weight: bold;
- border-bottom: 3px solid #3a78ff;
- }
- }
+ .selected {
+ color: #3a78ff;
+ font-weight: bold;
+ border-bottom: 3px solid #3a78ff;
+ }
+ }
- .bill-main-content,
- .bill-sub-content {
- box-sizing: border-box;
- padding: 0 30rpx 0 30rpx;
- display: flex;
- flex-direction: column;
+ .bill-main-content,
+ .bill-sub-content {
+ box-sizing: border-box;
+ padding: 0 30rpx 0 30rpx;
+ display: flex;
+ flex-direction: column;
- .form-item {
- width: 100%;
- display: flex;
- align-items: center;
- font-size: 26rpx;
- padding: 6rpx 0;
+ .form-item {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ font-size: 26rpx;
+ padding: 6rpx 0;
- .left {
- width: 208rpx;
+ .left {
+ width: 208rpx;
- text {
- color: red;
- font-weight: bold;
- }
- }
+ text {
+ color: red;
+ font-weight: bold;
+ }
+ }
- .right {
- // width: 450rpx;
- padding: 8rpx 20rpx;
- font-size: 26rpx;
- flex: 1;
- border-radius: 22rpx;
- border: 1px solid #acacac;
+ .right {
+ // width: 450rpx;
+ padding: 8rpx 20rpx;
+ font-size: 26rpx;
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
- .uni-combox {
- padding: 0;
- height: auto;
+ .uni-combox {
+ padding: 0;
+ height: auto;
- .uni-input-placeholder,
- .uni-input-input {
- font-size: 26rpx;
- }
- }
+ .uni-input-placeholder,
+ .uni-input-input {
+ font-size: 26rpx;
+ }
+ }
- .uni-combox::v-deep input {
- height: inherit;
- font-size: 26rpx;
- }
- }
+ .uni-combox::v-deep input {
+ height: inherit;
+ font-size: 26rpx;
+ }
+ }
- .disabled {
- border: 1px solid #e4e4e4;
- background-color: #e4e4e4;
- }
+ .disabled {
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
- .none-border {
- border: none;
- }
- }
- }
+ .none-border {
+ border: none;
+ }
+ }
+ }
- .bottom-btn {
- box-sizing: border-box;
- width: 100%;
- height: 120rpx;
- position: fixed;
- bottom: 0;
- left: 0;
- background-color: #fff;
- box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
- padding: 30rpx 40rpx 40rpx 40rpx;
- display: flex;
- flex-direction: row;
- gap: 10rpx;
+ .bottom-btn {
+ box-sizing: border-box;
+ width: 100%;
+ height: 120rpx;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ background-color: #fff;
+ box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+ padding: 30rpx 40rpx 40rpx 40rpx;
+ 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: #FFA500;
- color: #fff;
- // position: absolute;
- // right: 120rpx;
- }
+ .btn-c {
+ background-color: #FFA500;
+ color: #fff;
+ // position: absolute;
+ // right: 120rpx;
+ }
- .btn-d {
- background-color: #ff8901;
- color: #fff;
- }
- }
+ .btn-d {
+ background-color: #ff8901;
+ color: #fff;
+ }
+ }
- .buttons {
- box-sizing: border-box;
- width: 100%;
- display: flex;
- justify-content: center;
- padding: 10rpx 0;
+ .buttons {
+ box-sizing: border-box;
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ padding: 10rpx 0;
- button {
- border-radius: 50rpx;
- width: 180rpx;
- height: 66rpx;
- line-height: 66rpx;
- font-size: 26rpx;
- }
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 26rpx;
+ }
- .btn-a {
- background-color: #acacac;
- color: #fff;
- }
+ .btn-a {
+ background-color: #acacac;
+ color: #fff;
+ }
- .btn-b {
- background-color: #41a863;
- color: #fff;
- }
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
- .btn-c {
- background-color: #3a78ff;
- color: #fff;
- }
- }
+ .btn-c {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+ }
- .list {
- width: 100%;
+ .list {
+ width: 100%;
- .card-detail {
- width: 100%;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
- align-items: center;
- line-height: 120%;
- gap: 10rpx 0;
+ .card-detail {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ align-items: center;
+ line-height: 120%;
+ gap: 10rpx 0;
- input {
- font-size: 26rpx;
- }
+ input {
+ font-size: 26rpx;
+ }
- .detail {
- // width: 50%;
- box-sizing: border-box;
- font-size: 26rpx;
- color: #555;
- padding-right: 20rpx;
+ .detail {
+ // width: 50%;
+ box-sizing: border-box;
+ font-size: 26rpx;
+ color: #555;
+ padding-right: 20rpx;
- text {
- color: #999;
- font-size: 26rpx;
- }
- }
+ text {
+ color: #999;
+ font-size: 26rpx;
+ }
+ }
- .editable {
- width: 50%;
- display: inline-flex;
- flex-direction: row;
- align-items: center;
+ .editable {
+ width: 50%;
+ display: inline-flex;
+ flex-direction: row;
+ align-items: center;
- text {
- flex-shrink: 0;
- }
+ text {
+ flex-shrink: 0;
+ }
- .editable-input {
- border: 1px solid #acacac;
- border-radius: 5rpx;
- padding: 0 12rpx;
- }
- }
- }
- }
+ .editable-input {
+ border: 1px solid #acacac;
+ border-radius: 5rpx;
+ padding: 0 12rpx;
+ }
+ }
+ }
+ }
- .icon-wrapper {
- background-color: #3a78ff;
- border-radius: 100%;
- width: 40rpx;
- height: 40rpx;
- display: flex;
- justify-content: center;
- align-items: center;
- flex-shrink: 0;
+ .icon-wrapper {
+ background-color: #3a78ff;
+ border-radius: 100%;
+ width: 40rpx;
+ height: 40rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-shrink: 0;
- .uni-icons {
- color: #fff !important;
- }
- }
+ .uni-icons {
+ color: #fff !important;
+ }
+ }
- .icon-wrapper-big {
- background-color: #3a78ff;
- border-radius: 100%;
- width: 50rpx;
- height: 50rpx;
- display: flex;
- justify-content: center;
- align-items: center;
- flex-shrink: 0;
- margin-left: 20rpx;
+ .icon-wrapper-big {
+ background-color: #3a78ff;
+ border-radius: 100%;
+ width: 50rpx;
+ height: 50rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-shrink: 0;
+ margin-left: 20rpx;
- .uni-icons {
- color: #fff !important;
- }
- }
+ .uni-icons {
+ color: #fff !important;
+ }
+ }
- .more {
- color: #888;
- font-size: 22rpx;
- display: flex;
- border-top: 1px solid #eee;
- padding-top: 10rpx;
+ .more {
+ color: #888;
+ font-size: 22rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 10rpx;
- .part {
- width: 100%;
- text-align: center;
- }
- }
+ .part {
+ width: 100%;
+ text-align: center;
+ }
+ }
- .pass-background {
- background-color: #cee3f2;
- border: none;
- }
+ .pass-background {
+ background-color: #cee3f2;
+ border: none;
+ }
- .unpass-background {
- background-color: #f0d6e3;
- border: none;
- }
+ .unpass-background {
+ background-color: #f0d6e3;
+ border: none;
+ }
- .enable-icon-button {
- background-color: #3a78ff;
- padding: 6rpx;
- color: #fff;
- border-radius: 100%;
- }
+ .enable-icon-button {
+ background-color: #3a78ff;
+ padding: 6rpx;
+ color: #fff;
+ border-radius: 100%;
+ }
- .disable-icon-button {
- background-color: lightgray;
- padding: 6rpx;
- color: #fff;
- border-radius: 100%;
- pointer-events: none;
- }
-
- .required::after{
- content: "*";
- color: red;
- margin-left: 4px;
- font-weight: bold;
+ .disable-icon-button {
+ background-color: lightgray;
+ padding: 6rpx;
+ color: #fff;
+ border-radius: 100%;
+ pointer-events: none;
+ }
+
+ .required::after {
+ content: "*";
+ color: red;
+ margin-left: 4px;
+ font-weight: bold;
}
</style>
\ No newline at end of file
diff --git a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
index d8765c3..4ebd73e 100644
--- a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
+++ b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
@@ -1707,6 +1707,22 @@
return true;
},
+ async auditBill() {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/QC_PatrolProcCheckOtherBill/AuditQC_PatrolProcCheckOtherBill",
+ data: {
+ HInterID: this.hform.HInterID,
+ type: 1,
+ user: getUserInfo()['Czymc']
+ }
+ })
+
+ if (res.data.count == 1) {
+ return true
+ } else {
+ return false
+ }
+ },
async submit() {
if (!this.checkSubmitValidate()) {
return;
@@ -1757,26 +1773,58 @@
let {
count,
Message,
- data
+ data,
+ Verify = 'N'
} = res.data;
if (count == 1) {
- uni.showModal({
- title: "鎻愮ず",
- content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
- success: (res) => {
- if (res.confirm) {
- console.log("鐢ㄦ埛鐐瑰嚮纭畾");
- uni.redirectTo({
- url: "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=1",
- });
- } else if (res.cancel) {
- console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
- setTimeout(() => {
- uni.navigateBack();
- }, 50)
- }
- },
- });
+ if (Verify == 'Y') {
+ let AuditSuccess = await this.auditBill()
+ if (AuditSuccess) {
+ console.log("瀹℃牳鎴愬姛");
+ uni.showModal({
+ title: "鎻愮ず",
+ content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
+ success: (res) => {
+ if (res.confirm) {
+ console.log("鐢ㄦ埛鐐瑰嚮纭畾");
+ uni.redirectTo({
+ url: "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=1",
+ });
+ } else if (res.cancel) {
+ console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ }
+ },
+ });
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: '瀹℃牳澶辫触'
+ })
+ }
+ } else {
+ uni.showModal({
+ title: "鎻愮ず",
+ content: res.data.Message + "銆傛槸鍚︾户缁柊澧烇紵",
+ success: (res) => {
+ if (res.confirm) {
+ console.log("鐢ㄦ埛鐐瑰嚮纭畾");
+ uni.redirectTo({
+ url: "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=1",
+ });
+ } else if (res.cancel) {
+ console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
+ }
+ },
+ });
+ }
+
+
} else {
CommonUtils.showTips({
title: "娓╅Θ鎻愮ず",
@@ -2027,11 +2075,11 @@
if (e.HSouceBillType == "7521") {
await this.LoadingInformation_TakeSampleCheckBill(e.linterid);
await this.$nextTick()
- if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
+ // if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
this.HSourceBillType = "鍙栨牱鍗�"; // 鏄剧ず鍚嶇О
this.hform.HSourceBillType = "7521"; // 瀵瑰簲鐨勫��
this.hform.HSourceBillNo = e.HBillNo
- }
+ // }
this.hform.HTakeSampleCheckBillNo = e.HBillNo;
this.hform.HTakeSampleCheckBillID = e.linterid;
diff --git a/pages/caigoudingdan/caigoudingdanList.vue b/pages/caigoudingdan/caigoudingdanList.vue
index aecd5d1..c8198ec 100644
--- a/pages/caigoudingdan/caigoudingdanList.vue
+++ b/pages/caigoudingdan/caigoudingdanList.vue
@@ -41,7 +41,7 @@
</view>
<view class="button-groups">
- <button type="default" size="mini" class="btn-b" @tap.stop="onAddClickHandler">鏂板</button>
+ <!-- <button type="default" size="mini" class="btn-b" @tap.stop="onAddClickHandler">鏂板</button> -->
<button type="default" size="mini" class="btn-c" @tap.stop="onSearchClickHandler">鏌ヨ</button>
<button type="default" size="mini" class="btn-a" @tap.stop="onResetClickHandler">閲嶇疆</button>
</view>
@@ -52,9 +52,9 @@
<uni-card :title="item.鐗╂枡浠ｇ爜" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
@tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
- <view class="detail" v-if="item.鐗╂枡浠ｇ爜">
+ <!-- <view class="detail" v-if="item.鐗╂枡浠ｇ爜">
<text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
- </view>
+ </view> -->
<view class="detail" v-if="item.鐗╂枡鍚嶇О">
<text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
</view>
@@ -158,6 +158,7 @@
<view class="op" v-if="operations == index">
<!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+ <button class="op6" size="mini" plain @tap.stop="Browse(item)">鏌ョ湅鏄庣粏</button>
<button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
@@ -334,6 +335,14 @@
count
} = res.data
console.log('res.data: ', res.data);
+ if(res.data.Message=="鏃犳煡鐪嬫潈闄愶紒")
+ {
+ uni.showToast({
+ icon: 'none',
+ title: res.data.Message
+ })
+ return;
+ }
this.listData = data;
this.pageMeta.total = count
uni.stopPullDownRefresh()
@@ -360,7 +369,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
CommonUtils.doRequest2({
- url: '/Sc_EmployeeSignInNoteBillController/deleteBill',
+ url: '/Cg_POOrderBill/DeltetCg_POOrderBill',
data: {
HItemID: item['HInterID'],
user: getUserInfo()['Czymc']
@@ -395,6 +404,13 @@
}
}
});
+ },
+ Browse(item)
+ {
+ console.log(item)
+ uni.navigateTo({
+ url: '/pages/caigoudingdan/caigoudingdanListEdit?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
+ })
}
},
}
diff --git a/pages/caigoudingdan/caigoudingdanListEdit.vue b/pages/caigoudingdan/caigoudingdanListEdit.vue
new file mode 100644
index 0000000..d2571e0
--- /dev/null
+++ b/pages/caigoudingdan/caigoudingdanListEdit.vue
@@ -0,0 +1,648 @@
+<template>
+ <view class="container">
+ <view class="header">
+ <view class="title">閲囪喘璁㈠崟鏄庣粏</view>
+ <view class="sub-title">{{ HBillNo }}</view>
+ </view>
+ <!-- Tab鍒囨崲 -->
+ <view class="tab-container">
+ <view class="tabs">
+ <view
+ class="tab-item"
+ :class="{'active': currentTab === 0}"
+ @click="switchTab(0)"
+ >
+ 鍩烘湰淇℃伅
+ </view>
+ <view
+ class="tab-item"
+ :class="{'active': currentTab === 1}"
+ @click="switchTab(1)"
+ >
+ 瀹℃牳淇℃伅
+ </view>
+ <view
+ class="tab-item"
+ :class="{'active': currentTab === 2}"
+ @click="switchTab(2)"
+ >
+ 鐗╂枡淇℃伅
+ </view>
+ </view>
+ <view class="tab-indicator" :style="indicatorStyle"></view>
+ </view>
+
+ <scroll-view
+ scroll-y
+ class="content"
+ :style="{height: scrollHeight + 'px'}"
+ >
+ <!-- Tab 0: 鍩烘湰淇℃伅 -->
+ <view v-if="currentTab === 0" class="tab-content">
+ <view class="info-card">
+ <view class="card-title">璁㈠崟鍩烘湰淇℃伅</view>
+ <view class="info-grid">
+ <view class="info-item" v-if="orderInfo.鏃ユ湡">
+ <text class="label">鏃ユ湡锛�</text>
+ <text class="value">{{ orderInfo.鏃ユ湡 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.鍗曟嵁鍙�">
+ <text class="label">鍗曟嵁鍙凤細</text>
+ <text class="value">{{ orderInfo.鍗曟嵁鍙� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.閮ㄩ棬浠ｇ爜">
+ <text class="label">閮ㄩ棬浠ｇ爜锛�</text>
+ <text class="value">{{ orderInfo.閮ㄩ棬浠ｇ爜 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.閮ㄩ棬">
+ <text class="label">閮ㄩ棬锛�</text>
+ <text class="value">{{ orderInfo.閮ㄩ棬 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.涓氬姟鍛樹唬鐮�">
+ <text class="label">涓氬姟鍛樹唬鐮侊細</text>
+ <text class="value">{{ orderInfo.涓氬姟鍛樹唬鐮� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.涓氬姟鍛�">
+ <text class="label">涓氬姟鍛橈細</text>
+ <text class="value">{{ orderInfo.涓氬姟鍛� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.浜よ揣鍦扮偣">
+ <text class="label">浜よ揣鍦扮偣锛�</text>
+ <text class="value">{{ orderInfo.浜よ揣鍦扮偣 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.缁撶畻鏂瑰紡浠ｇ爜">
+ <text class="label">缁撶畻鏂瑰紡浠ｇ爜锛�</text>
+ <text class="value">{{ orderInfo.缁撶畻鏂瑰紡浠ｇ爜 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.缁撶畻鏂瑰紡">
+ <text class="label">缁撶畻鏂瑰紡锛�</text>
+ <text class="value">{{ orderInfo.缁撶畻鏂瑰紡 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.渚涘簲鍟嗕唬鐮�">
+ <text class="label">渚涘簲鍟嗕唬鐮侊細</text>
+ <text class="value">{{ orderInfo.渚涘簲鍟嗕唬鐮� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.渚涘簲鍟�">
+ <text class="label">渚涘簲鍟嗭細</text>
+ <text class="value">{{ orderInfo.渚涘簲鍟� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.甯佸埆浠ｇ爜">
+ <text class="label">甯佸埆浠ｇ爜锛�</text>
+ <text class="value">{{ orderInfo.甯佸埆浠ｇ爜 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.甯佸埆">
+ <text class="label">甯佸埆锛�</text>
+ <text class="value">{{ orderInfo.甯佸埆 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.姹囩巼">
+ <text class="label">姹囩巼锛�</text>
+ <text class="value">{{ orderInfo.姹囩巼 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.涓荤浠ｇ爜">
+ <text class="label">涓荤浠ｇ爜锛�</text>
+ <text class="value">{{ orderInfo.涓荤浠ｇ爜 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.涓荤">
+ <text class="label">涓荤锛�</text>
+ <text class="value">{{ orderInfo.涓荤 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.閲囪喘鏂瑰紡浠ｇ爜">
+ <text class="label">閲囪喘鏂瑰紡浠ｇ爜锛�</text>
+ <text class="value">{{ orderInfo.閲囪喘鏂瑰紡浠ｇ爜 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.閲囪喘鏂瑰紡">
+ <text class="label">閲囪喘鏂瑰紡锛�</text>
+ <text class="value">{{ orderInfo.閲囪喘鏂瑰紡 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.缁撶畻鏃ユ湡">
+ <text class="label">缁撶畻鏃ユ湡锛�</text>
+ <text class="value">{{ orderInfo.缁撶畻鏃ユ湡 }}</text>
+ </view>
+ <view class="info-item full-width" v-if="orderInfo.鎽樿">
+ <text class="label">鎽樿锛�</text>
+ <text class="value">{{ orderInfo.鎽樿 }}</text>
+ </view>
+ </view>
+ </view>
+ </view>
+
+ <!-- Tab 1: 瀹℃牳淇℃伅 -->
+ <view v-if="currentTab === 1" class="tab-content">
+ <view class="info-card">
+ <view class="card-title">瀹℃壒娴佺▼淇℃伅</view>
+ <view class="info-grid">
+ <view class="info-item" v-if="orderInfo.鍒跺崟浜�">
+ <text class="label">鍒跺崟浜猴細</text>
+ <text class="value">{{ orderInfo.鍒跺崟浜� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.鍒跺崟鏃ユ湡">
+ <text class="label">鍒跺崟鏃ユ湡锛�</text>
+ <text class="value">{{ formatDate(orderInfo.鍒跺崟鏃ユ湡) }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.瀹℃牳浜�">
+ <text class="label">瀹℃牳浜猴細</text>
+ <text class="value">{{ orderInfo.瀹℃牳浜� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.瀹℃牳鏃ユ湡">
+ <text class="label">瀹℃牳鏃ユ湡锛�</text>
+ <text class="value">{{ formatDate(orderInfo.瀹℃牳鏃ユ湡) }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.淇敼浜�">
+ <text class="label">淇敼浜猴細</text>
+ <text class="value">{{ orderInfo.淇敼浜� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.淇敼鏃ユ湡">
+ <text class="label">淇敼鏃ユ湡锛�</text>
+ <text class="value">{{ formatDate(orderInfo.淇敼鏃ユ湡) }}</text>
+ </view>
+ </view>
+ </view>
+ </view>
+
+ <!-- Tab 2: 鐗╂枡淇℃伅 -->
+ <view v-if="currentTab === 2" class="tab-content">
+ <view class="material-list">
+ <view
+ v-for="(item, index) in materialList"
+ :key="index"
+ class="material-card"
+ >
+ <view class="material-header">
+ <text class="material-code">{{ item.鐗╂枡浠ｇ爜 || '鐗╂枡' + (index + 1) }}</text>
+ <text class="material-name">{{ item.鐗╂枡鍚嶇О }}</text>
+ </view>
+ <view class="material-info">
+ <view class="info-row">
+ <view class="info-col" v-if="item.瑙勬牸鍨嬪彿">
+ <text class="label">瑙勬牸鍨嬪彿锛�</text>
+ <text class="value">{{ item.瑙勬牸鍨嬪彿 }}</text>
+ </view>
+ <view class="info-col" v-if="item.璁￠噺鍗曚綅浠ｇ爜">
+ <text class="label">鍗曚綅浠ｇ爜锛�</text>
+ <text class="value">{{ item.璁￠噺鍗曚綅浠ｇ爜 }}</text>
+ </view>
+ <view class="info-col" v-if="item.璁￠噺鍗曚綅">
+ <text class="label">鍗曚綅锛�</text>
+ <text class="value">{{ item.璁￠噺鍗曚綅 }}</text>
+ </view>
+ </view>
+
+ <view class="info-row">
+ <view class="info-col" v-if="item.鏁伴噺">
+ <text class="label">鏁伴噺锛�</text>
+ <text class="value">{{ item.鏁伴噺 }}</text>
+ </view>
+ <view class="info-col" v-if="item.鍏ュ簱鏁伴噺">
+ <text class="label">鍏ュ簱鏁伴噺锛�</text>
+ <text class="value">{{ item.鍏ュ簱鏁伴噺 }}</text>
+ </view>
+ <view class="info-col" v-if="item.寮�绁ㄦ暟閲�">
+ <text class="label">寮�绁ㄦ暟閲忥細</text>
+ <text class="value">{{ item.寮�绁ㄦ暟閲� }}</text>
+ </view>
+ </view>
+
+ <view class="info-row">
+ <view class="info-col" v-if="item.鍏宠仈鏁伴噺">
+ <text class="label">鍏宠仈鏁伴噺锛�</text>
+ <text class="value">{{ item.鍏宠仈鏁伴噺 }}</text>
+ </view>
+ <view class="info-col" v-if="item.鏈叧鑱旀暟閲�">
+ <text class="label">鏈叧鑱旀暟閲忥細</text>
+ <text class="value">{{ item.鏈叧鑱旀暟閲� }}</text>
+ </view>
+ </view>
+
+ <view class="info-row">
+ <view class="info-col" v-if="item.鍚◣鍗曚环">
+ <text class="label">鍚◣鍗曚环锛�</text>
+ <text class="value">{{ item.鍚◣鍗曚环 }}</text>
+ </view>
+ <view class="info-col" v-if="item.鎶樻墸鐜�">
+ <text class="label">鎶樻墸鐜囷細</text>
+ <text class="value">{{ item.鎶樻墸鐜� }}</text>
+ </view>
+ <view class="info-col" v-if="item.瀹為檯鍚◣鍗曚环">
+ <text class="label">瀹為檯鍗曚环锛�</text>
+ <text class="value">{{ item.瀹為檯鍚◣鍗曚环 }}</text>
+ </view>
+ </view>
+
+ <view class="info-row">
+ <view class="info-col" v-if="item.鍗曚环">
+ <text class="label">鍗曚环锛�</text>
+ <text class="value">{{ item.鍗曚环 }}</text>
+ </view>
+ <view class="info-col" v-if="item.閲戦">
+ <text class="label">閲戦锛�</text>
+ <text class="value">{{ item.閲戦 }}</text>
+ </view>
+ </view>
+
+ <view class="info-row">
+ <view class="info-col" v-if="item.绋庣巼">
+ <text class="label">绋庣巼锛�</text>
+ <text class="value">{{ item.绋庣巼 }}%</text>
+ </view>
+ <view class="info-col" v-if="item.绋庨">
+ <text class="label">绋庨锛�</text>
+ <text class="value">{{ item.绋庨 }}</text>
+ </view>
+ <view class="info-col" v-if="item.浠风◣鍚堣">
+ <text class="label">浠风◣鍚堣锛�</text>
+ <text class="value">{{ item.浠风◣鍚堣 }}</text>
+ </view>
+ </view>
+
+ <view class="info-row" v-if="item.浜よ揣鏃ユ湡">
+ <view class="info-col full-width">
+ <text class="label">浜よ揣鏃ユ湡锛�</text>
+ <text class="value">{{ item.浜よ揣鏃ユ湡 }}</text>
+ </view>
+ </view>
+ </view>
+ </view>
+
+ <view v-if="materialList.length === 0" class="empty-state">
+ <uni-icons type="list" size="50" color="#ccc"></uni-icons>
+ <text class="empty-text">鏆傛棤鐗╂枡淇℃伅</text>
+ </view>
+ </view>
+ </view>
+ </scroll-view>
+
+ <view class="footer">
+ <button class="back-btn" @click="goBack">杩斿洖</button>
+ </view>
+
+ <uni-load-more v-if="loading" status="loading" :content-text="loadingText"></uni-load-more>
+ </view>
+</template>
+
+<script>
+ import { CommonUtils } from '@/utils/common.js'
+ import { getUserInfo } from "../../utils/auth";
+
+ export default {
+ data() {
+ return {
+ // 鍙傛暟
+ linterid: '',
+ HBillNo: '',
+
+
+ currentTab: 0,
+ scrollHeight: 0,
+ loading: false,
+ loadingText: {
+ contentdown: '涓婃媺鏄剧ず鏇村',
+ contentrefresh: '姝ｅ湪鍔犺浇...',
+ contentnomore: '娌℃湁鏇村鏁版嵁浜�'
+ },
+
+
+ orderInfo: {},
+ materialList: [],
+ allData: [],
+ }
+ },
+ computed: {
+ indicatorStyle() {
+ const tabWidth = 100 / 3;
+ return {
+ width: tabWidth + '%',
+ transform: `translateX(${this.currentTab * 100}%)`
+ };
+ }
+ },
+ onLoad(options) {
+ if (options.linterid && options.HBillNo) {
+ this.linterid = options.linterid;
+ this.HBillNo = options.HBillNo;
+ this.loadOrderDetail();
+ } else {
+ uni.showToast({
+ title: '鍙傛暟閿欒',
+ icon: 'error'
+ });
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 1500);
+ }
+
+ // 璁＄畻婊氬姩鍖哄煙楂樺害
+ this.calcScrollHeight();
+ },
+ onReady() {
+
+ uni.onWindowResize(() => {
+ this.calcScrollHeight();
+ });
+ },
+ methods: {
+
+ calcScrollHeight() {
+ const systemInfo = uni.getSystemInfoSync();
+ const windowHeight = systemInfo.windowHeight;
+
+
+ const query = uni.createSelectorQuery().in(this);
+ query.select('.header').boundingClientRect();
+ query.select('.tab-container').boundingClientRect();
+ query.select('.footer').boundingClientRect();
+ query.exec((res) => {
+ if (res[0] && res[1] && res[2]) {
+ const headerHeight = res[0].height;
+ const tabHeight = res[1].height;
+ const footerHeight = res[2].height;
+ const margin = 5; // 瀹夊叏杈硅窛
+
+ this.scrollHeight = windowHeight - headerHeight - tabHeight - footerHeight - margin;
+ }
+ });
+ },
+
+
+ switchTab(index) {
+ this.currentTab = index;
+ },
+
+
+ loadOrderDetail() {
+ this.loading = true;
+
+
+ const sWhere = ` and hmainid = '${this.linterid}'`;
+
+ CommonUtils.doRequest2({
+ url: '/Cg_POOrderBill/QueryListEdit',
+ data: {
+ sWhere: sWhere,
+ user: getUserInfo()["Czymc"],
+ },
+ resFunction: (res) => {
+ this.loading = false;
+
+ if (res.data.Message === "鏃犳煡鐪嬫潈闄愶紒") {
+ uni.showToast({
+ icon: 'none',
+ title: res.data.Message
+ });
+ return;
+ }
+
+ if (res.data.code === "1" && res.data.data && res.data.data.length > 0) {
+ this.allData = res.data.data;
+
+ this.orderInfo = { ...this.allData[0] };
+
+ this.materialList = this.allData;
+
+
+ if (!this.orderInfo.鍗曟嵁鍙� && this.HBillNo) {
+ this.orderInfo.鍗曟嵁鍙� = this.HBillNo;
+ }
+ } else {
+ uni.showToast({
+ title: '鏈壘鍒拌鍗曚俊鎭�',
+ icon: 'none'
+ });
+ }
+ },
+ errFunction: (err) => {
+ this.loading = false;
+ uni.showToast({
+ title: '鍔犺浇澶辫触',
+ icon: 'error'
+ });
+ console.error('鍔犺浇璁㈠崟璇︽儏澶辫触:', err);
+ }
+ });
+ },
+
+
+ formatDate(dateStr) {
+ if (!dateStr) return '';
+
+ if (dateStr.length >= 10) {
+ return dateStr.substr(0, 10);
+ }
+ return dateStr;
+ },
+
+ // 杩斿洖涓婁竴椤�
+ goBack() {
+ uni.navigateBack();
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .container {
+ display: flex;
+ flex-direction: column;
+ height: 100vh;
+ background-color: #f5f5f5;
+ }
+
+ .header {
+ padding: 30rpx;
+ background: linear-gradient(135deg, #3a78ff 0%, #5a9cff 100%);
+ color: white;
+ text-align: center;
+
+ .title {
+ font-size: 36rpx;
+ font-weight: bold;
+ margin-bottom: 10rpx;
+ }
+
+ .sub-title {
+ font-size: 28rpx;
+ opacity: 0.9;
+ }
+ }
+
+ .tab-container {
+ background-color: white;
+ position: relative;
+ box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+
+ .tabs {
+ display: flex;
+
+ .tab-item {
+ flex: 1;
+ text-align: center;
+ padding: 25rpx 0;
+ font-size: 30rpx;
+ color: #666;
+ transition: all 0.3s;
+
+ &.active {
+ color: #3a78ff;
+ font-weight: bold;
+ }
+ }
+ }
+
+ .tab-indicator {
+ height: 4rpx;
+ background-color: #3a78ff;
+ transition: transform 0.3s ease;
+ }
+ }
+
+ .content {
+ flex: 1;
+ }
+
+ .tab-content {
+ padding: 20rpx;
+ }
+
+ .info-card {
+ background-color: white;
+ border-radius: 16rpx;
+ padding: 30rpx;
+ margin-bottom: 20rpx;
+ box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
+
+ .card-title {
+ font-size: 32rpx;
+ font-weight: bold;
+ color: #333;
+ margin-bottom: 30rpx;
+ padding-bottom: 15rpx;
+ border-bottom: 1rpx solid #eee;
+ }
+
+ .info-grid {
+ display: flex;
+ flex-wrap: wrap;
+
+ .info-item {
+ width: 50%;
+ margin-bottom: 25rpx;
+
+ &.full-width {
+ width: 100%;
+ }
+
+ .label {
+ color: #666;
+ font-size: 28rpx;
+ margin-right: 10rpx;
+ }
+
+ .value {
+ color: #333;
+ font-size: 28rpx;
+ font-weight: 500;
+ word-break: break-all;
+ }
+ }
+ }
+ }
+
+ .material-list {
+ .material-card {
+ background-color: white;
+ border-radius: 16rpx;
+ margin-bottom: 20rpx;
+ padding: 30rpx;
+ box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
+
+ .material-header {
+ display: flex;
+ align-items: center;
+ margin-bottom: 25rpx;
+ padding-bottom: 15rpx;
+ border-bottom: 1rpx solid #eee;
+
+ .material-code {
+ font-size: 30rpx;
+ font-weight: bold;
+ color: #3a78ff;
+ margin-right: 20rpx;
+ background-color: #f0f7ff;
+ padding: 5rpx 15rpx;
+ border-radius: 8rpx;
+ }
+
+ .material-name {
+ font-size: 28rpx;
+ color: #333;
+ flex: 1;
+ }
+ }
+
+ .material-info {
+ .info-row {
+ display: flex;
+ flex-wrap: wrap;
+ margin-bottom: 15rpx;
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+
+ .info-col {
+ width: 50%;
+ margin-bottom: 10rpx;
+
+ &.full-width {
+ width: 100%;
+ }
+
+ .label {
+ color: #888;
+ font-size: 26rpx;
+ margin-right: 8rpx;
+ }
+
+ .value {
+ color: #333;
+ font-size: 26rpx;
+ font-weight: 500;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ .empty-state {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ padding: 100rpx 0;
+
+ .empty-text {
+ color: #999;
+ font-size: 28rpx;
+ margin-top: 20rpx;
+ }
+ }
+
+ .footer {
+ padding: 20rpx 30rpx;
+ background-color: white;
+ border-top: 1rpx solid #eee;
+
+ .back-btn {
+ background-color: #3a78ff;
+ color: white;
+ border-radius: 50rpx;
+ height: 80rpx;
+ line-height: 80rpx;
+ font-size: 32rpx;
+
+ &:active {
+ background-color: #2c5fcc;
+ }
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/pages/caigouruku/POStockInBill.vue b/pages/caigouruku/POStockInBill.vue
index 4881325..f3607a8 100644
--- a/pages/caigouruku/POStockInBill.vue
+++ b/pages/caigouruku/POStockInBill.vue
@@ -352,11 +352,11 @@
HBillNo: '',
HInterID: '',
- HKeeperName: getUserInfo().HKeeper,
+ HKeeperName: getUserInfo().HKeeperName,
HKeeperID: getUserInfo().HKeeperID,
- HSecManagerName: getUserInfo().HSecManager,
+ HSecManagerName: getUserInfo().HSecManagerName,
HSecManagerID: getUserInfo().HSecManagerID,
- HDeptName: getUserInfo().HDept,
+ HDeptName: getUserInfo().HDeptName,
HDeptID: getUserInfo().HDeptID,
HSupName: '',
HSupID: '',
diff --git a/pages/caigoutuiliao/POStockInBackBill.vue b/pages/caigoutuiliao/POStockInBackBill.vue
index 43e43bc..56b1d88 100644
--- a/pages/caigoutuiliao/POStockInBackBill.vue
+++ b/pages/caigoutuiliao/POStockInBackBill.vue
@@ -344,11 +344,11 @@
HBillNo: '',
HInterID: '',
- HKeeperName: getUserInfo().HKeeper,
+ HKeeperName: getUserInfo().HKeeperName,
HKeeperID: getUserInfo().HKeeperID,
- HSecManagerName: getUserInfo().HSecManager,
+ HSecManagerName: getUserInfo().HSecManagerName,
HSecManagerID: getUserInfo().HSecManagerID,
- HDeptName: getUserInfo().HDept,
+ HDeptName: getUserInfo().HDeptName,
HDeptID: getUserInfo().HDeptID,
HSupName: '',
HSupID: '',
diff --git a/pages/index/login.vue b/pages/index/login.vue
index d93214d..68a3b0e 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -110,7 +110,7 @@
"鏉窞鍑礉濂堢壒澶栫綉": 'http://erp.hzcabinet.cn:9090/API/',
"缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/',
"闄堥晲鍝叉湰鍦版祴璇�": 'http://192.168.0.121:81/API/',
- "闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.89.27:81/API/',
+ "闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.88.82:81/API/',
"寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
"浣欐�濇澃鏈湴娴嬭瘯": 'http://localhost:8082/LuBaoAPI/',
// 灏忓崼鍐呭缃�
@@ -127,7 +127,7 @@
"瀹佹尝鍗庤垷鍖呰2": "http://192.168.88.167:8082/API_NW/",
"瀹佹尝鍗庤垷鍖呰": "http://61.164.64.222:8082/API_WW/",
},
- serverUrlName: uni.getStorageSync('serverUrlName') || '瀹佹尝鍗庤垷鍖呰',
+ serverUrlName: uni.getStorageSync('serverUrlName') || '瀹佹尝鍥涚淮灏�-澶栫綉',
arrayOrganization: [],
Organization: '',
diff --git a/pages/index/tab3.vue b/pages/index/tab3.vue
index 2ee5b11..c16dd4a 100644
--- a/pages/index/tab3.vue
+++ b/pages/index/tab3.vue
@@ -196,7 +196,6 @@
"hidden": false
},
{
- "text": "璁惧缁翠慨楠屾敹鍗�",
"img": "../../static/icon/icon8.png",
"text": "璁惧缁翠慨璁板綍鍗�",
"url": "/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill",
@@ -227,11 +226,16 @@
},
{
"img": "../../static/icon/icon8.png",
-
"text": "鍣ㄥ叿缁翠慨浠诲姟",
"url": "/pages/MJGL/Sc_MouldRepairTaskReport/Sc_MouldRepairTaskReport",
"id": 27,
"hidden": false
+ },{
+ "img": "../../static/icon/icon8.png",
+ "text": "璁惧缁翠慨楠屾敹鍗�",
+ "url": "/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill",
+ "id": 28,
+ "hidden": false
}
]
}
diff --git a/pages/index/tab4.vue b/pages/index/tab4.vue
index 5463cc6..fbeebe6 100644
--- a/pages/index/tab4.vue
+++ b/pages/index/tab4.vue
@@ -189,6 +189,20 @@
"id": 20,
"hidden": false
},
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "閿�鍞鍗曞垪琛�",
+ "url": "/pages/xiaoshoudingdan/xiaoshoudingdanBillList",
+ "id": 21,
+ "hidden": false
+ },
+ {
+ "img": "../../static/icon/icon15.png",
+ "text": "鐗规壒鍗曞垪琛�",
+ "url": "/pages/tepidan/TePiDanList",
+ "id": 22,
+ "hidden": false
+ },
]
}
},
diff --git a/pages/qitachuku_v2/OtherOutBill.vue b/pages/qitachuku_v2/OtherOutBill.vue
index 3c583f0..593ec4d 100644
--- a/pages/qitachuku_v2/OtherOutBill.vue
+++ b/pages/qitachuku_v2/OtherOutBill.vue
@@ -384,11 +384,11 @@
HBillNo: '',
HInterID: '',
- HKeeperName: getUserInfo().HKeeper,
+ HKeeperName: getUserInfo().HKeeperName,
HKeeperID: getUserInfo().HKeeperID,
- HSecManagerName: getUserInfo().HSecManager,
+ HSecManagerName: getUserInfo().HSecManagerName,
HSecManagerID: getUserInfo().HSecManagerID,
- HDeptName: getUserInfo().HDept,
+ HDeptName: getUserInfo().HDeptName,
HDeptID: getUserInfo().HDeptID,
HSupName: '',
HSupID: '',
diff --git a/pages/qitaruku_v2/OtherInBill.vue b/pages/qitaruku_v2/OtherInBill.vue
index 8c3e685..3c7f9bb 100644
--- a/pages/qitaruku_v2/OtherInBill.vue
+++ b/pages/qitaruku_v2/OtherInBill.vue
@@ -332,8 +332,10 @@
tabs: 0,
HMainSourceBillType: '鎵嬪伐褰曞叆',
- arrayHMainSourceBillType: ['鍏ュ簱鐢宠鍗�', '鎵嬪伐褰曞叆'],
- arrayHMainSourceBillValue: [1241, -1],
+ // arrayHMainSourceBillType: ['鍏ュ簱鐢宠鍗�', '鎵嬪伐褰曞叆'],
+ // arrayHMainSourceBillValue: [1241, -1],
+ arrayHMainSourceBillType: ['鎵嬪伐褰曞叆'],
+ arrayHMainSourceBillValue: [-1],
linterid: '',
HBillNo: '',
btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
@@ -383,11 +385,11 @@
HBillNo: '',
HInterID: '',
- HKeeperName: getUserInfo().HKeeper,
+ HKeeperName: getUserInfo().HKeeperName,
HKeeperID: getUserInfo().HKeeperID,
- HSecManagerName: getUserInfo().HSecManager,
+ HSecManagerName: getUserInfo().HSecManagerName,
HSecManagerID: getUserInfo().HSecManagerID,
- HDeptName: getUserInfo().HDept,
+ HDeptName: getUserInfo().HDeptName,
HDeptID: getUserInfo().HDeptID,
HSupName: '',
HSupID: '',
diff --git a/pages/sanmaheyi/BarCodeCheck.vue b/pages/sanmaheyi/BarCodeCheck.vue
index 2c8b502..fe05c3a 100644
--- a/pages/sanmaheyi/BarCodeCheck.vue
+++ b/pages/sanmaheyi/BarCodeCheck.vue
@@ -5,7 +5,7 @@
<view class="title">鏍堟澘鐮�</view>
<!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
<view class="right" :class="disableBarCodePallet ? 'disabled' : ''">
- <input type="text" :focus="HBarCodePalletFocus" v-model="HBarCode_Pallet"
+ <input type="text" :focus="HBarCodePalletFocus" v-model="HBarCode_Pallet" v-on:click="selectAll"
@confirm="CheckBarcode(HBarCode_Pallet,1)" :disabled="disableBarCodePallet" />
</view>
<view class="right-icon">
@@ -18,7 +18,7 @@
<view class="title">鐩殑浠撶爜</view>
<!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
<view class="right" :class="disableBarCodeDest ? 'disabled' : ''">
- <input type="text" :focus="HBarCodeDestFocus" v-model="HBarCode_Destination"
+ <input type="text" :focus="HBarCodeDestFocus" v-model="HBarCode_Destination" v-on:click="selectAll"
@confirm="CheckBarcode(HBarCode_Destination,2)" :disabled="disableBarCodeDest" />
</view>
<view class="right-icon">
@@ -31,7 +31,7 @@
<view class="title">涓鐮�</view>
<!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
<view class="right" :class="disableBarCodeMiddle ? 'disabled' : ''">
- <input type="text" :focus="HBarCodeMiddleFocus" v-model="HBarCode_MiddleBox "
+ <input type="text" :focus="HBarCodeMiddleFocus" v-model="HBarCode_MiddleBox" v-on:click="selectAll"
@confirm="CheckBarcode(HBarCode_MiddleBox,3)" :disabled="disableBarCodeMiddle" />
</view>
<view class="right-icon">
@@ -235,6 +235,11 @@
// ==================== 鏂规硶 ====================
methods: {
+ //鐐瑰嚮鏂囨湰妗嗭紝鑷姩鍏ㄩ�夋枃鏈鍐呭
+ selectAll(e){
+ event.target.select();
+ },
+
// 澶嶉�夋鍙樺寲澶勭悊
checkboxGroupChangeHandler(e) {
let checkBoxValues = Array.from(e.detail.value)
@@ -318,7 +323,8 @@
HBarCodeType: HBarCodeType,
HInterID: this.hform.HInterID,
HBillNo: this.hform.HBillNo,
- HMaker: this.hform.HMaker
+ HMaker: this.hform.HMaker,
+ HBillType: "涓夌爜鍚堜竴"
},
resFunction: (res) => {
let {
@@ -331,14 +337,16 @@
CommonUtils.playSound(1)
if(HBarCodeType == 1){
+ disableBarCodePallet: false, // 鏍堟澘鐮佺鐢ㄧ姸鎬�
//澶勭悊鎴愬姛鍚庤仛鐒﹀埌鐩殑浠撶爜杈撳叆妗�
this.HBarCodeDestFocusRefresh()
}else if(HBarCodeType == 2){
+ disableBarCodeDest: false, // 鐩殑浠撶爜绂佺敤鐘舵��
//澶勭悊鎴愬姛鍚庤仛鐒﹀埌涓鐮佽緭鍏ユ
this.HBarCodeMiddleFocusRefresh()
}else if(HBarCodeType == 3){
//澶勭悊鎴愬姛鍚庤仛鐒﹀埌SN鐮佽緭鍏ユ
- this.HBarCodeFocusRefresh()
+ this.HBarCodeMiddleFocusRefresh()
}
@@ -356,7 +364,14 @@
}
} else {
CommonUtils.playSound(0)
- this.HBarCodePalletFocusRefresh()
+ if(HBarCodeType == 1){
+ this.HBarCodePalletFocusRefresh()
+ }else if(HBarCodeType == 2){
+ this.HBarCodeDestFocusRefresh()
+ }else if(HBarCodeType == 3){
+ this.HBarCodeMiddleFocusRefresh()
+ }
+ //this.HBarCodePalletFocusRefresh()
uni.showToast({
icon: 'none',
title: Message
@@ -628,7 +643,8 @@
url: '/CheckBarcodeController/Save_BarCode_BarcodeCheck',
data: {
"HInterID": this.hform.HInterID,
- "HBillNo": this.hform.HBillNo
+ "HBillNo": this.hform.HBillNo,
+ "HBillType": "涓夌爜鍚堜竴"
},
resFunction: (res) => {
let {
@@ -657,6 +673,7 @@
}
})
} else {
+ this.EnableSubmit = true
uni.showToast({
icon: 'none',
title: Message
diff --git a/pages/shengchanrukushengdan/Kf_ProductInBill.vue b/pages/shengchanrukushengdan/Kf_ProductInBill.vue
index f98d15e..cf56820 100644
--- a/pages/shengchanrukushengdan/Kf_ProductInBill.vue
+++ b/pages/shengchanrukushengdan/Kf_ProductInBill.vue
@@ -32,7 +32,7 @@
v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
@confirm="HStockPlaceNameScan"></uni-combox>
</view>
-<!-- <view class="righton" v-show="!showHStockPlaceName">
+ <!-- <view class="righton" v-show="!showHStockPlaceName">
<input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="涓嶅彲鎿嶄綔" />
</view> -->
</view>
@@ -353,7 +353,7 @@
HRedBlueFlag: false,
HBarCode: '',
- HQty: '',
+ HQty: '', // 鏁伴噺
HWHName: getUserInfo().HWHName,
HWHID: getUserInfo().HWhID,
HStockPlaceName: getUserInfo().HSPName,
@@ -368,11 +368,11 @@
HBillNo: '',
HInterID: '',
- HKeeperName: getUserInfo().HKeeper,
+ HKeeperName: getUserInfo().HKeeperName,
HKeeperID: getUserInfo().HKeeperID,
- HSecManagerName: getUserInfo().HSecManager,
+ HSecManagerName: getUserInfo().HSecManagerName,
HSecManagerID: getUserInfo().HSecManagerID,
- HDeptName: getUserInfo().HDept,
+ HDeptName: getUserInfo().HDeptName,
HDeptID: getUserInfo().HDeptID,
HSupName: '',
HSupID: '',
@@ -420,9 +420,11 @@
}
}
},
- onLoad(e) {
+ async onLoad(e) {
console.log(e, this.userInfo)
this.OperationType = e.OperationType
+ await this.GetSourceBillType()
+
if (e.HInterID) {
this.HInterID_Temp = e.HInterID
// this.btnType = 1
@@ -437,7 +439,6 @@
this.getHEmpList()
this.getHDeptList()
- this.GetSourceBillType()
this.getRelationStore()
uni.$on('BillSelectComplete', (e) => {
@@ -479,9 +480,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
@@ -492,7 +493,7 @@
icon: 'none'
})
}
-
+
} catch (err) {
uni.showToast({
title: '浠撲綅鏁版嵁璇锋眰澶辫触',
@@ -730,41 +731,46 @@
},
// 閫氳繃鍗曟嵁绫诲瀷鑾峰彇婧愬崟绫诲瀷
async GetSourceBillType() {
- CommonUtils.doRequest2({
- 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'])
- })
-
- this.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
- this.arrayHMainSourceBillValue.push('-1')
-
- this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
- this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
- } else {
- uni.showToast({
- icon: 'none',
- title: Message
- })
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Web/GetHSourceBillTypeByBillType',
+ data: {
+ HBillType: this.hform.HBillType,
+ Num: 2
}
- }
+ })
- })
+ 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')
+
+ this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
+ this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: Message
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: err
+ })
+ }
},
//婧愬崟璧勬枡
getHYDList() {
@@ -816,11 +822,11 @@
if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
this.showHStockPlaceName = true
this.getStockPlaceRemote(this.HWHNameList[i]["HSPGroupID"])
- }
+ }
}
}
},
- async getStockPlaceRemote(HSPGroupID){
+ async getStockPlaceRemote(HSPGroupID) {
try {
let res = await CommonUtils.doRequest2Async({
url: '/Gy_StockPlace/list',
@@ -830,7 +836,7 @@
Organization: uni.getStorageSync('Organization')
},
})
-
+
if (res.data.count == 1) {
this.HStockPlaceNameList = res.data.data
for (var i = 0; i < res.data.data.length; i++) {
@@ -842,7 +848,7 @@
icon: 'none'
})
}
-
+
} catch (err) {
uni.showToast({
title: '浠撲綅鏁版嵁璇锋眰澶辫触',
@@ -1627,6 +1633,7 @@
},
//淇敼鍥炲～鏁版嵁
RoadBillMain(HInterID) {
+ console.log('HInterID: ', HInterID);
uni.request({
url: this.serverUrl + '/WEBSController/GetSourceBill_Temp_Json',
data: {
@@ -1637,6 +1644,7 @@
console.log(33, res.data.data[0]);
if (res.data.count == 1) {
var data = res.data.data[0]
+ console.log('data: ', data);
this.hform.HInterID = data.HInterID
this.hform.HBillNo = data.HBillNo
this.hform.HMainSourceBillType = data.HSourceBillType
diff --git a/pages/simaheyi/BarCodeCheck_SN.vue b/pages/simaheyi/BarCodeCheck_SN.vue
index baa67c8..a03b968 100644
--- a/pages/simaheyi/BarCodeCheck_SN.vue
+++ b/pages/simaheyi/BarCodeCheck_SN.vue
@@ -5,7 +5,7 @@
<view class="title">鏍堟澘鐮�</view>
<!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
<view class="right" :class="disableBarCodePallet ? 'disabled' : ''">
- <input type="text" :focus="HBarCodePalletFocus" v-model="HBarCode_Pallet"
+ <input type="text" :focus="HBarCodePalletFocus" v-model="HBarCode_Pallet" v-on:click="selectAll"
@confirm="CheckBarcode(HBarCode_Pallet,1)" :disabled="disableBarCodePallet" />
</view>
<view class="right-icon">
@@ -18,7 +18,7 @@
<view class="title">鐩殑浠撶爜</view>
<!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
<view class="right" :class="disableBarCodeDest ? 'disabled' : ''">
- <input type="text" :focus="HBarCodeDestFocus" v-model="HBarCode_Destination"
+ <input type="text" :focus="HBarCodeDestFocus" v-model="HBarCode_Destination" v-on:click="selectAll"
@confirm="CheckBarcode(HBarCode_Destination,2)" :disabled="disableBarCodeDest" />
</view>
<view class="right-icon">
@@ -31,7 +31,7 @@
<view class="title">涓鐮�</view>
<!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
<view class="right" :class="disableBarCodeMiddle ? 'disabled' : ''">
- <input type="text" :focus="HBarCodeMiddleFocus" v-model="HBarCode_MiddleBox "
+ <input type="text" :focus="HBarCodeMiddleFocus" v-model="HBarCode_MiddleBox" v-on:click="selectAll"
@confirm="CheckBarcode(HBarCode_MiddleBox,3)" :disabled="disableBarCodeMiddle" />
</view>
<view class="right-icon">
@@ -44,7 +44,7 @@
<view class="title">浜у搧鐮�</view>
<!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
<view class="right" :class="disableBarCodeSN ? 'disabled' : ''">
- <input type="text" :focus="HBarCodeSNFocus" v-model="HBarCode_SN"
+ <input type="text" :focus="HBarCodeSNFocus" v-model="HBarCode_SN" v-on:click="selectAll"
@confirm="CheckBarcode(HBarCode_SN,4)" :disabled="disableBarCodeSN" />
</view>
<view class="right-icon">
@@ -235,6 +235,11 @@
// ==================== 鏂规硶 ====================
methods: {
+ //鐐瑰嚮鏂囨湰妗嗭紝鑷姩鍏ㄩ�夋枃鏈鍐呭
+ selectAll(e){
+ event.target.select();
+ },
+
// 澶嶉�夋鍙樺寲澶勭悊
checkboxGroupChangeHandler(e) {
let checkBoxValues = Array.from(e.detail.value)
@@ -326,7 +331,8 @@
HBarCodeType: HBarCodeType,
HInterID: this.hform.HInterID,
HBillNo: this.hform.HBillNo,
- HMaker: this.hform.HMaker
+ HMaker: this.hform.HMaker,
+ HBillType: "鍥涚爜鍚堜竴"
},
resFunction: (res) => {
let {
@@ -339,9 +345,11 @@
CommonUtils.playSound(1)
if(HBarCodeType == 1){
+ disableBarCodePallet: false, // 鏍堟澘鐮佺鐢ㄧ姸鎬�
//澶勭悊鎴愬姛鍚庤仛鐒﹀埌鐩殑浠撶爜杈撳叆妗�
this.HBarCodeDestFocusRefresh()
}else if(HBarCodeType == 2){
+ disableBarCodeDest: false, // 鐩殑浠撶爜绂佺敤鐘舵��
//澶勭悊鎴愬姛鍚庤仛鐒﹀埌涓鐮佽緭鍏ユ
this.HBarCodeMiddleFocusRefresh()
}else if(HBarCodeType == 3){
@@ -366,7 +374,15 @@
}
} else {
CommonUtils.playSound(0)
- this.HBarCodePalletFocusRefresh()
+ if(HBarCodeType == 1){
+ this.HBarCodePalletFocusRefresh()
+ }else if(HBarCodeType == 2){
+ this.HBarCodeDestFocusRefresh()
+ }else if(HBarCodeType == 3){
+ this.HBarCodeMiddleFocusRefresh()
+ }else if(HBarCodeType == 4){
+ this.HBarCodeSNFocusRefresh()
+ }
uni.showToast({
icon: 'none',
title: Message
@@ -630,7 +646,8 @@
url: '/CheckBarcodeController/Save_BarCode_BarcodeCheck',
data: {
"HInterID": this.hform.HInterID,
- "HBillNo": this.hform.HBillNo
+ "HBillNo": this.hform.HBillNo,
+ "HBillType": "鍥涚爜鍚堜竴"
},
resFunction: (res) => {
let {
@@ -659,6 +676,7 @@
}
})
} else {
+ this.EnableSubmit = true
uni.showToast({
icon: 'none',
title: Message
diff --git a/pages/tepidan/TePiDanEdit.vue b/pages/tepidan/TePiDanEdit.vue
new file mode 100644
index 0000000..57ba52e
--- /dev/null
+++ b/pages/tepidan/TePiDanEdit.vue
@@ -0,0 +1,742 @@
+<template>
+ <view class="container">
+ <view class="header">
+ <view class="title">鐗规壒鍗曟槑缁�</view>
+ <view class="sub-title">{{ HBillNo }}</view>
+ </view>
+ <!-- Tab鍒囨崲 -->
+ <view class="tab-container">
+ <view class="tabs">
+ <view
+ class="tab-item"
+ :class="{'active': currentTab === 0}"
+ @click="switchTab(0)"
+ >
+ 鍩烘湰淇℃伅
+ </view>
+ <view
+ class="tab-item"
+ :class="{'active': currentTab === 1}"
+ @click="switchTab(1)"
+ >
+ 瀹℃牳淇℃伅
+ </view>
+ <!-- <view
+ class="tab-item"
+ :class="{'active': currentTab === 2}"
+ @click="switchTab(2)"
+ >
+ 鐗╂枡淇℃伅
+ </view> -->
+ </view>
+ <view class="tab-indicator" :style="indicatorStyle"></view>
+ </view>
+
+ <scroll-view
+ scroll-y
+ class="content"
+ :style="{height: scrollHeight + 'px'}"
+ >
+ <!-- Tab 0: 鍩烘湰淇℃伅 -->
+ <view v-if="currentTab === 0" class="tab-content">
+ <view class="info-card">
+ <view class="card-title">璁㈠崟鍩烘湰淇℃伅</view>
+ <view class="info-grid">
+ <view class="info-item" v-if="orderInfo.鏃ユ湡">
+ <text class="label">鏃ユ湡锛�</text>
+ <text class="value">{{ orderInfo.鏃ユ湡 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.鍗曟嵁鍙�">
+ <text class="label">鍗曟嵁鍙凤細</text>
+ <text class="value">{{ orderInfo.鍗曟嵁鍙� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.鐘舵��">
+ <text class="label">鐘舵�侊細</text>
+ <text class="value">{{ orderInfo.鐘舵�� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.婧愬崟鍗曞彿">
+ <text class="label">婧愬崟鍗曞彿锛�</text>
+ <text class="value">{{ orderInfo.婧愬崟鍗曞彿 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.婧愬崟绫诲瀷">
+ <text class="label">婧愬崟绫诲瀷锛�</text>
+ <text class="value">{{ orderInfo.婧愬崟绫诲瀷 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.閿�鍞儴闂ㄤ唬鐮�">
+ <text class="label">閿�鍞儴闂ㄤ唬鐮侊細</text>
+ <text class="value">{{ orderInfo.閿�鍞儴闂ㄤ唬鐮� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.閿�鍞儴闂�">
+ <text class="label">閿�鍞儴闂細</text>
+ <text class="value">{{ orderInfo.閿�鍞儴闂� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.閿�鍞憳浠ｇ爜">
+ <text class="label">閿�鍞憳浠ｇ爜锛�</text>
+ <text class="value">{{ orderInfo.閿�鍞憳浠ｇ爜 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.閿�鍞憳">
+ <text class="label">閿�鍞憳锛�</text>
+ <text class="value">{{ orderInfo.閿�鍞憳 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.甯佸埆">
+ <text class="label">甯佸埆锛�</text>
+ <text class="value">{{ orderInfo.甯佸埆 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.姹囩巼">
+ <text class="label">姹囩巼锛�</text>
+ <text class="value">{{ orderInfo.姹囩巼 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.涓氬姟瀹㈡埛浠ｇ爜">
+ <text class="label">涓氬姟瀹㈡埛浠ｇ爜锛�</text>
+ <text class="value">{{ orderInfo.涓氬姟瀹㈡埛浠ｇ爜 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.涓氬姟瀹㈡埛">
+ <text class="label">涓氬姟瀹㈡埛锛�</text>
+ <text class="value">{{ orderInfo.涓氬姟瀹㈡埛 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.閿�鍞富绠′唬鐮�">
+ <text class="label">閿�鍞富绠′唬鐮侊細</text>
+ <text class="value">{{ orderInfo.閿�鍞富绠′唬鐮� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.閿�鍞富绠�">
+ <text class="label">閿�鍞富绠★細</text>
+ <text class="value">{{ orderInfo.閿�鍞富绠� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.鐢宠鍘熷洜">
+ <text class="label">鐢宠鍘熷洜锛�</text>
+ <text class="value">{{ orderInfo.鐢宠鍘熷洜 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.鏈鍙戣揣閲戦">
+ <text class="label">鏈鍙戣揣閲戦锛�</text>
+ <text class="value">{{ orderInfo.鏈鍙戣揣閲戦 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.搴旀敹娆句綑棰�">
+ <text class="label">搴旀敹娆句綑棰濓細</text>
+ <text class="value">{{ orderInfo.搴旀敹娆句綑棰� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.鏈鍙戣揣鏁伴噺">
+ <text class="label">鏈鍙戣揣鏁伴噺锛�</text>
+ <text class="value">{{ orderInfo.鏈鍙戣揣鏁伴噺 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.鏈�杩戝彂璐ф棩鏈�">
+ <text class="label">鏈�杩戝彂璐ф棩鏈燂細</text>
+ <text class="value">{{ orderInfo.鏈�杩戝彂璐ф棩鏈� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.鎵胯浠樻鏃ユ湡">
+ <text class="label">鎵胯浠樻鏃ユ湡锛�</text>
+ <text class="value">{{ orderInfo.鎵胯浠樻鏃ユ湡 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.榛勭嚎棰濆害">
+ <text class="label">榛勭嚎棰濆害锛�</text>
+ <text class="value">{{ orderInfo.榛勭嚎棰濆害 }}</text>
+ </view>
+ <view class="info-item full-width" v-if="orderInfo.绾㈢嚎棰濆害">
+ <text class="label">绾㈢嚎棰濆害锛�</text>
+ <text class="value">{{ orderInfo.绾㈢嚎棰濆害 }}</text>
+ </view>
+ </view>
+ </view>
+ </view>
+
+ <!-- Tab 1: 瀹℃牳淇℃伅 -->
+ <view v-if="currentTab === 1" class="tab-content">
+ <view class="info-card">
+ <view class="card-title">瀹℃壒娴佺▼淇℃伅</view>
+ <view class="info-grid">
+ <view class="info-item" v-if="orderInfo.鍒跺崟浜�">
+ <text class="label">鍒跺崟浜猴細</text>
+ <text class="value">{{ orderInfo.鍒跺崟浜� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.鍒跺崟鏃ユ湡">
+ <text class="label">鍒跺崟鏃ユ湡锛�</text>
+ <text class="value">{{ formatDate(orderInfo.鍒跺崟鏃ユ湡) }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.瀹℃牳浜�">
+ <text class="label">瀹℃牳浜猴細</text>
+ <text class="value">{{ orderInfo.瀹℃牳浜� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.瀹℃牳鏃ユ湡">
+ <text class="label">瀹℃牳鏃ユ湡锛�</text>
+ <text class="value">{{ formatDate(orderInfo.瀹℃牳鏃ユ湡) }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.淇敼浜�">
+ <text class="label">淇敼浜猴細</text>
+ <text class="value">{{ orderInfo.淇敼浜� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.淇敼鏃ユ湡">
+ <text class="label">淇敼鏃ユ湡锛�</text>
+ <text class="value">{{ formatDate(orderInfo.淇敼鏃ユ湡) }}</text>
+ </view>
+ </view>
+ </view>
+ </view>
+
+ <!-- Tab 2: 鐗╂枡淇℃伅 -->
+ <view v-if="currentTab === 2" class="tab-content">
+ <view class="material-list">
+ <view
+ v-for="(item, index) in materialList"
+ :key="index"
+ class="material-card"
+ >
+ <view class="material-header">
+ <text class="material-code">{{ item.鐗╂枡浠ｇ爜 || '鐗╂枡' + (index + 1) }}</text>
+ <text class="material-name">{{ item.鐗╂枡鍚嶇О }}</text>
+ </view>
+ <view class="material-info">
+ <view class="info-row">
+ <view class="info-col" v-if="item.瑙勬牸鍨嬪彿">
+ <text class="label">瑙勬牸鍨嬪彿锛�</text>
+ <text class="value">{{ item.瑙勬牸鍨嬪彿 }}</text>
+ </view>
+ <view class="info-col" v-if="item.璁￠噺鍗曚綅浠ｇ爜">
+ <text class="label">鍗曚綅浠ｇ爜锛�</text>
+ <text class="value">{{ item.璁￠噺鍗曚綅浠ｇ爜 }}</text>
+ </view>
+ <view class="info-col" v-if="item.璁￠噺鍗曚綅">
+ <text class="label">鍗曚綅锛�</text>
+ <text class="value">{{ item.璁￠噺鍗曚綅 }}</text>
+ </view>
+ <view class="info-col" v-if="item.鍏嬮噸">
+ <text class="label">鍏嬮噸锛�</text>
+ <text class="value">{{ item.鍏嬮噸 }}</text>
+ </view>
+ <view class="info-col" v-if="item.骞呭">
+ <text class="label">骞呭锛�</text>
+ <text class="value">{{ item.骞呭 }}</text>
+ </view>
+ <view class="info-col" v-if="鏌撹壊瑕佹眰">
+ <text class="label">鏌撹壊瑕佹眰锛�</text>
+ <text class="value">{{ item.鏌撹壊瑕佹眰 }}</text>
+ </view>
+ <view class="info-col" v-if="鐧藉澂瑕佹眰">
+ <text class="label">鐧藉澂瑕佹眰锛�</text>
+ <text class="value">{{ item.鐧藉澂瑕佹眰 }}</text>
+ </view>
+ </view>
+
+ <view class="info-row">
+ <view class="info-col" v-if="item.鎵瑰彿">
+ <text class="label">鎵瑰彿锛�</text>
+ <text class="value">{{ item.鎵瑰彿 }}</text>
+ </view>
+ <view class="info-col" v-if="item.鏁伴噺">
+ <text class="label">鏁伴噺锛�</text>
+ <text class="value">{{ item.鏁伴噺 }}</text>
+ </view>
+ <view class="info-col" v-if="item.鐢熶骇鍏ュ簱鏁伴噺">
+ <text class="label">鐢熶骇鍏ュ簱鏁伴噺锛�</text>
+ <text class="value">{{ item.鐢熶骇鍏ュ簱鏁伴噺 }}</text>
+ </view>
+ <view class="info-col" v-if="item.寮�绁ㄦ暟閲�">
+ <text class="label">寮�绁ㄦ暟閲忥細</text>
+ <text class="value">{{ item.寮�绁ㄦ暟閲� }}</text>
+ </view>
+ </view>
+
+ <view class="info-row">
+ <view class="info-col" v-if="item.鍏宠仈鏁伴噺">
+ <text class="label">鍏宠仈鏁伴噺锛�</text>
+ <text class="value">{{ item.鍏宠仈鏁伴噺 }}</text>
+ </view>
+ <view class="info-col" v-if="item.鏈叧鑱旀暟閲�">
+ <text class="label">鏈叧鑱旀暟閲忥細</text>
+ <text class="value">{{ item.鏈叧鑱旀暟閲� }}</text>
+ </view>
+ </view>
+
+ <view class="info-row">
+ <view class="info-col" v-if="item.鍚◣鍗曚环">
+ <text class="label">鍚◣鍗曚环锛�</text>
+ <text class="value">{{ item.鍚◣鍗曚环 }}</text>
+ </view>
+ <view class="info-col" v-if="item.鎶樻墸鐜�">
+ <text class="label">鎶樻墸鐜囷細</text>
+ <text class="value">{{ item.鎶樻墸鐜� }}</text>
+ </view>
+ <view class="info-col" v-if="item.瀹為檯鍚◣鍗曚环">
+ <text class="label">瀹為檯鍗曚环锛�</text>
+ <text class="value">{{ item.瀹為檯鍚◣鍗曚环 }}</text>
+ </view>
+ </view>
+
+ <view class="info-row">
+ <view class="info-col" v-if="item.鍗曚环">
+ <text class="label">鍗曚环锛�</text>
+ <text class="value">{{ item.鍗曚环 }}</text>
+ </view>
+ <view class="info-col" v-if="item.閲戦">
+ <text class="label">閲戦锛�</text>
+ <text class="value">{{ item.閲戦 }}</text>
+ </view>
+ <view class="info-col" v-if="item.閿�鍞嚭搴撳鏍搁噾棰�">
+ <text class="label">閿�鍞嚭搴撳鏍搁噾棰濓細</text>
+ <text class="value">{{ item.閿�鍞嚭搴撳鏍搁噾棰� }}</text>
+ </view>
+ <view class="info-col" v-if="item.閿�鍞嚭搴撳鏍搁噾棰�">
+ <text class="label">閿�鍞嚭搴撳鏍搁噾棰濓細</text>
+ <text class="value">{{ item.閿�鍞嚭搴撳鏍搁噾棰� }}</text>
+ </view>
+ <view class="info-col" v-if="item.閿�鍞��搴撴暟閲�">
+ <text class="label">閿�鍞��搴撴暟閲忥細</text>
+ <text class="value">{{ item.閿�鍞��搴撴暟閲� }}</text>
+ </view>
+ <view class="info-col" v-if="item.閿�鍞��搴撳鏍告暟閲�">
+ <text class="label">閿�鍞��搴撳鏍告暟閲忥細</text>
+ <text class="value">{{ item.閿�鍞��搴撳鏍告暟閲� }}</text>
+ </view>
+ <view class="info-col" v-if="item.鏄惁涓嬫帹鐢熶骇璁㈠崟">
+ <text class="label">鏄惁涓嬫帹鐢熶骇璁㈠崟锛�</text>
+ <text class="value">{{ item.鏄惁涓嬫帹鐢熶骇璁㈠崟 }}</text>
+ </view>
+ </view>
+
+ <view class="info-row">
+ <view class="info-col" v-if="item.瀹㈡埛鐗╂枡缂栫爜">
+ <text class="label">瀹㈡埛鐗╂枡缂栫爜锛�</text>
+ <text class="value">{{ item.瀹㈡埛鐗╂枡缂栫爜 }}%</text>
+ </view>
+ <view class="info-col" v-if="item.瀹㈡埛瑙勬牸鍨嬪彿">
+ <text class="label">瀹㈡埛瑙勬牸鍨嬪彿锛�</text>
+ <text class="value">{{ item.瀹㈡埛瑙勬牸鍨嬪彿 }}%</text>
+ </view>
+ <view class="info-col" v-if="item.瀹㈡埛鐗╂枡鍚嶇О">
+ <text class="label">瀹㈡埛鐗╂枡鍚嶇О锛�</text>
+ <text class="value">{{ item.瀹㈡埛鐗╂枡鍚嶇О }}%</text>
+ </view>
+ <view class="info-col" v-if="item.鏄惁鍙栧簱瀛�">
+ <text class="label">鏄惁鍙栧簱瀛橈細</text>
+ <text class="value">{{ item.鏄惁鍙栧簱瀛� }}%</text>
+ </view>
+ <view class="info-col" v-if="item.鍓╀綑璁㈤噾">
+ <text class="label">鍓╀綑璁㈤噾锛�</text>
+ <text class="value">{{ item.鍓╀綑璁㈤噾 }}%</text>
+ </view>
+ <view class="info-col" v-if="item.鎶ュ簾鏁伴噺">
+ <text class="label">鎶ュ簾鏁伴噺锛�</text>
+ <text class="value">{{ item.鎶ュ簾鏁伴噺 }}%</text>
+ </view>
+ <view class="info-col" v-if="item.鐢熶骇鍏ュ簱鏁伴噺">
+ <text class="label">鐢熶骇鍏ュ簱鏁伴噺锛�</text>
+ <text class="value">{{ item.鐢熶骇鍏ュ簱鏁伴噺 }}%</text>
+ </view>
+ <!-- -->
+ <view class="info-col" v-if="item.绋庣巼">
+ <text class="label">绋庣巼锛�</text>
+ <text class="value">{{ item.绋庣巼 }}%</text>
+ </view>
+ <view class="info-col" v-if="item.绋庨">
+ <text class="label">绋庨锛�</text>
+ <text class="value">{{ item.绋庨 }}</text>
+ </view>
+ <view class="info-col" v-if="item.浠风◣鍚堣">
+ <text class="label">浠风◣鍚堣锛�</text>
+ <text class="value">{{ item.浠风◣鍚堣 }}</text>
+ </view>
+ </view>
+
+ <view class="info-row" v-if="item.浜よ揣鏃ユ湡">
+ <view class="info-col full-width">
+ <text class="label">浜よ揣鏃ユ湡锛�</text>
+ <text class="value">{{ item.浜よ揣鏃ユ湡 }}</text>
+ </view>
+ </view>
+ <view class="info-row" v-if="item.鎶曟枡">
+ <view class="info-col full-width">
+ <text class="label">鎶曟枡锛�</text>
+ <text class="value">{{ item.鎶曟枡 }}</text>
+ </view>
+ </view>
+ <view class="info-row" v-if="item.娣卞姞宸�">
+ <view class="info-col full-width">
+ <text class="label">娣卞姞宸ワ細</text>
+ <text class="value">{{ item.娣卞姞宸� }}</text>
+ </view>
+ </view>
+ </view>
+ </view>
+
+ <view v-if="materialList.length === 0" class="empty-state">
+ <uni-icons type="list" size="50" color="#ccc"></uni-icons>
+ <text class="empty-text">鏆傛棤鐗╂枡淇℃伅</text>
+ </view>
+ </view>
+ </view>
+ </scroll-view>
+
+ <view class="footer">
+ <button class="back-btn" @click="goBack">杩斿洖</button>
+ </view>
+
+ <uni-load-more v-if="loading" status="loading" :content-text="loadingText"></uni-load-more>
+ </view>
+</template>
+
+<script>
+ import { CommonUtils } from '@/utils/common.js'
+ import { getUserInfo } from "../../utils/auth";
+
+ export default {
+ data() {
+ return {
+ // 鍙傛暟
+ linterid: '',
+ HBillNo: '',
+
+
+ currentTab: 0,
+ scrollHeight: 0,
+ loading: false,
+ loadingText: {
+ contentdown: '涓婃媺鏄剧ず鏇村',
+ contentrefresh: '姝ｅ湪鍔犺浇...',
+ contentnomore: '娌℃湁鏇村鏁版嵁浜�'
+ },
+
+
+ orderInfo: {},
+ materialList: [],
+ allData: [],
+ }
+ },
+ computed: {
+ indicatorStyle() {
+ const tabWidth = 100 / 3;
+ return {
+ width: tabWidth + '%',
+ transform: `translateX(${this.currentTab * 100}%)`
+ };
+ }
+ },
+ onLoad(options) {
+ if (options.linterid && options.HBillNo) {
+ this.linterid = options.linterid;
+ this.HBillNo = options.HBillNo;
+ this.loadOrderDetail();
+ } else {
+ uni.showToast({
+ title: '鍙傛暟閿欒',
+ icon: 'error'
+ });
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 1500);
+ }
+
+ // 璁＄畻婊氬姩鍖哄煙楂樺害
+ this.calcScrollHeight();
+ },
+ onReady() {
+
+ uni.onWindowResize(() => {
+ this.calcScrollHeight();
+ });
+ },
+ methods: {
+
+ calcScrollHeight() {
+ const systemInfo = uni.getSystemInfoSync();
+ const windowHeight = systemInfo.windowHeight;
+ const query = uni.createSelectorQuery().in(this);
+ query.select('.header').boundingClientRect();
+ query.select('.tab-container').boundingClientRect();
+ query.select('.footer').boundingClientRect();
+ query.exec((res) => {
+ if (res[0] && res[1] && res[2]) {
+ const headerHeight = res[0].height;
+ const tabHeight = res[1].height;
+ const footerHeight = res[2].height;
+ const margin = 5; // 瀹夊叏杈硅窛
+
+ this.scrollHeight = windowHeight - headerHeight - tabHeight - footerHeight - margin;
+ }
+ });
+ },
+
+
+ switchTab(index) {
+ this.currentTab = index;
+ },
+
+
+ loadOrderDetail() {
+ this.loading = true;
+
+
+ const sWhere = ` and hmainid = '${this.linterid}'`;
+
+ CommonUtils.doRequest2({
+ url: '/Xs_ExceptiveCheckRequestBill/list',
+ data: {
+ sWhere: sWhere,
+ user: getUserInfo()["Czymc"],
+ // Organization:getUserInfo()["Organization"],
+ // page:1,
+ // size:50
+ },
+ resFunction: (res) => {
+ this.loading = false;
+
+ if (res.data.Message === "鏃犳煡鐪嬫潈闄愶紒") {
+ uni.showToast({
+ icon: 'none',
+ title: res.data.Message
+ });
+ return;
+ }
+
+ if (res.data.code === "1" && res.data.data && res.data.data.length > 0) {
+ this.allData = res.data.data;
+
+ this.orderInfo = { ...this.allData[0] };
+
+ this.materialList = this.allData;
+
+
+ if (!this.orderInfo.鍗曟嵁鍙� && this.HBillNo) {
+ this.orderInfo.鍗曟嵁鍙� = this.HBillNo;
+ }
+ } else {
+ uni.showToast({
+ title: '鏈壘鍒拌鍗曚俊鎭�',
+ icon: 'none'
+ });
+ }
+ },
+ errFunction: (err) => {
+ this.loading = false;
+ uni.showToast({
+ title: '鍔犺浇澶辫触',
+ icon: 'error'
+ });
+ console.error('鍔犺浇璁㈠崟璇︽儏澶辫触:', err);
+ }
+ });
+ },
+
+
+ formatDate(dateStr) {
+ if (!dateStr) return '';
+
+ if (dateStr.length >= 10) {
+ return dateStr.substr(0, 10);
+ }
+ return dateStr;
+ },
+
+ // 杩斿洖涓婁竴椤�
+ goBack() {
+ uni.navigateBack();
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .container {
+ display: flex;
+ flex-direction: column;
+ height: 100vh;
+ background-color: #f5f5f5;
+ }
+
+ .header {
+ padding: 30rpx;
+ background: linear-gradient(135deg, #3a78ff 0%, #5a9cff 100%);
+ color: white;
+ text-align: center;
+
+ .title {
+ font-size: 36rpx;
+ font-weight: bold;
+ margin-bottom: 10rpx;
+ }
+
+ .sub-title {
+ font-size: 28rpx;
+ opacity: 0.9;
+ }
+ }
+
+ .tab-container {
+ background-color: white;
+ position: relative;
+ box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+
+ .tabs {
+ display: flex;
+
+ .tab-item {
+ flex: 1;
+ text-align: center;
+ padding: 25rpx 0;
+ font-size: 30rpx;
+ color: #666;
+ transition: all 0.3s;
+
+ &.active {
+ color: #3a78ff;
+ font-weight: bold;
+ }
+ }
+ }
+
+ .tab-indicator {
+ height: 4rpx;
+ background-color: #3a78ff;
+ transition: transform 0.3s ease;
+ }
+ }
+
+ .content {
+ flex: 1;
+ }
+
+ .tab-content {
+ padding: 20rpx;
+ }
+
+ .info-card {
+ background-color: white;
+ border-radius: 16rpx;
+ padding: 30rpx;
+ margin-bottom: 20rpx;
+ box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
+
+ .card-title {
+ font-size: 32rpx;
+ font-weight: bold;
+ color: #333;
+ margin-bottom: 30rpx;
+ padding-bottom: 15rpx;
+ border-bottom: 1rpx solid #eee;
+ }
+
+ .info-grid {
+ display: flex;
+ flex-wrap: wrap;
+
+ .info-item {
+ width: 50%;
+ margin-bottom: 25rpx;
+
+ &.full-width {
+ width: 100%;
+ }
+
+ .label {
+ color: #666;
+ font-size: 28rpx;
+ margin-right: 10rpx;
+ }
+
+ .value {
+ color: #333;
+ font-size: 28rpx;
+ font-weight: 500;
+ word-break: break-all;
+ }
+ }
+ }
+ }
+
+ .material-list {
+ .material-card {
+ background-color: white;
+ border-radius: 16rpx;
+ margin-bottom: 20rpx;
+ padding: 30rpx;
+ box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
+
+ .material-header {
+ display: flex;
+ align-items: center;
+ margin-bottom: 25rpx;
+ padding-bottom: 15rpx;
+ border-bottom: 1rpx solid #eee;
+
+ .material-code {
+ font-size: 30rpx;
+ font-weight: bold;
+ color: #3a78ff;
+ margin-right: 20rpx;
+ background-color: #f0f7ff;
+ padding: 5rpx 15rpx;
+ border-radius: 8rpx;
+ }
+
+ .material-name {
+ font-size: 28rpx;
+ color: #333;
+ flex: 1;
+ }
+ }
+
+ .material-info {
+ .info-row {
+ display: flex;
+ flex-wrap: wrap;
+ margin-bottom: 15rpx;
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+
+ .info-col {
+ width: 50%;
+ margin-bottom: 10rpx;
+
+ &.full-width {
+ width: 100%;
+ }
+
+ .label {
+ color: #888;
+ font-size: 26rpx;
+ margin-right: 8rpx;
+ }
+
+ .value {
+ color: #333;
+ font-size: 26rpx;
+ font-weight: 500;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ .empty-state {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ padding: 100rpx 0;
+
+ .empty-text {
+ color: #999;
+ font-size: 28rpx;
+ margin-top: 20rpx;
+ }
+ }
+
+ .footer {
+ padding: 20rpx 30rpx;
+ background-color: white;
+ border-top: 1rpx solid #eee;
+
+ .back-btn {
+ background-color: #3a78ff;
+ color: white;
+ border-radius: 50rpx;
+ height: 80rpx;
+ line-height: 80rpx;
+ font-size: 32rpx;
+
+ &:active {
+ background-color: #2c5fcc;
+ }
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/pages/tepidan/TePiDanList.vue b/pages/tepidan/TePiDanList.vue
new file mode 100644
index 0000000..6f2098a
--- /dev/null
+++ b/pages/tepidan/TePiDanList.vue
@@ -0,0 +1,602 @@
+<template>
+ <view>
+ <view class="page-header">
+ <view class="search-item">
+ <view class="left">鏃ユ湡闂撮殧</view>
+ <view class="right">
+ <picker mode="selector" :value="curDateGap" :range="dateRangePicker"
+ @change="onDateRangePickerChangeHandler">
+ <input disabled v-model="curDateGap" placeholder="璇烽�夋嫨鏃ユ湡闂撮殧" />
+ <view class="picker-overlay"></view>
+ </picker>
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">寮�濮嬫棩鏈�</view>
+ <view class="right">
+ <uni-datetime-picker :clear-icon="false" type="date" v-model="startDate"
+ :disabled="!enableCustomDateRange">
+ <view class="datetime-picker-inner"
+ :class="enableCustomDateRange?'font__enable':'font__disable'">
+ <text>{{ startDate }}</text>
+ </view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">缁撴潫鏃ユ湡</view>
+ <view class="right">
+ <uni-datetime-picker :clear-icon="false" type="date" v-model="endDate"
+ :disabled="!enableCustomDateRange">
+ <view class="datetime-picker-inner"
+ :class="enableCustomDateRange?'font__enable':'font__disable'">{{ endDate }}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">鍗曟嵁鍙�</view>
+ <view class="right">
+ <input type="text" auto-focus v-model="HBillNo" />
+ </view>
+ </view>
+
+ <view class="button-groups">
+ <!-- <button type="default" size="mini" class="btn-b" @tap.stop="onAddClickHandler">鏂板</button> -->
+ <button type="default" size="mini" class="btn-c" @tap.stop="onSearchClickHandler">鏌ヨ</button>
+ <button type="default" size="mini" class="btn-a" @tap.stop="onResetClickHandler">閲嶇疆</button>
+ </view>
+ </view>
+ <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+ <scroll-view id="pageContent" scroll-y class="page-content" :style="{height: pageContentHeight + 'px'}">
+ <view v-for="(item,index) in listData" :key="index">
+ <uni-card :title="item.婧愬崟鍗曞彿" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+ @tap="showDetail = showDetail==index?-1:index">
+ <view class="card-detail">
+
+ <view class="detail" v-if="item.婧愬崟绫诲瀷">
+ <text>婧愬崟绫诲瀷锛�</text>{{item.婧愬崟绫诲瀷}}
+ </view>
+ <view class="detail" v-if="item.鐘舵��">
+ <text>鐘舵�侊細</text>{{item.鐘舵�亇}
+ </view>
+ <view class="detail" v-if="item.鏃ユ湡">
+ <text>鏃ユ湡锛�</text>{{item.鏃ユ湡}}
+ </view>
+ <view class="detail" v-if="item.閿�鍞儴闂ㄤ唬鐮�">
+ <text>閿�鍞儴闂ㄤ唬鐮侊細</text>{{item.閿�鍞儴闂ㄤ唬鐮亇}
+ </view>
+ <view class="detail" v-if="item.閿�鍞儴闂�">
+ <text>閿�鍞儴闂細</text>{{item.閿�鍞儴闂▆}
+ </view>
+ <view class="detail" v-if="item.閿�鍞憳浠ｇ爜">
+ <text>閿�鍞憳浠ｇ爜锛�</text>{{item.閿�鍞憳浠ｇ爜}}
+ </view>
+ <view class="detail" v-if="item.閿�鍞憳">
+ <text>閿�鍞憳锛�</text>{{item.閿�鍞憳}}
+ </view>
+ <view class="detail" v-if="item.涓氬姟瀹㈡埛">
+ <text>涓氬姟瀹㈡埛锛�</text>{{item.涓氬姟瀹㈡埛}}
+ </view>
+ <view class="detail" v-if="item.甯佸埆">
+ <text>甯佸埆锛�</text>{{item.甯佸埆}}
+ </view>
+ <view class="detail" v-if="item.姹囩巼">
+ <text>姹囩巼锛�</text>{{item.姹囩巼}}
+ </view>
+ <!-- -->
+ <view class="detail" v-if="item.閿�鍞富绠�">
+ <text>閿�鍞富绠★細</text>{{item.閿�鍞富绠}
+ </view>
+ <view class="detail" v-if="item.鐢宠鍘熷洜">
+ <text>鐢宠鍘熷洜锛�</text>{{item.鐢宠鍘熷洜}}
+ </view>
+ <view class="detail" v-if="item.鏈鍙戣揣閲戦">
+ <text>鏈鍙戣揣閲戦锛�</text>{{item.鏈鍙戣揣閲戦}}
+ </view>
+ <view class="detail" v-if="item.搴旀敹娆句綑棰�">
+ <text>搴旀敹娆句綑棰濓細</text>{{item.搴旀敹娆句綑棰潁}
+ </view>
+
+ <view class="detail" v-if="item.鏈鍙戣揣鏁伴噺">
+ <text>鏈鍙戣揣鏁伴噺锛�</text>{{item.鏈鍙戣揣鏁伴噺}}
+ </view>
+ <view class="detail" v-if="item.鏈�杩戝彂璐ф棩鏈�">
+ <text>鏈�杩戝彂璐ф棩鏈燂細</text>{{item.鏈�杩戝彂璐ф棩鏈焳}
+ </view>
+ <view class="detail" v-if="item.鎵胯浠樻鏃ユ湡">
+ <text>鎵胯浠樻鏃ユ湡锛�</text>{{item.鎵胯浠樻鏃ユ湡}}
+ </view>
+ <view class="detail" v-if="item.榛勭嚎棰濆害">
+ <text>榛勭嚎棰濆害锛�</text>{{item.榛勭嚎棰濆害}}
+ </view>
+ <view class="detail" v-if="item.绾㈢嚎棰濆害">
+ <text>绾㈢嚎棰濆害锛�</text>{{item.绾㈢嚎棰濆害}}
+ </view>
+ </view>
+ <view class="card-detail" v-if="showDetail == index">
+ <view class="detail" v-if="item.鍒跺崟浜�">
+ <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ </view>
+ <view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+ <text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.瀹℃牳浜�">
+ <text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
+ </view>
+ <view class="detail" v-if="item.瀹℃牳鏃ユ湡">
+ <text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.淇敼浜�">
+ <text>淇敼浜猴細</text>{{item.淇敼浜簘}
+ </view>
+ <view class="detail" v-if="item.淇敼鏃ユ湡">
+ <text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.鍏抽棴浜�">
+ <text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
+ </view>
+ <view class="detail" v-if="item.鍏抽棴鏃ユ湡">
+ <text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.浣滃簾浜�">
+ <text>浣滃簾浜猴細</text>{{item.浣滃簾浜簘}
+ </view>
+ <view class="detail" v-if="item.浣滃簾鏃ユ湡">
+ <text>浣滃簾鏃ユ湡锛�</text>{{item.浣滃簾鏃ユ湡.substr(0,10)}}
+ </view>
+ </view>
+
+
+ <view class="more" v-if="showDetail == index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="more" v-if="showDetail != index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+
+ <view class="op" v-if="operations == index">
+ <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+ <button class="op6" size="mini" plain @tap.stop="Browse(item)">鏌ョ湅鏄庣粏</button>
+ <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+ </scroll-view>
+ <!-- 鍒嗛〉鍣� -->
+ <view class="page-footer">
+ <uni-pagination id="pagination" title="鏍囬鏂囧瓧" v-model="pageMeta.curPage" :pageSize="pageMeta.size"
+ :total="pageMeta.total" @change="onPageChangeHandler"></uni-pagination>
+ </view>
+ </view>
+</template>
+
+<script>
+ import dayjs from 'dayjs'
+ import {
+ CommonUtils
+ } from '@/utils/common.js'
+ import {
+ getUserInfo
+ } from "../../utils/auth";
+ export default {
+ data() {
+ return {
+ // 璁＄畻鍗＄墖鍒楄〃楂樺害
+ pagination_top: 0,
+ pageContent_top: 0,
+ // 鍒嗛〉鎺у埗
+ pageMeta: {
+ curPage: 1,
+ size: 50,
+ total: 0,
+ },
+ // 婊氬姩鎺у埗
+ scrollTop: 0,
+ old: {
+ scrollTop: 0
+ },
+
+ dateRangePicker: ["浠绘剰闂撮殧", "浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"],
+ curDateGap: "杩戜竷澶�",
+ enableCustomDateRange: false,
+ startDate: dayjs(new Date()).subtract(7, 'day').format('YYYY-MM-DD'),
+ endDate: dayjs(new Date()).format('YYYY-MM-DD'),
+ HBillNo: '',
+
+ listData: [],
+ showDetail: -1,
+ operations: -1,
+ }
+ },
+ computed: {
+ pageContentHeight: {
+ get() {
+ return (this.pagination_top - this.pageContent_top)
+ }
+ },
+ },
+ onLoad() {
+ this.onSearchClickHandler()
+ },
+ onPullDownRefresh() {
+ this.onSearchClickHandler()
+ },
+ async onReady() {
+ // #ifndef MP-WEIXIN
+ let query = uni.createSelectorQuery().in(this)
+ query.select("#pagination")
+ .boundingClientRect((data) => {
+ if (data) {
+ this.pagination_top = data.top
+ } else {
+ console.log("鏈壘鍒�#pagination鑺傜偣");
+ }
+ })
+ .exec();
+ query.select("#pageContent")
+ .boundingClientRect((data) => {
+ if (data) {
+ this.pageContent_top = data.top
+ } else {
+ console.log("鏈壘鍒�#pageContent鑺傜偣");
+ }
+ })
+ .exec();
+ // #endif
+
+ },
+ methods: {
+ goTop: function(e) {
+ // 瑙ｅ喅view灞備笉鍚屾鐨勯棶棰�
+ this.scrollTop = this.old.scrollTop
+ this.$nextTick(function() {
+ this.scrollTop = 0
+ });
+ },
+ onDateRangePickerChangeHandler({
+ detail
+ }) {
+ this.enableCustomDateRange = false
+ this.curDateGap = this.dateRangePicker[detail.value]
+ let date = new Date()
+ switch (this.curDateGap) {
+ case "浠婂ぉ":
+ this.startDate = dayjs(date).format("YYYY-MM-DD")
+ break;
+ case "杩戜竴澶�":
+ this.startDate = dayjs(date).subtract(1, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜袱澶�":
+ this.startDate = dayjs(date).subtract(2, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜笁澶�":
+ this.startDate = dayjs(date).subtract(3, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戝洓澶�":
+ this.startDate = dayjs(date).subtract(4, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜簲澶�":
+ this.startDate = dayjs(date).subtract(5, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戝叚澶�":
+ this.startDate = dayjs(date).subtract(6, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜竷澶�":
+ this.startDate = dayjs(date).subtract(7, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩�30澶�":
+ this.startDate = dayjs(date).subtract(30, 'day').format("YYYY-MM-DD")
+ break;
+ }
+ if (this.curDateGap == '浠绘剰闂撮殧') {
+ this.enableCustomDateRange = true
+ }
+ },
+ onSearchClickHandler() {
+ let sWhere = ""
+ if (this.startDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.startDate + "'";
+ }
+ if (this.endDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.endDate + "'";
+ }
+ if (this.HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + this.HBillNo + "%'";
+ }
+ this.get_DisplayPage(sWhere);
+ },
+ clear() {
+ this.curDateGap = "杩戜竷澶�"
+ this.enableCustomDateRange = false
+ this.startDate = dayjs(new Date()).subtract(7, 'day').format('YYYY-MM-DD')
+ this.endDate = dayjs(new Date()).format('YYYY-MM-DD')
+ this.HBillNo = ''
+ },
+ async onResetClickHandler() {
+ this.clear()
+ await this.$nextTick()
+ this.onSearchClickHandler()
+ },
+ get_DisplayPage(sWhere) {
+ CommonUtils.doRequest2({
+ url: '/Xs_ExceptiveCheckRequestBill/list',
+ data: {
+ "sWhere": sWhere,
+ "user": getUserInfo()["Czymc"],
+
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ console.log('res.data: ', res.data);
+ if(res.data.Message=="鏃犳煡鐪嬫潈闄愶紒")
+ {
+ uni.showToast({
+ icon: 'none',
+ title: res.data.Message
+ })
+ return;
+ }
+ this.listData = data;
+ this.pageMeta.total = count
+ uni.stopPullDownRefresh()
+ }
+ })
+ },
+ onPageChangeHandler() {
+ this.onSearchClickHandler()
+ this.goTop()
+ },
+ // 鏂板
+ onAddClickHandler() {
+ uni.navigateTo({
+ url: "/pages/EmployeeRecords/EmployeeRecordsBill?operationType=1"
+ })
+ },
+ //鍒犻櫎鐐规璁板綍鍗�
+ del(item) {
+ console.log(item);
+ uni.showModal({
+ title: '鍒犻櫎纭',
+ content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ CommonUtils.doRequest2({
+ url: '/Xs_ExceptiveCheckRequestBill/delete',
+ data: {
+ HItemID: item['HInterID'],
+ user: getUserInfo()['Czymc']
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ uni.showToast({
+ icon: count === 1 ? 'success' : 'error',
+ title: Message,
+ duration: 2000
+ });
+
+ // 绛夊緟鎻愮ず鏄剧ず瀹屾垚鍐嶅埛鏂�
+ setTimeout(() => {
+ this.onSearchClickHandler();
+ }, 2000);
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
+ });
+ },
+ Browse(item)
+ {
+ console.log(item)
+ uni.navigateTo({
+ url: '/pages/tepidan/TePiDanEdit?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
+ })
+ }
+ },
+ }
+</script>
+
+<style lang="scss">
+ .page-header {
+ display: flex;
+ box-sizing: border-box;
+ padding: 20rpx;
+ flex-direction: column;
+ gap: 10rpx;
+ font-size: 32rpx;
+
+ .search-item {
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: center;
+ align-items: center;
+
+ .left {
+ width: 4em;
+ }
+
+ .right {
+ flex: 1;
+ position: relative;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ display: flex;
+ padding: 4rpx 10rpx;
+
+ picker {
+ width: 100%;
+ }
+ }
+ }
+
+ input {
+ width: inherit;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+
+ .datetime-picker-inner {
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ display: flex;
+ align-items: center;
+ }
+
+ .font__enable {
+ color: #000;
+ }
+
+ .font__disable {
+ color: #cccccc;
+ }
+ }
+
+ .button-groups {
+ box-sizing: border-box;
+ padding: 10rpx 0 0 0;
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: space-between;
+
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+
+ .btn-a {
+ background-color: #acacac;
+ color: #fff;
+ }
+
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+ }
+
+ .page-content {
+ // height: 40vh;
+ box-sizing: border-box;
+ padding: 10rpx 0;
+
+ .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;
+ }
+ }
+
+ .op {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 20rpx;
+
+ button {
+ padding: 0;
+ width: 150rpx;
+ font-size: 25rpx;
+ }
+
+ .op1 {
+ border: 1px solid #41a863;
+ color: #41a863;
+ }
+
+ .op2 {
+ border: 1px solid #d98d00;
+ color: #d98d00;
+ }
+
+ .op3 {
+ border: 1px solid #3a78ff;
+ color: #3a78ff;
+ }
+
+ .op4 {
+ border: 1px solid #da0000;
+ color: #da0000;
+ }
+
+ .op5 {
+ border: 1px solid #888;
+ color: #888;
+ }
+ }
+ }
+
+ .page-footer {
+ position: fixed;
+ bottom: 0;
+ width: 100%;
+ box-sizing: border-box;
+ padding: 32rpx 40rpx;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/xiaoshouchuku/SellOutBill.vue b/pages/xiaoshouchuku/SellOutBill.vue
index 7237dfc..f32018e 100644
--- a/pages/xiaoshouchuku/SellOutBill.vue
+++ b/pages/xiaoshouchuku/SellOutBill.vue
@@ -383,11 +383,11 @@
HBillNo: '',
HInterID: '',
- HKeeperName: getUserInfo().HKeeper,
+ HKeeperName: getUserInfo().HKeeperName,
HKeeperID: getUserInfo().HKeeperID,
- HSecManagerName: getUserInfo().HSecManager,
+ HSecManagerName: getUserInfo().HSecManagerName,
HSecManagerID: getUserInfo().HSecManagerID,
- HDeptName: getUserInfo().HDept,
+ HDeptName: getUserInfo().HDeptName,
HDeptID: getUserInfo().HDeptID,
HSupName: '',
HSupID: '',
diff --git a/pages/xiaoshoudingdan/xiaoshoudingdanBillList.vue b/pages/xiaoshoudingdan/xiaoshoudingdanBillList.vue
new file mode 100644
index 0000000..2b089a6
--- /dev/null
+++ b/pages/xiaoshoudingdan/xiaoshoudingdanBillList.vue
@@ -0,0 +1,604 @@
+<template>
+ <view>
+ <view class="page-header">
+ <view class="search-item">
+ <view class="left">鏃ユ湡闂撮殧</view>
+ <view class="right">
+ <picker mode="selector" :value="curDateGap" :range="dateRangePicker"
+ @change="onDateRangePickerChangeHandler">
+ <input disabled v-model="curDateGap" placeholder="璇烽�夋嫨鏃ユ湡闂撮殧" />
+ <view class="picker-overlay"></view>
+ </picker>
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">寮�濮嬫棩鏈�</view>
+ <view class="right">
+ <uni-datetime-picker :clear-icon="false" type="date" v-model="startDate"
+ :disabled="!enableCustomDateRange">
+ <view class="datetime-picker-inner"
+ :class="enableCustomDateRange?'font__enable':'font__disable'">
+ <text>{{ startDate }}</text>
+ </view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">缁撴潫鏃ユ湡</view>
+ <view class="right">
+ <uni-datetime-picker :clear-icon="false" type="date" v-model="endDate"
+ :disabled="!enableCustomDateRange">
+ <view class="datetime-picker-inner"
+ :class="enableCustomDateRange?'font__enable':'font__disable'">{{ endDate }}</view>
+ </uni-datetime-picker>
+ </view>
+ </view>
+ <view class="search-item">
+ <view class="left">鍗曟嵁鍙�</view>
+ <view class="right">
+ <input type="text" auto-focus v-model="HBillNo" />
+ </view>
+ </view>
+
+ <view class="button-groups">
+ <!-- <button type="default" size="mini" class="btn-b" @tap.stop="onAddClickHandler">鏂板</button> -->
+ <button type="default" size="mini" class="btn-c" @tap.stop="onSearchClickHandler">鏌ヨ</button>
+ <button type="default" size="mini" class="btn-a" @tap.stop="onResetClickHandler">閲嶇疆</button>
+ </view>
+ </view>
+ <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+ <scroll-view id="pageContent" scroll-y class="page-content" :style="{height: pageContentHeight + 'px'}">
+ <view v-for="(item,index) in listData" :key="index">
+ <uni-card :title="item.鐗╂枡浠ｇ爜" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+ @tap="showDetail = showDetail==index?-1:index">
+ <view class="card-detail">
+
+ <view class="detail" v-if="item.鐗╂枡鍚嶇О">
+ <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
+ </view>
+ <view class="detail" v-if="item.閮ㄩ棬浠ｇ爜">
+ <text>閮ㄩ棬浠ｇ爜锛�</text>{{item.閮ㄩ棬浠ｇ爜}}
+ </view>
+ <view class="detail" v-if="item.閮ㄩ棬">
+ <text>閮ㄩ棬锛�</text>{{item.閮ㄩ棬}}
+ </view>
+ <view class="detail" v-if="item.涓氬姟鍛樹唬鐮�">
+ <text>涓氬姟鍛樹唬鐮侊細</text>{{item.涓氬姟鍛樹唬鐮亇}
+ </view>
+ <view class="detail" v-if="item.涓氬姟鍛�">
+ <text>涓氬姟鍛橈細</text>{{item.涓氬姟鍛榼}
+ </view>
+ <view class="detail" v-if="item.缁撶畻鏂�">
+ <text>缁撶畻鏂癸細</text>{{item.缁撶畻鏂箎}
+ </view>
+ <view class="detail" v-if="item.椤圭洰缂栫爜">
+ <text>椤圭洰缂栫爜锛�</text>{{item.椤圭洰缂栫爜}}
+ </view>
+ <view class="detail" v-if="item.椤圭洰鍚嶇О">
+ <text>椤圭洰鍚嶇О锛�</text>{{item.椤圭洰鍚嶇О}}
+ </view>
+ <view class="detail" v-if="item.甯佸埆">
+ <text>甯佸埆锛�</text>{{item.甯佸埆}}
+ </view>
+ <view class="detail" v-if="item.姹囩巼">
+ <text>姹囩巼锛�</text>{{item.姹囩巼}}
+ </view>
+ <!-- -->
+ <view class="detail" v-if="item.涓荤">
+ <text>涓荤锛�</text>{{item.涓荤}}
+ </view>
+ <view class="detail" v-if="item.瀹㈡埛浠ｇ爜">
+ <text>瀹㈡埛浠ｇ爜锛�</text>{{item.瀹㈡埛浠ｇ爜}}
+ </view>
+ <view class="detail" v-if="item.瀹㈡埛">
+ <text>瀹㈡埛锛�</text>{{item.瀹㈡埛}}
+ </view>
+ <view class="detail" v-if="item.涓讳粨搴�">
+ <text>涓讳粨搴擄細</text>{{item.涓讳粨搴搣}
+ </view>
+
+ <view class="detail" v-if="item.瀹為檯鍚◣鍗曚环">
+ <text>瀹為檯鍚◣鍗曚环锛�</text>{{item.瀹為檯鍚◣鍗曚环}}
+ </view>
+ <view class="detail" v-if="item.鎶樻墸鐜�">
+ <text>鎶樻墸鐜囷細</text>{{item.鎶樻墸鐜噠}
+ </view>
+ <view class="detail" v-if="item.瀹為檯鍚◣鍗曚环">
+ <text>瀹為檯鍚◣鍗曚环锛�</text>{{item.瀹為檯鍚◣鍗曚环}}
+ </view>
+ <view class="detail" v-if="item.鐢熶骇鍏宠仈鏁伴噺">
+ <text>鐢熶骇鍏宠仈鏁伴噺锛�</text>{{item.鐢熶骇鍏宠仈鏁伴噺}}
+ </view>
+ <view class="detail" v-if="item.鐢熶骇鏈叧鑱旀暟閲�">
+ <text>鐢熶骇鏈叧鑱旀暟閲忥細</text>{{item.鐢熶骇鏈叧鑱旀暟閲弣}
+ </view>
+ </view>
+ <view class="card-detail" v-if="showDetail == index">
+ <view class="detail" v-if="item.鍒跺崟浜�">
+ <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ </view>
+ <view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+ <text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.瀹℃牳浜�">
+ <text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
+ </view>
+ <view class="detail" v-if="item.瀹℃牳鏃ユ湡">
+ <text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.淇敼浜�">
+ <text>淇敼浜猴細</text>{{item.淇敼浜簘}
+ </view>
+ <view class="detail" v-if="item.淇敼鏃ユ湡">
+ <text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.鍏抽棴浜�">
+ <text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
+ </view>
+ <view class="detail" v-if="item.鍏抽棴鏃ユ湡">
+ <text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
+ </view>
+ <view class="detail" v-if="item.浣滃簾浜�">
+ <text>浣滃簾浜猴細</text>{{item.浣滃簾浜簘}
+ </view>
+ <view class="detail" v-if="item.浣滃簾鏃ユ湡">
+ <text>浣滃簾鏃ユ湡锛�</text>{{item.浣滃簾鏃ユ湡.substr(0,10)}}
+ </view>
+ </view>
+
+
+ <view class="more" v-if="showDetail == index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="more" v-if="showDetail != index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+ size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+
+ <view class="op" v-if="operations == index">
+ <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+ <button class="op6" size="mini" plain @tap.stop="Browse(item)">鏌ョ湅鏄庣粏</button>
+ <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+ </view>
+ </uni-card>
+ </view>
+ <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+ </scroll-view>
+ <!-- 鍒嗛〉鍣� -->
+ <view class="page-footer">
+ <uni-pagination id="pagination" title="鏍囬鏂囧瓧" v-model="pageMeta.curPage" :pageSize="pageMeta.size"
+ :total="pageMeta.total" @change="onPageChangeHandler"></uni-pagination>
+ </view>
+ </view>
+</template>
+
+<script>
+ import dayjs from 'dayjs'
+ import {
+ CommonUtils
+ } from '@/utils/common.js'
+ import {
+ getUserInfo
+ } from "../../utils/auth";
+ export default {
+ data() {
+ return {
+ // 璁＄畻鍗＄墖鍒楄〃楂樺害
+ pagination_top: 0,
+ pageContent_top: 0,
+ // 鍒嗛〉鎺у埗
+ pageMeta: {
+ curPage: 1,
+ size: 50,
+ total: 0,
+ },
+ // 婊氬姩鎺у埗
+ scrollTop: 0,
+ old: {
+ scrollTop: 0
+ },
+
+ dateRangePicker: ["浠绘剰闂撮殧", "浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"],
+ curDateGap: "杩戜竷澶�",
+ enableCustomDateRange: false,
+ startDate: dayjs(new Date()).subtract(7, 'day').format('YYYY-MM-DD'),
+ endDate: dayjs(new Date()).format('YYYY-MM-DD'),
+ HBillNo: '',
+
+ listData: [],
+ showDetail: -1,
+ operations: -1,
+ }
+ },
+ computed: {
+ pageContentHeight: {
+ get() {
+ return (this.pagination_top - this.pageContent_top)
+ }
+ },
+ },
+ onLoad() {
+ this.onSearchClickHandler()
+ },
+ onPullDownRefresh() {
+ this.onSearchClickHandler()
+ },
+ async onReady() {
+ // #ifndef MP-WEIXIN
+ let query = uni.createSelectorQuery().in(this)
+ query.select("#pagination")
+ .boundingClientRect((data) => {
+ if (data) {
+ this.pagination_top = data.top
+ } else {
+ console.log("鏈壘鍒�#pagination鑺傜偣");
+ }
+ })
+ .exec();
+ query.select("#pageContent")
+ .boundingClientRect((data) => {
+ if (data) {
+ this.pageContent_top = data.top
+ } else {
+ console.log("鏈壘鍒�#pageContent鑺傜偣");
+ }
+ })
+ .exec();
+ // #endif
+
+ },
+ methods: {
+ goTop: function(e) {
+ // 瑙ｅ喅view灞備笉鍚屾鐨勯棶棰�
+ this.scrollTop = this.old.scrollTop
+ this.$nextTick(function() {
+ this.scrollTop = 0
+ });
+ },
+ onDateRangePickerChangeHandler({
+ detail
+ }) {
+ this.enableCustomDateRange = false
+ this.curDateGap = this.dateRangePicker[detail.value]
+ let date = new Date()
+ switch (this.curDateGap) {
+ case "浠婂ぉ":
+ this.startDate = dayjs(date).format("YYYY-MM-DD")
+ break;
+ case "杩戜竴澶�":
+ this.startDate = dayjs(date).subtract(1, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜袱澶�":
+ this.startDate = dayjs(date).subtract(2, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜笁澶�":
+ this.startDate = dayjs(date).subtract(3, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戝洓澶�":
+ this.startDate = dayjs(date).subtract(4, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜簲澶�":
+ this.startDate = dayjs(date).subtract(5, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戝叚澶�":
+ this.startDate = dayjs(date).subtract(6, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩戜竷澶�":
+ this.startDate = dayjs(date).subtract(7, 'day').format("YYYY-MM-DD")
+ break;
+ case "杩�30澶�":
+ this.startDate = dayjs(date).subtract(30, 'day').format("YYYY-MM-DD")
+ break;
+ }
+ if (this.curDateGap == '浠绘剰闂撮殧') {
+ this.enableCustomDateRange = true
+ }
+ },
+ onSearchClickHandler() {
+ let sWhere = ""
+ if (this.startDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.startDate + "'";
+ }
+ if (this.endDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.endDate + "'";
+ }
+ if (this.HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + this.HBillNo + "%'";
+ }
+ this.get_DisplayPage(sWhere);
+ },
+ clear() {
+ this.curDateGap = "杩戜竷澶�"
+ this.enableCustomDateRange = false
+ this.startDate = dayjs(new Date()).subtract(7, 'day').format('YYYY-MM-DD')
+ this.endDate = dayjs(new Date()).format('YYYY-MM-DD')
+ this.HBillNo = ''
+ },
+ async onResetClickHandler() {
+ this.clear()
+ await this.$nextTick()
+ this.onSearchClickHandler()
+ },
+ get_DisplayPage(sWhere) {
+ CommonUtils.doRequest2({
+ url: '/Xs_SeOrderBill/list_ByPage',
+ data: {
+ "sWhere": sWhere,
+ "user": getUserInfo()["Czymc"],
+ "Organization":getUserInfo()["Organization"],
+ "page":1,
+ "size":50
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ console.log('res.data: ', res.data);
+ if(res.data.Message=="鏃犳煡鐪嬫潈闄愶紒")
+ {
+ uni.showToast({
+ icon: 'none',
+ title: res.data.Message
+ })
+ return;
+ }
+ this.listData = data;
+ this.pageMeta.total = count
+ uni.stopPullDownRefresh()
+ }
+ })
+ },
+ onPageChangeHandler() {
+ this.onSearchClickHandler()
+ this.goTop()
+ },
+ // 鏂板
+ onAddClickHandler() {
+ uni.navigateTo({
+ url: "/pages/EmployeeRecords/EmployeeRecordsBill?operationType=1"
+ })
+ },
+ //鍒犻櫎鐐规璁板綍鍗�
+ del(item) {
+ console.log(item);
+ uni.showModal({
+ title: '鍒犻櫎纭',
+ content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ CommonUtils.doRequest2({
+ url: '/Xs_SeOrderBill/DropXs_SeOrderBill',
+ data: {
+ HItemID: item['HInterID'],
+ user: getUserInfo()['Czymc']
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count == 1) {
+ uni.showToast({
+ icon: count === 1 ? 'success' : 'error',
+ title: Message,
+ duration: 2000
+ });
+
+ // 绛夊緟鎻愮ず鏄剧ず瀹屾垚鍐嶅埛鏂�
+ setTimeout(() => {
+ this.onSearchClickHandler();
+ }, 2000);
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ }
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
+ });
+ },
+ Browse(item)
+ {
+ console.log(item)
+ uni.navigateTo({
+ url: '/pages/xiaoshoudingdan/xiaoshoudingdanListEdit?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
+ })
+ }
+ },
+ }
+</script>
+
+<style lang="scss">
+ .page-header {
+ display: flex;
+ box-sizing: border-box;
+ padding: 20rpx;
+ flex-direction: column;
+ gap: 10rpx;
+ font-size: 32rpx;
+
+ .search-item {
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: center;
+ align-items: center;
+
+ .left {
+ width: 4em;
+ }
+
+ .right {
+ flex: 1;
+ position: relative;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ display: flex;
+ padding: 4rpx 10rpx;
+
+ picker {
+ width: 100%;
+ }
+ }
+ }
+
+ input {
+ width: inherit;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+
+ .datetime-picker-inner {
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ display: flex;
+ align-items: center;
+ }
+
+ .font__enable {
+ color: #000;
+ }
+
+ .font__disable {
+ color: #cccccc;
+ }
+ }
+
+ .button-groups {
+ box-sizing: border-box;
+ padding: 10rpx 0 0 0;
+ display: flex;
+ flex-direction: row;
+ gap: 10rpx;
+ justify-content: space-between;
+
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+
+ .btn-a {
+ background-color: #acacac;
+ color: #fff;
+ }
+
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+ }
+
+ .page-content {
+ // height: 40vh;
+ box-sizing: border-box;
+ padding: 10rpx 0;
+
+ .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;
+ }
+ }
+
+ .op {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 20rpx;
+
+ button {
+ padding: 0;
+ width: 150rpx;
+ font-size: 25rpx;
+ }
+
+ .op1 {
+ border: 1px solid #41a863;
+ color: #41a863;
+ }
+
+ .op2 {
+ border: 1px solid #d98d00;
+ color: #d98d00;
+ }
+
+ .op3 {
+ border: 1px solid #3a78ff;
+ color: #3a78ff;
+ }
+
+ .op4 {
+ border: 1px solid #da0000;
+ color: #da0000;
+ }
+
+ .op5 {
+ border: 1px solid #888;
+ color: #888;
+ }
+ }
+ }
+
+ .page-footer {
+ position: fixed;
+ bottom: 0;
+ width: 100%;
+ box-sizing: border-box;
+ padding: 32rpx 40rpx;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/xiaoshoudingdan/xiaoshoudingdanListEdit.vue b/pages/xiaoshoudingdan/xiaoshoudingdanListEdit.vue
new file mode 100644
index 0000000..af9b6c6
--- /dev/null
+++ b/pages/xiaoshoudingdan/xiaoshoudingdanListEdit.vue
@@ -0,0 +1,742 @@
+<template>
+ <view class="container">
+ <view class="header">
+ <view class="title">閿�鍞鍗曟槑缁�</view>
+ <view class="sub-title">{{ HBillNo }}</view>
+ </view>
+ <!-- Tab鍒囨崲 -->
+ <view class="tab-container">
+ <view class="tabs">
+ <view
+ class="tab-item"
+ :class="{'active': currentTab === 0}"
+ @click="switchTab(0)"
+ >
+ 鍩烘湰淇℃伅
+ </view>
+ <view
+ class="tab-item"
+ :class="{'active': currentTab === 1}"
+ @click="switchTab(1)"
+ >
+ 瀹℃牳淇℃伅
+ </view>
+ <view
+ class="tab-item"
+ :class="{'active': currentTab === 2}"
+ @click="switchTab(2)"
+ >
+ 鐗╂枡淇℃伅
+ </view>
+ </view>
+ <view class="tab-indicator" :style="indicatorStyle"></view>
+ </view>
+
+ <scroll-view
+ scroll-y
+ class="content"
+ :style="{height: scrollHeight + 'px'}"
+ >
+ <!-- Tab 0: 鍩烘湰淇℃伅 -->
+ <view v-if="currentTab === 0" class="tab-content">
+ <view class="info-card">
+ <view class="card-title">璁㈠崟鍩烘湰淇℃伅</view>
+ <view class="info-grid">
+ <view class="info-item" v-if="orderInfo.鏃ユ湡">
+ <text class="label">鏃ユ湡锛�</text>
+ <text class="value">{{ orderInfo.鏃ユ湡 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.鍗曟嵁鍙�">
+ <text class="label">鍗曟嵁鍙凤細</text>
+ <text class="value">{{ orderInfo.鍗曟嵁鍙� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.瀹㈡埛浠ｇ爜">
+ <text class="label">瀹㈡埛浠ｇ爜锛�</text>
+ <text class="value">{{ orderInfo.瀹㈡埛浠ｇ爜 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.瀹㈡埛">
+ <text class="label">瀹㈡埛锛�</text>
+ <text class="value">{{ orderInfo.瀹㈡埛 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.閮ㄩ棬浠ｇ爜">
+ <text class="label">閮ㄩ棬浠ｇ爜锛�</text>
+ <text class="value">{{ orderInfo.閮ㄩ棬浠ｇ爜 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.閮ㄩ棬">
+ <text class="label">閮ㄩ棬锛�</text>
+ <text class="value">{{ orderInfo.閮ㄩ棬 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.涓氬姟鍛樹唬鐮�">
+ <text class="label">涓氬姟鍛樹唬鐮侊細</text>
+ <text class="value">{{ orderInfo.涓氬姟鍛樹唬鐮� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.涓氬姟鍛�">
+ <text class="label">涓氬姟鍛橈細</text>
+ <text class="value">{{ orderInfo.涓氬姟鍛� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.浜よ揣鍦扮偣">
+ <text class="label">浜よ揣鍦扮偣锛�</text>
+ <text class="value">{{ orderInfo.浜よ揣鍦扮偣 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.缁撶畻鏂瑰紡浠ｇ爜">
+ <text class="label">缁撶畻鏂瑰紡浠ｇ爜锛�</text>
+ <text class="value">{{ orderInfo.缁撶畻鏂瑰紡浠ｇ爜 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.缁撶畻鏂瑰紡">
+ <text class="label">缁撶畻鏂瑰紡锛�</text>
+ <text class="value">{{ orderInfo.缁撶畻鏂瑰紡 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.椤圭洰缂栫爜">
+ <text class="label">椤圭洰缂栫爜锛�</text>
+ <text class="value">{{ orderInfo.椤圭洰缂栫爜 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.椤圭洰鍚嶇О">
+ <text class="label">椤圭洰鍚嶇О锛�</text>
+ <text class="value">{{ orderInfo.椤圭洰鍚嶇О }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.涓讳粨搴�">
+ <text class="label">涓讳粨搴擄細</text>
+ <text class="value">{{ orderInfo.涓讳粨搴� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.甯佸埆浠ｇ爜">
+ <text class="label">甯佸埆浠ｇ爜锛�</text>
+ <text class="value">{{ orderInfo.甯佸埆浠ｇ爜 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.甯佸埆">
+ <text class="label">甯佸埆锛�</text>
+ <text class="value">{{ orderInfo.甯佸埆 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.姹囩巼">
+ <text class="label">姹囩巼锛�</text>
+ <text class="value">{{ orderInfo.姹囩巼 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.涓荤浠ｇ爜">
+ <text class="label">涓荤浠ｇ爜锛�</text>
+ <text class="value">{{ orderInfo.涓荤浠ｇ爜 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.涓荤">
+ <text class="label">涓荤锛�</text>
+ <text class="value">{{ orderInfo.涓荤 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.瀹氶噾姣斾緥">
+ <text class="label">瀹氶噾姣斾緥锛�</text>
+ <text class="value">{{ orderInfo.瀹氶噾姣斾緥 }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.鑱旂郴浜�">
+ <text class="label">鑱旂郴浜猴細</text>
+ <text class="value">{{ orderInfo.鑱旂郴浜� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.缁撶畻鏃ユ湡">
+ <text class="label">缁撶畻鏃ユ湡锛�</text>
+ <text class="value">{{ orderInfo.缁撶畻鏃ユ湡 }}</text>
+ </view>
+ <view class="info-item full-width" v-if="orderInfo.鎽樿">
+ <text class="label">鎽樿锛�</text>
+ <text class="value">{{ orderInfo.鎽樿 }}</text>
+ </view>
+ </view>
+ </view>
+ </view>
+
+ <!-- Tab 1: 瀹℃牳淇℃伅 -->
+ <view v-if="currentTab === 1" class="tab-content">
+ <view class="info-card">
+ <view class="card-title">瀹℃壒娴佺▼淇℃伅</view>
+ <view class="info-grid">
+ <view class="info-item" v-if="orderInfo.鍒跺崟浜�">
+ <text class="label">鍒跺崟浜猴細</text>
+ <text class="value">{{ orderInfo.鍒跺崟浜� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.鍒跺崟鏃ユ湡">
+ <text class="label">鍒跺崟鏃ユ湡锛�</text>
+ <text class="value">{{ formatDate(orderInfo.鍒跺崟鏃ユ湡) }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.瀹℃牳浜�">
+ <text class="label">瀹℃牳浜猴細</text>
+ <text class="value">{{ orderInfo.瀹℃牳浜� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.瀹℃牳鏃ユ湡">
+ <text class="label">瀹℃牳鏃ユ湡锛�</text>
+ <text class="value">{{ formatDate(orderInfo.瀹℃牳鏃ユ湡) }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.淇敼浜�">
+ <text class="label">淇敼浜猴細</text>
+ <text class="value">{{ orderInfo.淇敼浜� }}</text>
+ </view>
+ <view class="info-item" v-if="orderInfo.淇敼鏃ユ湡">
+ <text class="label">淇敼鏃ユ湡锛�</text>
+ <text class="value">{{ formatDate(orderInfo.淇敼鏃ユ湡) }}</text>
+ </view>
+ </view>
+ </view>
+ </view>
+
+ <!-- Tab 2: 鐗╂枡淇℃伅 -->
+ <view v-if="currentTab === 2" class="tab-content">
+ <view class="material-list">
+ <view
+ v-for="(item, index) in materialList"
+ :key="index"
+ class="material-card"
+ >
+ <view class="material-header">
+ <text class="material-code">{{ item.鐗╂枡浠ｇ爜 || '鐗╂枡' + (index + 1) }}</text>
+ <text class="material-name">{{ item.鐗╂枡鍚嶇О }}</text>
+ </view>
+ <view class="material-info">
+ <view class="info-row">
+ <view class="info-col" v-if="item.瑙勬牸鍨嬪彿">
+ <text class="label">瑙勬牸鍨嬪彿锛�</text>
+ <text class="value">{{ item.瑙勬牸鍨嬪彿 }}</text>
+ </view>
+ <view class="info-col" v-if="item.璁￠噺鍗曚綅浠ｇ爜">
+ <text class="label">鍗曚綅浠ｇ爜锛�</text>
+ <text class="value">{{ item.璁￠噺鍗曚綅浠ｇ爜 }}</text>
+ </view>
+ <view class="info-col" v-if="item.璁￠噺鍗曚綅">
+ <text class="label">鍗曚綅锛�</text>
+ <text class="value">{{ item.璁￠噺鍗曚綅 }}</text>
+ </view>
+ <view class="info-col" v-if="item.鍏嬮噸">
+ <text class="label">鍏嬮噸锛�</text>
+ <text class="value">{{ item.鍏嬮噸 }}</text>
+ </view>
+ <view class="info-col" v-if="item.骞呭">
+ <text class="label">骞呭锛�</text>
+ <text class="value">{{ item.骞呭 }}</text>
+ </view>
+ <view class="info-col" v-if="鏌撹壊瑕佹眰">
+ <text class="label">鏌撹壊瑕佹眰锛�</text>
+ <text class="value">{{ item.鏌撹壊瑕佹眰 }}</text>
+ </view>
+ <view class="info-col" v-if="鐧藉澂瑕佹眰">
+ <text class="label">鐧藉澂瑕佹眰锛�</text>
+ <text class="value">{{ item.鐧藉澂瑕佹眰 }}</text>
+ </view>
+ </view>
+
+ <view class="info-row">
+ <view class="info-col" v-if="item.鎵瑰彿">
+ <text class="label">鎵瑰彿锛�</text>
+ <text class="value">{{ item.鎵瑰彿 }}</text>
+ </view>
+ <view class="info-col" v-if="item.鏁伴噺">
+ <text class="label">鏁伴噺锛�</text>
+ <text class="value">{{ item.鏁伴噺 }}</text>
+ </view>
+ <view class="info-col" v-if="item.鐢熶骇鍏ュ簱鏁伴噺">
+ <text class="label">鐢熶骇鍏ュ簱鏁伴噺锛�</text>
+ <text class="value">{{ item.鐢熶骇鍏ュ簱鏁伴噺 }}</text>
+ </view>
+ <view class="info-col" v-if="item.寮�绁ㄦ暟閲�">
+ <text class="label">寮�绁ㄦ暟閲忥細</text>
+ <text class="value">{{ item.寮�绁ㄦ暟閲� }}</text>
+ </view>
+ </view>
+
+ <view class="info-row">
+ <view class="info-col" v-if="item.鍏宠仈鏁伴噺">
+ <text class="label">鍏宠仈鏁伴噺锛�</text>
+ <text class="value">{{ item.鍏宠仈鏁伴噺 }}</text>
+ </view>
+ <view class="info-col" v-if="item.鏈叧鑱旀暟閲�">
+ <text class="label">鏈叧鑱旀暟閲忥細</text>
+ <text class="value">{{ item.鏈叧鑱旀暟閲� }}</text>
+ </view>
+ </view>
+
+ <view class="info-row">
+ <view class="info-col" v-if="item.鍚◣鍗曚环">
+ <text class="label">鍚◣鍗曚环锛�</text>
+ <text class="value">{{ item.鍚◣鍗曚环 }}</text>
+ </view>
+ <view class="info-col" v-if="item.鎶樻墸鐜�">
+ <text class="label">鎶樻墸鐜囷細</text>
+ <text class="value">{{ item.鎶樻墸鐜� }}</text>
+ </view>
+ <view class="info-col" v-if="item.瀹為檯鍚◣鍗曚环">
+ <text class="label">瀹為檯鍗曚环锛�</text>
+ <text class="value">{{ item.瀹為檯鍚◣鍗曚环 }}</text>
+ </view>
+ </view>
+
+ <view class="info-row">
+ <view class="info-col" v-if="item.鍗曚环">
+ <text class="label">鍗曚环锛�</text>
+ <text class="value">{{ item.鍗曚环 }}</text>
+ </view>
+ <view class="info-col" v-if="item.閲戦">
+ <text class="label">閲戦锛�</text>
+ <text class="value">{{ item.閲戦 }}</text>
+ </view>
+ <view class="info-col" v-if="item.閿�鍞嚭搴撳鏍搁噾棰�">
+ <text class="label">閿�鍞嚭搴撳鏍搁噾棰濓細</text>
+ <text class="value">{{ item.閿�鍞嚭搴撳鏍搁噾棰� }}</text>
+ </view>
+ <view class="info-col" v-if="item.閿�鍞嚭搴撳鏍搁噾棰�">
+ <text class="label">閿�鍞嚭搴撳鏍搁噾棰濓細</text>
+ <text class="value">{{ item.閿�鍞嚭搴撳鏍搁噾棰� }}</text>
+ </view>
+ <view class="info-col" v-if="item.閿�鍞��搴撴暟閲�">
+ <text class="label">閿�鍞��搴撴暟閲忥細</text>
+ <text class="value">{{ item.閿�鍞��搴撴暟閲� }}</text>
+ </view>
+ <view class="info-col" v-if="item.閿�鍞��搴撳鏍告暟閲�">
+ <text class="label">閿�鍞��搴撳鏍告暟閲忥細</text>
+ <text class="value">{{ item.閿�鍞��搴撳鏍告暟閲� }}</text>
+ </view>
+ <view class="info-col" v-if="item.鏄惁涓嬫帹鐢熶骇璁㈠崟">
+ <text class="label">鏄惁涓嬫帹鐢熶骇璁㈠崟锛�</text>
+ <text class="value">{{ item.鏄惁涓嬫帹鐢熶骇璁㈠崟 }}</text>
+ </view>
+ </view>
+
+ <view class="info-row">
+ <view class="info-col" v-if="item.瀹㈡埛鐗╂枡缂栫爜">
+ <text class="label">瀹㈡埛鐗╂枡缂栫爜锛�</text>
+ <text class="value">{{ item.瀹㈡埛鐗╂枡缂栫爜 }}%</text>
+ </view>
+ <view class="info-col" v-if="item.瀹㈡埛瑙勬牸鍨嬪彿">
+ <text class="label">瀹㈡埛瑙勬牸鍨嬪彿锛�</text>
+ <text class="value">{{ item.瀹㈡埛瑙勬牸鍨嬪彿 }}%</text>
+ </view>
+ <view class="info-col" v-if="item.瀹㈡埛鐗╂枡鍚嶇О">
+ <text class="label">瀹㈡埛鐗╂枡鍚嶇О锛�</text>
+ <text class="value">{{ item.瀹㈡埛鐗╂枡鍚嶇О }}%</text>
+ </view>
+ <view class="info-col" v-if="item.鏄惁鍙栧簱瀛�">
+ <text class="label">鏄惁鍙栧簱瀛橈細</text>
+ <text class="value">{{ item.鏄惁鍙栧簱瀛� }}%</text>
+ </view>
+ <view class="info-col" v-if="item.鍓╀綑璁㈤噾">
+ <text class="label">鍓╀綑璁㈤噾锛�</text>
+ <text class="value">{{ item.鍓╀綑璁㈤噾 }}%</text>
+ </view>
+ <view class="info-col" v-if="item.鎶ュ簾鏁伴噺">
+ <text class="label">鎶ュ簾鏁伴噺锛�</text>
+ <text class="value">{{ item.鎶ュ簾鏁伴噺 }}%</text>
+ </view>
+ <view class="info-col" v-if="item.鐢熶骇鍏ュ簱鏁伴噺">
+ <text class="label">鐢熶骇鍏ュ簱鏁伴噺锛�</text>
+ <text class="value">{{ item.鐢熶骇鍏ュ簱鏁伴噺 }}%</text>
+ </view>
+ <!-- -->
+ <view class="info-col" v-if="item.绋庣巼">
+ <text class="label">绋庣巼锛�</text>
+ <text class="value">{{ item.绋庣巼 }}%</text>
+ </view>
+ <view class="info-col" v-if="item.绋庨">
+ <text class="label">绋庨锛�</text>
+ <text class="value">{{ item.绋庨 }}</text>
+ </view>
+ <view class="info-col" v-if="item.浠风◣鍚堣">
+ <text class="label">浠风◣鍚堣锛�</text>
+ <text class="value">{{ item.浠风◣鍚堣 }}</text>
+ </view>
+ </view>
+
+ <view class="info-row" v-if="item.浜よ揣鏃ユ湡">
+ <view class="info-col full-width">
+ <text class="label">浜よ揣鏃ユ湡锛�</text>
+ <text class="value">{{ item.浜よ揣鏃ユ湡 }}</text>
+ </view>
+ </view>
+ <view class="info-row" v-if="item.鎶曟枡">
+ <view class="info-col full-width">
+ <text class="label">鎶曟枡锛�</text>
+ <text class="value">{{ item.鎶曟枡 }}</text>
+ </view>
+ </view>
+ <view class="info-row" v-if="item.娣卞姞宸�">
+ <view class="info-col full-width">
+ <text class="label">娣卞姞宸ワ細</text>
+ <text class="value">{{ item.娣卞姞宸� }}</text>
+ </view>
+ </view>
+ </view>
+ </view>
+
+ <view v-if="materialList.length === 0" class="empty-state">
+ <uni-icons type="list" size="50" color="#ccc"></uni-icons>
+ <text class="empty-text">鏆傛棤鐗╂枡淇℃伅</text>
+ </view>
+ </view>
+ </view>
+ </scroll-view>
+
+ <view class="footer">
+ <button class="back-btn" @click="goBack">杩斿洖</button>
+ </view>
+
+ <uni-load-more v-if="loading" status="loading" :content-text="loadingText"></uni-load-more>
+ </view>
+</template>
+
+<script>
+ import { CommonUtils } from '@/utils/common.js'
+ import { getUserInfo } from "../../utils/auth";
+
+ export default {
+ data() {
+ return {
+ // 鍙傛暟
+ linterid: '',
+ HBillNo: '',
+
+
+ currentTab: 0,
+ scrollHeight: 0,
+ loading: false,
+ loadingText: {
+ contentdown: '涓婃媺鏄剧ず鏇村',
+ contentrefresh: '姝ｅ湪鍔犺浇...',
+ contentnomore: '娌℃湁鏇村鏁版嵁浜�'
+ },
+
+
+ orderInfo: {},
+ materialList: [],
+ allData: [],
+ }
+ },
+ computed: {
+ indicatorStyle() {
+ const tabWidth = 100 / 3;
+ return {
+ width: tabWidth + '%',
+ transform: `translateX(${this.currentTab * 100}%)`
+ };
+ }
+ },
+ onLoad(options) {
+ if (options.linterid && options.HBillNo) {
+ this.linterid = options.linterid;
+ this.HBillNo = options.HBillNo;
+ this.loadOrderDetail();
+ } else {
+ uni.showToast({
+ title: '鍙傛暟閿欒',
+ icon: 'error'
+ });
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 1500);
+ }
+
+ // 璁＄畻婊氬姩鍖哄煙楂樺害
+ this.calcScrollHeight();
+ },
+ onReady() {
+
+ uni.onWindowResize(() => {
+ this.calcScrollHeight();
+ });
+ },
+ methods: {
+
+ calcScrollHeight() {
+ const systemInfo = uni.getSystemInfoSync();
+ const windowHeight = systemInfo.windowHeight;
+ const query = uni.createSelectorQuery().in(this);
+ query.select('.header').boundingClientRect();
+ query.select('.tab-container').boundingClientRect();
+ query.select('.footer').boundingClientRect();
+ query.exec((res) => {
+ if (res[0] && res[1] && res[2]) {
+ const headerHeight = res[0].height;
+ const tabHeight = res[1].height;
+ const footerHeight = res[2].height;
+ const margin = 5; // 瀹夊叏杈硅窛
+
+ this.scrollHeight = windowHeight - headerHeight - tabHeight - footerHeight - margin;
+ }
+ });
+ },
+
+
+ switchTab(index) {
+ this.currentTab = index;
+ },
+
+
+ loadOrderDetail() {
+ this.loading = true;
+
+
+ const sWhere = ` and hmainid = '${this.linterid}'`;
+
+ CommonUtils.doRequest2({
+ url: '/Xs_SeOrderBill/list_ByPage',
+ data: {
+ sWhere: sWhere,
+ user: getUserInfo()["Czymc"],
+ Organization:getUserInfo()["Organization"],
+ page:1,
+ size:50
+ },
+ resFunction: (res) => {
+ this.loading = false;
+
+ if (res.data.Message === "鏃犳煡鐪嬫潈闄愶紒") {
+ uni.showToast({
+ icon: 'none',
+ title: res.data.Message
+ });
+ return;
+ }
+
+ if (res.data.code === "1" && res.data.data && res.data.data.length > 0) {
+ this.allData = res.data.data;
+
+ this.orderInfo = { ...this.allData[0] };
+
+ this.materialList = this.allData;
+
+
+ if (!this.orderInfo.鍗曟嵁鍙� && this.HBillNo) {
+ this.orderInfo.鍗曟嵁鍙� = this.HBillNo;
+ }
+ } else {
+ uni.showToast({
+ title: '鏈壘鍒拌鍗曚俊鎭�',
+ icon: 'none'
+ });
+ }
+ },
+ errFunction: (err) => {
+ this.loading = false;
+ uni.showToast({
+ title: '鍔犺浇澶辫触',
+ icon: 'error'
+ });
+ console.error('鍔犺浇璁㈠崟璇︽儏澶辫触:', err);
+ }
+ });
+ },
+
+
+ formatDate(dateStr) {
+ if (!dateStr) return '';
+
+ if (dateStr.length >= 10) {
+ return dateStr.substr(0, 10);
+ }
+ return dateStr;
+ },
+
+ // 杩斿洖涓婁竴椤�
+ goBack() {
+ uni.navigateBack();
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .container {
+ display: flex;
+ flex-direction: column;
+ height: 100vh;
+ background-color: #f5f5f5;
+ }
+
+ .header {
+ padding: 30rpx;
+ background: linear-gradient(135deg, #3a78ff 0%, #5a9cff 100%);
+ color: white;
+ text-align: center;
+
+ .title {
+ font-size: 36rpx;
+ font-weight: bold;
+ margin-bottom: 10rpx;
+ }
+
+ .sub-title {
+ font-size: 28rpx;
+ opacity: 0.9;
+ }
+ }
+
+ .tab-container {
+ background-color: white;
+ position: relative;
+ box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+
+ .tabs {
+ display: flex;
+
+ .tab-item {
+ flex: 1;
+ text-align: center;
+ padding: 25rpx 0;
+ font-size: 30rpx;
+ color: #666;
+ transition: all 0.3s;
+
+ &.active {
+ color: #3a78ff;
+ font-weight: bold;
+ }
+ }
+ }
+
+ .tab-indicator {
+ height: 4rpx;
+ background-color: #3a78ff;
+ transition: transform 0.3s ease;
+ }
+ }
+
+ .content {
+ flex: 1;
+ }
+
+ .tab-content {
+ padding: 20rpx;
+ }
+
+ .info-card {
+ background-color: white;
+ border-radius: 16rpx;
+ padding: 30rpx;
+ margin-bottom: 20rpx;
+ box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
+
+ .card-title {
+ font-size: 32rpx;
+ font-weight: bold;
+ color: #333;
+ margin-bottom: 30rpx;
+ padding-bottom: 15rpx;
+ border-bottom: 1rpx solid #eee;
+ }
+
+ .info-grid {
+ display: flex;
+ flex-wrap: wrap;
+
+ .info-item {
+ width: 50%;
+ margin-bottom: 25rpx;
+
+ &.full-width {
+ width: 100%;
+ }
+
+ .label {
+ color: #666;
+ font-size: 28rpx;
+ margin-right: 10rpx;
+ }
+
+ .value {
+ color: #333;
+ font-size: 28rpx;
+ font-weight: 500;
+ word-break: break-all;
+ }
+ }
+ }
+ }
+
+ .material-list {
+ .material-card {
+ background-color: white;
+ border-radius: 16rpx;
+ margin-bottom: 20rpx;
+ padding: 30rpx;
+ box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
+
+ .material-header {
+ display: flex;
+ align-items: center;
+ margin-bottom: 25rpx;
+ padding-bottom: 15rpx;
+ border-bottom: 1rpx solid #eee;
+
+ .material-code {
+ font-size: 30rpx;
+ font-weight: bold;
+ color: #3a78ff;
+ margin-right: 20rpx;
+ background-color: #f0f7ff;
+ padding: 5rpx 15rpx;
+ border-radius: 8rpx;
+ }
+
+ .material-name {
+ font-size: 28rpx;
+ color: #333;
+ flex: 1;
+ }
+ }
+
+ .material-info {
+ .info-row {
+ display: flex;
+ flex-wrap: wrap;
+ margin-bottom: 15rpx;
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+
+ .info-col {
+ width: 50%;
+ margin-bottom: 10rpx;
+
+ &.full-width {
+ width: 100%;
+ }
+
+ .label {
+ color: #888;
+ font-size: 26rpx;
+ margin-right: 8rpx;
+ }
+
+ .value {
+ color: #333;
+ font-size: 26rpx;
+ font-weight: 500;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ .empty-state {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ padding: 100rpx 0;
+
+ .empty-text {
+ color: #999;
+ font-size: 28rpx;
+ margin-top: 20rpx;
+ }
+ }
+
+ .footer {
+ padding: 20rpx 30rpx;
+ background-color: white;
+ border-top: 1rpx solid #eee;
+
+ .back-btn {
+ background-color: #3a78ff;
+ color: white;
+ border-radius: 50rpx;
+ height: 80rpx;
+ line-height: 80rpx;
+ font-size: 32rpx;
+
+ &:active {
+ background-color: #2c5fcc;
+ }
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/pages/xiaoshoutuihuo/ICStockBillMain.vue b/pages/xiaoshoutuihuo/ICStockBillMain.vue
index fa566c0..d62052c 100644
--- a/pages/xiaoshoutuihuo/ICStockBillMain.vue
+++ b/pages/xiaoshoutuihuo/ICStockBillMain.vue
@@ -330,11 +330,11 @@
HBillNo: '',
HInterID: '',
- HKeeperName: getUserInfo().HKeeper,
+ HKeeperName: getUserInfo().HKeeperName,
HKeeperID: getUserInfo().HKeeperID,
- HSecManagerName: getUserInfo().HSecManager,
+ HSecManagerName: getUserInfo().HSecManagerName,
HSecManagerID: getUserInfo().HSecManagerID,
- HDeptName: getUserInfo().HDept,
+ HDeptName: getUserInfo().HDeptName,
HDeptID: getUserInfo().HDeptID,
HSupName: '',
HSupID: '',
diff --git a/pages/zhijiediaobo/MoveStockBill.vue b/pages/zhijiediaobo/MoveStockBill.vue
index 5bf52f6..d9acf56 100644
--- a/pages/zhijiediaobo/MoveStockBill.vue
+++ b/pages/zhijiediaobo/MoveStockBill.vue
@@ -498,11 +498,11 @@
HBillNo: '',
HInterID: '',
- HKeeperName: getUserInfo().HKeeper,
+ HKeeperName: getUserInfo().HKeeperName,
HKeeperID: getUserInfo().HKeeperID,
- HSecManagerName: getUserInfo().HSecManager,
+ HSecManagerName: getUserInfo().HSecManagerName,
HSecManagerID: getUserInfo().HSecManagerID,
- HDeptName: getUserInfo().HDept,
+ HDeptName: getUserInfo().HDeptName,
HDeptID: getUserInfo().HDeptID,
// 瀹㈡埛
HSupName: '',
--
Gitblit v1.9.1