出入库修改

src/views/warehouseBusiness/inStock/index.vue

@@ -2045,7 +2045,7 @@
             <el-col :span="8">
               <el-form-item label="计划件数" prop="fPlanqty">
                 <el-input
-                  oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\..*$/, "$1$2.$3")'
+                  oninput='this.value=this.value.replace(/[^\-?\d]/g,"")'
                   v-model="planningList.fPlanqty"
                   style="width: 80%"
                   laceholder="计划件数"
@@ -4200,6 +4200,12 @@ export default {
           if (!this.form.fId) {
             this.form.fId = this.fid
           }
+          for (let list in this.dataList) {
+            if (!this.dataList[list].fBusinessType) {
+              this.$message.error('请输入业务类型!')
+              return false
+            }
+          }
           let formDatae = new window.FormData()
           // 附件数据
           this.form.fBillingway = this.form.fFeetunit

src/views/warehouseBusiness/outStock/index.vue

@@ -825,21 +825,21 @@
           align="center"
           label="*业务类型"
         >
-<!--          <template slot-scope="scope">-->
-<!--            <el-select v-model="scope.row.fBusinessType"-->
-<!--              filterable-->
-<!--              :disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"-->
-<!--              :remote-method="kqhouseRemoteMethod"-->
-<!--              placeholder="请选择业务类型"-->
-<!--            >-->
-<!--              <el-option-->
-<!--                v-for="(dict, index) in fStorageTypeOptions"-->
-<!--                :key="index.dictValue"-->
-<!--                :label="dict.dictLabel"-->
-<!--                :value="dict.dictValue"-->
-<!--              />-->
-<!--            </el-select>-->
-<!--          </template>-->
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.fBusinessType"
+              filterable
+              disabled
+              :remote-method="kqhouseRemoteMethod"
+              placeholder="请选择业务类型"
+            >
+              <el-option
+                v-for="(dict, index) in fStorageTypeOptions"
+                :key="index.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              />
+            </el-select>
+          </template>
         </el-table-column>
         <el-table-column
           prop="fMarks"
@@ -3111,11 +3111,9 @@ export default {
           fDriverName:this.whgenlegList.fDriverName,
           fDriverTel:this.whgenlegList.fDriverTel,
           fDriverIdCar:this.whgenlegList.fDriverIdCar,
-          fBusinessType:this.dialogWhgenlegList[whgen].fBusinessType + ''
+          fBusinessType:this.dialogWhgenlegList[whgen].fBusinessType + '',
 
         });
-        console.log(this.dialogWhgenlegList[whgen].fWarehouseLocationids)
-        console.log(this.dialogWhgenlegList[whgen].fBusinessType)
       }
       this.whgenlegVisible = false;
     },
@@ -4001,14 +3999,14 @@ export default {
           this.$message.error('请添加库存明细!')
           return false
         }
-        for (let li in this.dataList) {
-          for(let list in this.fStorageTypeOptions){
-            if (this.dataList[li].fBusinessType  === this.fStorageTypeOptions[list].dictLabel) {
-              this.$set(this.dataList[li], 'fBusinessType', this.fStorageTypeOptions[list].dictValue)
-              break
-            }
-          }
-        }
+        // for (let li in this.dataList) {
+        //   for(let list in this.fStorageTypeOptions){
+        //     if (this.dataList[li].fBusinessType  === this.fStorageTypeOptions[list].dictLabel) {
+        //       this.$set(this.dataList[li], 'fBusinessType', this.fStorageTypeOptions[list].dictValue)
+        //       break
+        //     }
+        //   }
+        // }
         // for (let list in this.dataList) {
         //   this.changeOutStock(this.dataList[list])
           // if (!this.dataList[list].fQty || Number(this.dataList[list].fQty) === 0) {