Browse Source

代码上传

zhangqiOMG 2 years ago
parent
commit
b8e2277807

+ 3 - 3
src/HDrpManagement/contractManage/modules/detail.vue

@@ -214,11 +214,11 @@ export default {
       })
       this.mainData = res.data
       this.$refs.details.param.content.type = this.$route.query.tabIndex
-      
+      // this.$refs.details.param.content.where.type = this.$route.query.type
       this.mainData.type == '项目' 
         ? this.mainData.typemx == '直销' 
-          ? this.$router.replace({path:'/contractDetail',query:{id:this.$route.query.id,rowindex:this.$route.query.rowindex,type:'直销项目'}}) : this.$router.replace({path:'/contractDetail',query:{id:this.$route.query.id,rowindex:this.$route.query.rowindex,type:'经销项目'}})
-          : this.$router.replace({path:'/contractDetail',query:{id:this.$route.query.id,rowindex:this.$route.query.rowindex,type:this.mainData.type}})
+          ? this.$router.replace({path:'/contractDetail',query:{id:this.$route.query.id,rowindex:this.$route.query.rowindex,type:'直销项目',tabIndex:this.$route.query.tabIndex}}) : this.$router.replace({path:'/contractDetail',query:{id:this.$route.query.id,rowindex:this.$route.query.rowindex,type:'经销项目',tabIndex:this.$route.query.tabIndex}})
+          : this.$router.replace({path:'/contractDetail',query:{id:this.$route.query.id,rowindex:this.$route.query.rowindex,type:this.mainData.type,tabIndex:this.$route.query.tabIndex}})
 
       this.changeDataStructure()
     },

+ 13 - 2
src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/components/editmx.vue

@@ -13,7 +13,7 @@
           <el-input v-model="form.invoiceaqty" autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item label="税率">
-          <el-input v-model="form.name" autocomplete="off"></el-input>
+          <el-input v-model="form.taxrate" autocomplete="off"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -26,7 +26,7 @@
 
 <script>
 export default {
-  props:['status'],
+  props:['data','status'],
   data () {
     return {
       dialogFormVisible:false,
@@ -35,6 +35,17 @@ export default {
   },
   methods:{
     onShow () {
+      console.log(this.data)
+      this.form = {
+        "sa_invoicebill_itemid": this.data.sa_invoicebill_itemid, 
+        "sa_invoiceapply_orderid":this.data.sa_invoiceapply_orderid,
+        "itemno": this.data.itemno, 
+        "itemname": this.data.itemname, 
+        "spec": this.data.spec,
+        "price": this.data.price, 
+        "invoiceaqty": this.data.num, 
+        "invoiceamount": this.data.invoiceamount
+      }
       this.dialogFormVisible = true
     }
   }

+ 1 - 1
src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/components/invoiceTablemx.vue

@@ -42,7 +42,7 @@
       </el-table-column>
       <el-table-column label="操作" width="90" fixed="right">
         <template slot-scope="scope">
-          <editmx class="inline-16" :status="status"></editmx>
+          <editmx class="inline-16" :status="status" :data="scope.row"></editmx>
           <el-button :disabled="status !== '新建'" size="small" type="text" @click="deleteRow(scope.row)">删 除</el-button>
         </template>
       </el-table-column>