委外

src/views/modules/sale/outsource-detail.vue

@@ -32,11 +32,11 @@
           </el-checkbox-group>
         </e-desc-item>
 
-        <e-desc-item label="委外类别">{{dataForm.commissionType}}</e-desc-item>
+<!--        <e-desc-item label="委外类别">{{dataForm.commissionType}}</e-desc-item>-->
         <e-desc-item label="申请人">{{dataForm.applier}}</e-desc-item>
-        <e-desc-item label="申请部门">{{dataForm.orgName}}</e-desc-item>
+        <e-desc-item label="申请部门" span="2">{{dataForm.orgName}}</e-desc-item>
 
-        <e-desc-item label="备注说明" span="3">{{dataForm.notes}}</e-desc-item>
+<!--        <e-desc-item label="备注说明" span="3">{{dataForm.notes}}</e-desc-item>-->
       </e-desc>
       <e-desc title="委外产品明细">
         <el-table
@@ -111,6 +111,15 @@
             :show-tooltip-when-overflow="true"
             label="要求说明">
           </el-table-column>
+          <el-table-column
+            prop="commissionType"
+            header-align="center"
+            align="center"
+            label="委外类别">
+            <template slot-scope="scope">
+              <span>{{scope.row.commissionType?(Number(scope.row.commissionType) === 1?'工序委外':'成品委外'):''}}</span>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="arrivedTime"
             header-align="center"
@@ -250,8 +259,8 @@
               this.idsPayType.push(data.data.payType)
             }
             // 获取采购物品明细
-            if (data.data.details) {
-              this.materialDetails = data.data.details
+            if (data.data.purCommissionDetails) {
+              this.materialDetails = data.data.purCommissionDetails
               this.calTotal()
             }
             // 初始化审批Form

src/views/modules/sale/outsource-pop.vue

@@ -14,7 +14,7 @@
             <el-input-number v-model="dataForm.taxPrice" :step="1" :min="0" :precision="1"></el-input-number>
           </el-form-item>
           <el-form-item label="含税总价" prop="taxAmount">
-            <el-input-number v-model="dataForm.taxAmount" :step="1" :min="0" :precision="1"></el-input-number>
+            <span>{{dataForm.cnt * dataForm.taxPrice}}</span>
           </el-form-item>
           <el-form-item label="税率" prop="taxRate">
             <el-input-number style="width: 160px" v-model="dataForm.taxRate" :step="1" :precision="1"/>&nbsp;%
@@ -44,13 +44,17 @@ export default {
     data () {
       return {
         id: 0,
-        dataForm: {},
+        dataForm: {
+          price: 1,
+          taxPrice: 1,
+          taxRate: 1,
+          cnt: 1
+        },
         dataRule: {
           supplierId: [{ required: true, message: '请选择供应商', trigger: 'change' }],
-          price: [{ required: true, message: '不含税单价不能为空', trigger: 'blur' }],
-          taxPrice: [{ required: true, message: '含税单价不能为空', trigger: 'blur' }],
-          taxAmount: [{ required: true, message: '含税总价不能为空', trigger: 'blur' }],
-          taxRate: [{ required: true, message: '税率不能为空', trigger: 'blur' }]
+          price: [{ required: true, message: '不含税单价不能为空', trigger: 'change' }],
+          taxPrice: [{ required: true, message: '含税单价不能为空', trigger: 'change' }],
+          taxRate: [{ required: true, message: '税率不能为空', trigger: 'change' }]
         }
       }
     },
@@ -58,8 +62,9 @@ export default {
       onChose () {
         this.$emit('onChose')
       },
-      async init (id) {
+      async init (id, cnt) {
         this.dataForm.purComDetailId = id
+        this.dataForm.cnt = cnt
       },
       validateField (type) {
         this.$refs.dataForm.validateField(type)

src/views/modules/sale/outsource.vue

@@ -225,7 +225,7 @@
           <template slot-scope="scope">
             <el-button v-if="isAuth('pur:commDetail:info')" type="text" size="small" @click="detailHandle(scope.row.purchaseId)">查看</el-button>
             <el-button v-if="isAuth('pur:commDetail:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.purchaseId)">编辑</el-button>
-            <el-button v-if="isAuth('pur:commDetail:updatePurCommissionDetail') && (Number(scope.row.purchaseState) === 1)" type="text" size="small" @click="outsourceHandle(scope.row.purComDetailId)">委外</el-button>
+            <el-button v-if="isAuth('pur:commDetail:updatePurCommissionDetail') && (Number(scope.row.purchaseState) === 1)" type="text" size="small" @click="outsourceHandle(scope.row)">委外</el-button>
             <el-button v-if="isAuth('pur:commDetail:infoPutIn') && (Number(scope.row.purchaseState) === 2)" type="text" size="small" @click="inBound(scope.row.purComDetailId, false)">入库</el-button>
             <el-button v-if="isAuth('pur:commDetail:infoPutInAgain') && (Number(scope.row.purchaseState) === 5)" type="text" size="small" @click="inBound(scope.row.purComDetailId, false)">再次入库</el-button>
           </template>
@@ -494,10 +494,10 @@ export default {
       })
     },
     // 委外
-    outsourceHandle (id) {
+    outsourceHandle (row) {
       this.outsourceVisible = true
       this.$nextTick(() => {
-        this.$refs.refOutsource.init(id)
+        this.$refs.refOutsource.init(row.purComDetailId, row.cnt)
       })
     }
   }