Browse Source

修改bug

web100 2 years ago
parent
commit
1f6c2a2d2c

+ 1 - 1
src/views/businessManagement/deliveryNotice/index.vue

@@ -12,7 +12,7 @@
           <el-button type="info" :size="size" icon="el-icon-printer" :loading="exportLoading" @click.stop="statement">
           <el-button type="info" :size="size" icon="el-icon-printer" :loading="exportLoading" @click.stop="statement">
             报表打印</el-button>
             报表打印</el-button>
           <el-button type="warning" size="small" icon="el-icon-top" @click.stop="openExport()">导出</el-button>
           <el-button type="warning" size="small" icon="el-icon-top" @click.stop="openExport()">导出</el-button>
-          <el-button type="danger" size="small" icon="el-icon-edit-outline" :disabled="!generateVoucher" @click="submitCredentials">生成凭证</el-button>
+          <!-- <el-button type="danger" size="small" icon="el-icon-edit-outline" :disabled="!generateVoucher" @click="submitCredentials">生成凭证</el-button> -->
         </template>
         </template>
         <template slot-scope="scope" slot="orgOrderNo">
         <template slot-scope="scope" slot="orgOrderNo">
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row, scope.index)">
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row, scope.index)">

+ 4 - 0
src/views/businessManagement/salesOrder/index.vue

@@ -649,12 +649,14 @@ export default {
         let arr = [];
         let arr = [];
         this.openFullScreen(false, "正在生成客户收货...");
         this.openFullScreen(false, "正在生成客户收货...");
         detail(row.id).then(res => {
         detail(row.id).then(res => {
+          console.log('detail',res.data.data);
             arr = res.data.data.orderItemsList
             arr = res.data.data.orderItemsList
               ? res.data.data.orderItemsList
               ? res.data.data.orderItemsList
               : [];
               : [];
             if (arr.length === 0)
             if (arr.length === 0)
               return this.$message.error("该单子明细为空,不能生成客户收货");
               return this.$message.error("该单子明细为空,不能生成客户收货");
             let ids = [];
             let ids = [];
+            let storageIds = res.data.data.storageId
             arr.forEach(item => ids.push(item.id));
             arr.forEach(item => ids.push(item.id));
             this.$confirm("此操作将进行客户收货,是否继续?", {
             this.$confirm("此操作将进行客户收货,是否继续?", {
               confirmButtonText: "确定",
               confirmButtonText: "确定",
@@ -729,6 +731,8 @@ export default {
               delete res.data.data.sysNo
               delete res.data.data.sysNo
               delete res.data.data.corpName
               delete res.data.data.corpName
               delete res.data.data.belongToCorpList
               delete res.data.data.belongToCorpList
+              //上面接口返回的storageId赋给下面的
+              res.data.data.storageId = storageIds
               genClient(res.data.data).then(() => {
               genClient(res.data.data).then(() => {
                 this.$message.success('客户收货成功')
                 this.$message.success('客户收货成功')
                 this.openFullScreen(true);
                 this.openFullScreen(true);