添加打印中文

src/views/purchaseRequest/index.vue

@@ -106,16 +106,16 @@
           <tr>
             <td class="column" style="width: 15%;border-top: none;">品名</td>
             <td class="column" style="width: 15%;border-top: none;">单价</td>
-            <td class="column" style="width: 15%;border-top: none;">采购计划(斤)</td>
-            <td class="column" style="width: 15%;border-top: none;">实际重量(斤)</td>
+            <td class="column" style="width: 15%;border-top: none;">采购计划</td>
+            <td class="column" style="width: 15%;border-top: none;">实际重量</td>
             <td class="column" style="width: 15%;border-top: none;">金额</td>
             <td class="column" style="width: 20%;border-top: none;">备注</td>
           </tr>
-          <tr v-for="(item,index) in this.contentList" :key="index">
+          <tr v-for="(item,index) in contentList" :key="index">
             <td class="column">{{item.feeName}}</td>
             <td class="column">{{item.fUnitprice}}</td>
-            <td class="column">{{item.fPurchase}}</td>
-            <td class="column">{{item.fQty}}</td>
+            <td class="column">{{item.fPurchase}}({{item.fFeeunitName}})</td>
+            <td class="column">{{item.fQty}}({{item.fFeeunitName}})</td>
             <td class="column">{{item.fAmount}}</td>
             <td class="column">{{item.remark}}</td>
           </tr>
@@ -1074,6 +1074,19 @@ export default {
           this.$refs.avatar.submitForm('submit')
           break
         case '打印':
+          console.log(this.listData.fFeeid,this.contentList)
+          for (let item in this.contentList){
+            for (let li in this.listData.fFeeid){
+              if (this.contentList[item].fFeeid == this.listData.fFeeid[li].value){
+                this.contentList[item].feeName = this.listData.fFeeid[li].label
+              }
+            }
+            for(let i in this.listData.fFeeunitid){
+              if (this.contentList[item].fFeeunitid == this.listData.fFeeunitid[i].value){
+                this.contentList[item].fFeeunitName = this.listData.fFeeunitid[i].label
+              }
+            }
+          }
           if (!this.$refs.avatar.form.fId){
             this.$message.error('未保存，不允许打印');
           }else if (this.$refs.avatar.form.fBillstatus >= 4){
@@ -1220,9 +1233,21 @@ export default {
             auditItem:y + '-' + m + '-' + d
           }
           console.log(data)
-          // revoke(data).then(res=>{
-          //   console.log(res)
-          // })
+          revoke(data).then(res=>{
+            if (res.code === 200){
+              this.$message({
+                showClose: true,
+                message: '撤销成功',
+                type: 'success'
+              })
+              data = {
+                tableName: this.queryList.tableName,
+                userId: Cookies.get('userName')
+              }
+              this.getRow(data)
+              this.query(this.formDataList)
+            }
+          })
           break
         case '撤销采购':
           withdrawBy(this.$refs.avatar.form.fId).then(res=>{