11181010

src/components/Finance/billUploading.vue

@@ -82,7 +82,8 @@ export default {
             Ctable:'',
             Ctablelist:[],
             tableData:[],
-            panduanbtn:false
+            panduanbtn:false,
+            useridarr:[21,22,233,187,330,281]
         }
     },
     methods:{
@@ -302,7 +303,7 @@ export default {
         },
         //panduan
         panduanuserid(val){
-            if(val==187||val==21||val==22||val==233||val==258){
+            if(this.useridarr.indexOf(val)!=-1){
                 this.panduanbtn=true;
                 return -1
             }else{

src/components/OP/EntryDetails.vue

@@ -513,6 +513,11 @@
                                     <div class="sub-boxs">{{ scope.row.subTotal | numFilter }}</div>&nbsp;CNY
                                 </template>
                             </el-table-column>
+                            <el-table-column prop="remark" label="备注" width="450">
+                                <template slot-scope="scope">
+                                    <el-input size="mini" v-model="scope.row.remark"></el-input>
+                                </template>
+                            </el-table-column>
                             <el-table-column prop="address" label="操 作">
                                 <template slot-scope="scope">
                                     <el-button style="color: #fff;" size="mini" type="danger"
@@ -1254,6 +1259,7 @@ export default {
                     cost: 0,
                     currency: '',
                     subTotal: 0,
+                    remark:'',
                 },
                 {
                     id: 0,
@@ -1264,6 +1270,7 @@ export default {
                     cost: 0,
                     currency: '',
                     subTotal: 0,
+                    remark:'',
                 },
                 {
                     id: 0,
@@ -1274,6 +1281,7 @@ export default {
                     cost: 0,
                     currency: '',
                     subTotal: 0,
+                    remark:'',
                 },
                 {
                     id: 0,
@@ -1284,6 +1292,7 @@ export default {
                     cost: 0,
                     currency: '',
                     subTotal: 0,
+                    remark:'',
                 },
                 {
                     id: 0,
@@ -1294,6 +1303,7 @@ export default {
                     cost: 0,
                     currency: '',
                     subTotal: 0,
+                    remark:'',
                 },
                 {
                     id: 0,
@@ -1304,6 +1314,7 @@ export default {
                     cost: 0,
                     currency: '',
                     subTotal: 0,
+                    remark:'',
                 },
                 {
                     id: 0,
@@ -1314,6 +1325,7 @@ export default {
                     cost: 0,
                     currency: '',
                     subTotal: 0,
+                    remark:'',
                 },
                 {
                     id: 0,
@@ -1324,6 +1336,7 @@ export default {
                     cost: 0,
                     currency: '',
                     subTotal: 0,
+                    remark:'',
                 },
             ]
             var url = "/api/Groups/GetEnterExitCostInfobyDiId"
@@ -1778,6 +1791,7 @@ export default {
                     cost: 0,
                     currency: 0,
                     subTotal: 0,
+                    remark:'',
                 })
             }
 
@@ -1869,6 +1883,7 @@ export default {
                             cost: this.otherData[c].cost,
                             currency: this.otherData[c].currency,
                             subTotal: this.otherData[c].subTotal,
+                            remark: this.otherData[c].remark,
                         })
                     }
                 }
@@ -2449,9 +2464,9 @@ export default {
                             this.otherData[wm].rate = this.othercurrencys[cj].rate
                         }
                     }
+                    this.otherExpense += this.otherData[wm].subTotal;
                     if (this.otherData[wm].rate) {
                         this.otherData[wm].subTotal = this.otherData[wm].cost * this.otherData[wm].rate;
-                        this.otherExpense += this.otherData[wm].subTotal;
                     }
                 }
                 console.log(this.otherData);