Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/distribution/reservation/reservationAddFrom.vue

@@ -123,7 +123,7 @@
           </el-col>
           <el-col :span="10">
             <el-form-item label="安&emsp;&emsp;装:" prop="serveType" label-width="100px">
-              <el-radio-group v-model="form.IsInstall" v-for="item in this.whetherData">
+              <el-radio-group v-model="form.isInstall" v-for="item in this.whetherData">
                 <el-radio :label="item.dictKey" :value="item.dictKey">{{ item.dictValue }}&emsp; </el-radio>
               </el-radio-group>
             </el-form-item>
@@ -1922,7 +1922,7 @@ export default {
       },
       // 表单数据
       form: {
-      IsInstall:'1',//安装
+      isInstall:'1',//安装
       },
       // 选择行
       selectionList: [],
@@ -2731,11 +2731,12 @@ export default {
                   }
                 }
               }
+          
               // 开启提交按钮loading
               this.loadingObj.submitBtnLoading = true;
               this.reservationloading = true; //开启全屏加载
               this.form.id = this.reservationId;
-
+              console.log(this.form,'this.form');
               const res = await update(this.form);
               console.log('res :>> ', res);
               if (res.data.code !== 200) return;

src/views/warehouse/warehousesignedorder/SignedDetails.vue

@@ -317,7 +317,7 @@ const reservationCodeClick=(row)=>{
   $router.push({
         path: '/distribution/signfor/distributionSignforedt',
         query: {
-          id: row.id,
+          id: row.signforId,
           reservationId: row.reservationId,
           name: `${row.reservationCode}待签收查看`,
           isZero: 0,