瀏覽代碼

修改bug

web100 2 年之前
父節點
當前提交
264925b319

+ 2 - 2
src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -160,10 +160,10 @@
               <el-button type="primary" icon="el-icon-plus" size="small" @click="commoditySelection"
                 :disabled="detailData.seeDisabled">录入明细
               </el-button>
-              <el-button type="warning" icon="el-icon-plus" size="small"
+              <!-- <el-button type="warning" icon="el-icon-plus" size="small"
                 :disabled="selection.length !== contactsData.length || detailData.seeDisabled || form.createFreight == 1 || contactsData.length == 0"
                 @click="getShipmentC">生成工厂发货
-              </el-button>
+              </el-button> -->
               <el-button type="info" :size="size" icon="el-icon-printer" @click.stop="openReport()">报 表</el-button>
             </template>
           </avue-crud>

+ 2 - 0
src/views/businessManagement/purchaseOrder/index.vue

@@ -597,6 +597,7 @@ export default {
       }
       generateShipment(data).then(res => {
         let generateShipmentId = res.data.data.id
+        let generateMount = res.data.data.orderAmount
         this.$confirm("此操作将生成工厂发货,是否继续?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -642,6 +643,7 @@ export default {
           delete res.data.data.debitAmount
           res.data.data.deliveryItemsList.forEach(item => item.deliveryAmount = item.amount)
           res.data.data.srcId = generateShipmentId
+          res.data.data.purchaseAmount = generateMount
           genfactory(res.data.data).then(() => {
             this.$message.success('生成工厂发货成功')
             this.onLoad(this.page, this.search);

+ 8 - 6
src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -1382,13 +1382,15 @@ export default {
 
           // this.form.deliveryFeesList
           // 计算 deliveryFeesList 中 amount 的总和
-          let totalAmount = 0;
-          for(i=0;i<this.form.deliveryFeesList.length;i++){ 
-            totalAmount +=  this.form.deliveryFeesList[i].amount
-          }
-          console.log(totalAmount);
+          // let totalAmount = 0;
+          //   if(this.form.deliveryFeesList){
+          //     for(let i=0;i<this.form.deliveryFeesList.length;i++){ 
+          //       totalAmount +=  this.form.deliveryFeesList[i].amount
+          //     }
+          // }
+          
           //计算费用明细
-          this.form.number = Number(this.form.purchaseAmount) + totalAmount
+          // this.form.number = Number(this.form.purchaseAmount) + totalAmount
           console.log(this.form.number);
           if (typeof this.form.corpsTypeId == 'object') {
             this.form.corpsTypeId = this.form.corpsTypeId.join(",")

+ 2 - 2
src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -310,10 +310,10 @@
                 政策
               </el-button>
               <!--              禁用规则:未选择明细,未点击编辑按钮,未进行审批,已经生成过-->
-              <el-button type="warning" icon="el-icon-plus" size="small"
+              <!-- <el-button type="warning" icon="el-icon-plus" size="small"
                 :disabled="selection.length !== goodsShowData.length || detailData.seeDisabled || !form.status || form.status < 3 || form.createFreight == 1 || goodsShowData.length == 0"
                 @click="getShipmentD" v-show="goodsActives == 'goods'">生成客户收货
-              </el-button>
+              </el-button> -->
               <el-button type="info" :size="size" icon="el-icon-printer" @click.stop="openReport()"
                 v-show="goodsActives == 'goods'">报表打印
               </el-button>