05101746lhj

src/components/Finance/Currency.vue

@@ -565,7 +565,11 @@ export default {
     },
     filters:{
         filter_time(value){
-            return value.split(' ')[0];
+            if(value){
+                return value.split(' ')[0];
+            }else{
+                return value
+            }
         }
     },
     mounted() {

src/components/Finance/Overspend.vue

@@ -308,6 +308,8 @@ export default {
                     filePath:'',
                     remark:'',
                     createUser:that.userId,
+                    priceDt:'',
+                    priceCount:0
                 }
             }).then(function (res) {
                 if(res.data.code==200){

src/components/OP/CarTouristGuideGroundId.vue

@@ -41,7 +41,7 @@
             <template>
                 <el-table :data="tableDatas.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border
                     style="width: 100%" v-loading="loading" element-loading-text="拼命加载中...">
-                    <el-table-column prop="num" label="序 号">
+                    <el-table-column prop="num" label="序 号" width="55">
                         <template slot-scope="scope">
                             {{ (currentPage - 1) * pageSize + scope.$index + 1 }}
                         </template>
@@ -83,7 +83,7 @@
                             {{ scope.row.remainingBalance }} {{ scope.row.currencyStr }}
                         </template>
                     </el-table-column>
-                    <el-table-column prop="isAuditGM" label="是否审核">
+                    <el-table-column prop="isAuditGM" label="是否审核" width="90">
                         <template slot-scope="isAuditGM">
                             <span v-if="isAuditGM.row.isAuditGM == 1">已通过</span>
                             <span v-else-if="isAuditGM.row.isAuditGM == 0">未审核</span>
@@ -91,12 +91,18 @@
                             <span v-else>自动审核通过</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="id" label="详细费用">
+                    <el-table-column prop="isPay" label="是否支付" width="90">
+                        <template slot-scope="isPay">
+                            <span v-if="isPay.row.isPay == 1">已支付</span>
+                            <span v-else-if="isPay.row.isPay == 0">未支付</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="id" label="详细费用" >
                         <template slot-scope="scope">
                             <el-button @click="AddDetails(scope.row.id)" size="small">点击填写</el-button>
                         </template>
                     </el-table-column>
-                    <el-table-column label="操作">
+                    <el-table-column label="操作" width="120">
                         <template slot-scope="scope">
                             <!-- <el-button-group> -->
                                 <el-button type="primary" size="mini" icon="el-icon-edit"

src/components/OP/DecreasePayments.vue

@@ -50,11 +50,11 @@
                     </el-table-column>
                     <el-table-column prop="filePath" label="附件">
                     </el-table-column>
-                    <el-table-column prop="createUserName" label="操作人" width="120">
+                    <el-table-column prop="createUserName" label="操作人" width="100">
                     </el-table-column>
                     <el-table-column prop="createTime" label="操作时间">
                     </el-table-column>
-                    <el-table-column prop="isAudit" label="是否审核" width="120">
+                    <el-table-column prop="isAudit" label="是否审核" width="90">
                         <template slot-scope="isAudit">
                             <span v-if="isAudit.row.isAudit == 1">已通过</span>
                             <span v-else-if="isAudit.row.isAudit == 0">未审核</span>
@@ -62,6 +62,12 @@
                             <span v-else>自动审核通过</span>
                         </template>
                     </el-table-column>
+                    <el-table-column prop="isPay" label="是否支付" width="90">
+                        <template slot-scope="isPay">
+                            <span v-if="isPay.row.isPay == 1">已支付</span>
+                            <span v-else-if="isPay.row.isPay == 0">未支付</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="操作" width="280">
                         <template slot-scope="scope">
                             <el-button size="mini" @click="download(scope.$index, scope.row)">下载</el-button>

src/components/OP/EntryDetails.vue

@@ -490,7 +490,7 @@
                             label=" 币 种"
                             width="180">
                                 <template slot-scope="scope">
-                                    <el-input size="mini" v-model="scope.row.currencyName"></el-input>
+                                    <el-input disabled size="mini" v-model="scope.row.currencyName"></el-input>
                                 </template>
                             </el-table-column>
                             <el-table-column
@@ -549,22 +549,7 @@ export default {
             fullscreenLoading:false,
 
 
-            options: [{
-            value: '选项1',
-            label: '黄金糕'
-            }, {
-            value: '选项2',
-            label: '双皮奶'
-            }, {
-            value: '选项3',
-            label: '蚵仔煎'
-            }, {
-            value: '选项4',
-            label: '龙须面'
-            }, {
-            value: '选项5',
-            label: '北京烤鸭'
-            }],
+            options: [],
             listvalue:1005,
             tablevalue:'',
             listvalueoptions:[],
@@ -620,46 +605,7 @@ export default {
             //下拉框
             treeData: "",
             treeDataValue: "",
-            data: [
-                {
-                id: 1,
-                name: "一级 1",
-                children: [
-                    {
-                    id: 4,
-                    label: "二级 1-1",
-                    },
-                ],
-                },
-                {
-                id: 2,
-                name: "一级 2",
-                children: [
-                    {
-                    id: 5,
-                    name: "二级 2-1",
-                    },
-                    {
-                    id: 6,
-                    name: "二级 2-2",
-                    },
-                ],
-                },
-                {
-                id: 3,
-                name: "一级 3",
-                children: [
-                    {
-                    id: 7,
-                    name: "二级 3-1",
-                    },
-                    {
-                    id: 8,
-                    name: "二级 3-2",
-                    },
-                ],
-                },
-            ],
+            data: [],
             defaultProps: {
                 children: "cityData",
                 label:"city",
@@ -2180,4 +2126,7 @@ export default {
     left: 6px;
     
 }
+.Entry-all .el-table th.el-table__cell>.cell{
+    text-align:center;
+}
 </style>

src/components/OP/VisaPriec.vue

@@ -66,6 +66,12 @@
                             <span v-else>自动审核通过</span>
                         </template>
                     </el-table-column>
+                    <el-table-column prop="isPay" label="是否支付">
+                        <template slot-scope="isPay">
+                            <span v-if="isPay.row.isPay == 1">已支付</span>
+                            <span v-else-if="isPay.row.isPay == 0">未支付</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="操作">
                         <template slot-scope="scope">
                             <el-button type="primary" size="mini" icon="el-icon-edit"

src/components/Resource/OfficialActivities.vue

@@ -227,7 +227,7 @@ export default {
     },
     filters: {
         capitalize(val) {
-            if(val.split(" ")){
+            if(val){
                 return val.split(" ")[0]
             }else{
                 return val