chensibo 2 weeks ago
parent
commit
921ef09af5
2 changed files with 19 additions and 3 deletions
  1. 2 2
      main.js
  2. 17 1
      pages/workbranch/warehouse/scanInOut/In/scannedMaterials.vue

+ 2 - 2
main.js

@@ -35,8 +35,8 @@ import {
 // uni.$baseUrl = "http://192.168.1.97:48080";
 // uni.$baseUrl = "";
 // uni.$baseUrl = "http://113.105.183.190:48028";
-uni.$baseUrl = "http://192.168.1.32:48080";
-// uni.$baseUrl = "http://113.105.183.190:15980";
+// uni.$baseUrl = "http://192.168.1.32:48080";
+uni.$baseUrl = "http://113.105.183.190:15980";
 // uni.$baseUrl = "http://192.168.1.26:48080";
 // uni.$baseUrl = "http://113.105.183.190:15980";
 // uni.$baseUrl = "http://113.105.183.190:48159";

+ 17 - 1
pages/workbranch/warehouse/scanInOut/In/scannedMaterials.vue

@@ -49,7 +49,7 @@
 			</view>
 			
 			<!-- 不良品是否入库单选按钮 - 仅在 businessType 为 '0' 时显示 -->
-			<view class="bad-material-radio" v-if="businessType == '0'">
+			<view class="bad-material-radio" v-if="businessType == '0'||businessType == '9'">
 				<text class="radio-label">不良品是否入库:</text>
 				<radio-group @change="handleBadMaterialChange" class="radio-group">
 					<label class="radio-item">
@@ -860,6 +860,14 @@ const checkFifo = (qrCode) => {
     // 保存按钮点击事件
     const handleSave = async function() {
       if (saveDisabled.value) return
+	  if ((businessType.value == '0' || businessType.value == '9') && badMaterialInStockFlag.value === null) {
+	      uni.showToast({
+	        title: '请选择不良品是否入库',
+	        icon: 'none',
+	        duration: 2000
+	      })
+	      return
+	    }
       saveDisabled.value = true
       try {
         // 保存逻辑实现
@@ -903,6 +911,14 @@ const checkFifo = (qrCode) => {
     // 提交按钮点击事件
     const handleSubmit = async function() {
       if (submitDisabled.value) return
+	  if ((businessType.value == '0' || businessType.value == '9') && badMaterialInStockFlag.value === null) {
+	      uni.showToast({
+	        title: '请选择不良品是否入库',
+	        icon: 'none',
+	        duration: 2000
+	      })
+	      return
+	    }
       submitDisabled.value = true
       try {
         // 提交逻辑实现