yusheng 10 месяцев назад
Родитель
Сommit
9a2d199b4f

+ 10 - 7
src/BIZComponents/inventoryTable.vue

@@ -680,7 +680,6 @@
         <el-form-item
           style="margin-bottom: 20px"
           :prop="'datasource.' + scope.$index + '.' + countObj.unitIdKey"
-
         >
           <el-select
             v-model="scope.row[countObj.unitIdKey]"
@@ -892,6 +891,10 @@
         type: Boolean,
         default: false
       },
+      defTaxRate: {
+        type: Number,
+        default: 0
+      },
       countObj: {
         type: Object,
         default: () => {
@@ -913,7 +916,7 @@
         workHour: '',
         guaranteePeriodUnitCode: '',
         technicalDrawings: [],
-        arrivalWay:1
+        arrivalWay: 1
       };
       return {
         levelList,
@@ -933,7 +936,7 @@
           { label: '一次性到货', value: 1 },
           { label: '分批到货', value: 2 }
         ],
-        columnsVersion:1
+        columnsVersion: 1
       };
     },
     computed: {
@@ -941,7 +944,7 @@
         return this.form.datasource.length;
       },
       columns() {
-        let columnsVersion=this.columnsVersion
+        let columnsVersion = this.columnsVersion;
         let orderColumn = {
           width: 1,
           show: false
@@ -1705,7 +1708,8 @@
           let row = JSON.parse(JSON.stringify(this.defaultForm));
           row.key = this.form.datasource.length + 1;
           let parasm = idx == -1 ? row : this.form.datasource[i];
-
+          console.log(this.defTaxRate,'this.defTaxRate')
+          this.$set(parasm, 'taxRate', this.defTaxRate);
           this.$set(parasm, 'productId', item.id);
           this.$set(parasm, 'categoryName', item.name);
           this.$set(parasm, 'productCategoryId', item.categoryLevelId);
@@ -1720,7 +1724,6 @@
           this.$set(parasm, 'weightUnit', item.weightUnit);
           this.$set(parasm, 'singleWeight', item.netWeight);
           this.$set(parasm, 'pricingWay', 1);
-          console.log(item.goodsLevel,'item.goodsLevel')
           this.$set(parasm, 'goodsLevel', item.goodsLevel);
           this.$set(
             parasm,
@@ -1748,7 +1751,7 @@
             this.$set(parasm, 'orderNo', this.orderOption[0]?.orderNo);
             this.$set(parasm, 'orderId', this.orderOption[0]?.orderId);
           }
-          if (this.isGoods) {
+          if (this.isGoods&&item.goodsId) {
             this.$set(parasm, 'goodsId', item.goodsId);
             this.$set(parasm, 'goodsPriceId', item.goodsPriceId);
             this.$set(parasm, 'goodsPriceType', item.goodsPriceType);

+ 28 - 0
src/views/purchasingManage/purchaseOrder/components/inventoryTable.vue

@@ -267,6 +267,33 @@
           >
             <template slot="append">元</template>
           </el-input>
+          <!-- <el-popover placement="right" width="600" trigger="click">
+            <el-table >
+              <el-table-column
+                width="300"
+                property="date"
+                label="供应商"
+              ></el-table-column>
+              <el-table-column
+                width="150"
+                property="name"
+                label="最近采购价格"
+              ></el-table-column>
+              <el-table-column
+                width="150"
+                property="address"
+                label="历史采购价格"
+              ></el-table-column>
+            </el-table>
+            <el-input
+              slot="reference"
+              v-model="scope.row.singlePrice"
+              placeholder="请输入"
+              @input="changeCount(scope.row, scope.$index)"
+            >
+              <template slot="append">元</template>
+            </el-input>
+          </el-popover> -->
         </el-form-item>
       </template>
       <template v-slot:goodsPriceType="{ row, $index }">
@@ -1341,6 +1368,7 @@
           this.$set(parasm, 'singleWeight', item.roughWeight);
           this.$set(parasm, 'pricingWay', item.pricingWay || 1);
           this.$set(parasm, 'goodsLevel', item.level);
+          this.$set(parasm, 'taxRate', 13);
 
           this.$set(
             parasm,

+ 2 - 12
src/views/purchasingManage/purchaseOrder/outSourceSend/index.vue

@@ -398,22 +398,12 @@
               businessName: res.supplierName,
               businessType: '委外发货单'
             }
-            // callBackMethodType : '1',
-            // callBackMethod : 'proTargetPlanApproveApiImpl.updatePlanApprovalStatus',
-            // pcHandle : '/bpm/handleTask/components/project-manage/plan-manage/submit.vue',
-            // pcView : '/bpm/handleTask/components/project-manage/plan-manage/detailDialog.vue',
-            // miniHandle : '',
-            // miniView : '',
+
           };
 
           this.$refs.processSubmitDialogRef.init(params);
         });
-        // submit({
-        //   businessId: res.id
-        // }).then((res) => {
-        //   this.$message.success('提交成功!');
-        //   this.reload();
-        // });
+
       },
       //查看详情
       openorderDetail(row, type) {

+ 1 - 0
src/views/saleManage/saleOrder/components/addDialog.vue

@@ -299,6 +299,7 @@
         :cacheKeyUrl="cacheKeyUrl"
         :isGoods="true"
         :isSinglePrice="form.needProduce != 2"
+        :defTaxRate="13"
       ></inventoryTable>
       <headerTitle
         title="类型清单"

+ 4 - 4
src/views/saleManage/saleOrder/components/bomDialog.vue

@@ -232,10 +232,10 @@
             width: 150
           },
 
-          {
-            prop: 'level',
-            label: '层级'
-          },
+          // {
+          //   prop: 'level',
+          //   label: '层级'
+          // },
 
           {
             prop: 'brandNum',