Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-CLI

src/views/stockIn/AllocateStockIn/index.vue

@@ -144,6 +144,10 @@
                 </el-table>
             </div> -->
       <el-row class="page-search" justify="end" align="middle">
+        <el-form-item label="过账日期" prop="state.commitDate" style="margin-top: 10px;">
+          <el-date-picker :clearable="true" :editable="true" v-model="state.commitDate" type="date"
+                          placeholder="选择过账时间" value-format="YYYY-MM-DD" />
+        </el-form-item>
         <div class="page-search-btns">
           <!-- <el-button
             type="primary"
@@ -183,6 +187,7 @@ const { proxy }: any = getCurrentInstance()
 const formDataRef = ref(ElForm)
 const queryParamRef = ref(ElForm)
 const state = reactive({
+  commitDate: '',
   USE_LOCATION: '',
   Button_state: false,
   firstLocation: '',
@@ -374,6 +379,14 @@ onMounted(() => {
       hide: false
     }
   ]
+  var newDate = new Date()
+  var year = newDate.getFullYear()
+  var moth = newDate.getMonth() + 1
+  if (moth < 10) moth = '0' + moth
+  var day = newDate.getDate()
+  if (day < 10) day = '0' + day
+  state.commitDate = year + '-' + moth + '-' + day
+
   WareList()
   getStorageSpecLocationList()
 })
@@ -411,6 +424,7 @@ async function handleReserve() {
       erpLocation: state.formData.ERPRECEIVELOCATION,
       erpFactory: state.formData.ERPRECEIVEFACTORY,
       locationName: state.StorageSelect[0] || '',
+      commitDate: state.commitDate,
       boxList: objectFull
     }
     await allocateStockInCommit(param)

src/views/stockOut/PurReturn/index.vue

@@ -106,6 +106,11 @@
     </div>
 
     <el-row class="page-search" justify="end" align="middle">
+      <div class="block"  style="float: right">
+        <el-form-item label="过账日期" prop="state.commitDate">
+          <el-date-picker :clearable="true" :editable="true" v-model="state.commitDate" type="date" placeholder="选择过账时间" value-format="YYYY-MM-DD"/>
+        </el-form-item>
+      </div>
       <div class="page-search-btns">
         <el-button type="primary" @click="handleStockOut" :disabled="state.button_state" v-loading="state.button_loadings">出库</el-button>
       </div>
@@ -150,6 +155,7 @@ const state: any = reactive({
   ABList: [{ value: 'A', label: 'A' }, { value: 'B', label: 'B' }],
   ENDING: '',
   INITILATION: '',
+  commitDate:'',
   STOCKSELECTLIST: [] as any,
   queryParams: {
     queryId: "",
@@ -308,6 +314,13 @@ onMounted(() => {
     { header: "生产日期", field: "MAKEDATE", hide: false },
     { header: "过期时间", field: "EXPIRINGDATE", hide: false },
   ];
+  let newDate = new Date();
+  let year = newDate.getFullYear();
+  let moth = newDate.getMonth() + 1;
+  if(moth < 10)  moth = '0' + moth;
+  let day = newDate.getDate();
+  if(day < 10)  day = '0' + day;
+  state.commitDate = year + '-' + moth + '-' + day
   updateTableHeight();
   window.addEventListener('resize', handleResize);
 });
@@ -487,15 +500,17 @@ function resetQuery() {
 async function handleStockOut() {
   if (state.MaterialPackingUsername.length > 0) {
     let param = {
-      userId: localStorage.get('userId'),
+      user: localStorage.get('userId'),
       siteName : "SDK",
       receiveRequestName: state.queryParams.params.SHIPREQUESTNAME,
       receiveRequestDetailName: state.queryParams.params.SHIPREQUESTDETAILNAME,
       shipRequestName : state.queryParams.params.SHIPREQUESTNAME,
+      commitDate: state.commitDate,
     };
     purReturnCommit(param).then((res: any) => {
       // handle(tempRow);
       // handleQuery();
+      console.log(res)
       if (IFTRUE(res)) {
         state.loading = false;
         state.loading2 = false;
@@ -505,7 +520,7 @@ async function handleStockOut() {
         state.button_state = false
         state.button_loadings = false;
       } else {
-        ElMessageBox.alert(res.data.RETURNCODE + '->' + res.data.RETURNMESSAGE, '', {
+        ElMessageBox.alert(res.message,"错误" , {
           confirmButtonText: 'OK',
         })
         state.button_state = false