Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/timesheet/src/views/expense/expense.vue

@@ -375,38 +375,98 @@
             v-loading="listLoading" :height="tableHeight - currentClickNum" style="width: 100%;"
             :summary-method="getSummaries" show-summary>
             <el-table-column type="selection" width="55"></el-table-column>
-            <el-table-column prop="code" :label="$t('ticketnumber')" width="120"></el-table-column>
-            <el-table-column prop="engineeringName" label="工程名称" width="200" v-if="user.companyId == 4811"></el-table-column>
+            <el-table-column prop="code" :label="$t('ticketnumber')" width="120">
+              <template slot-scope="scope">
+                <template v-if="user.companyId == 4811 && scope.row.status == 4">
+                  <span style="color: red">{{ scope.row.code }}</span>
+                </template>
+                <template v-else>{{ scope.row.code }}</template>
+              </template>
+            </el-table-column>
+            <el-table-column prop="engineeringName" label="工程名称" width="200" v-if="user.companyId == 4811">
+              <template slot-scope="scope">
+                <template v-if="user.companyId == 4811 && scope.row.status == 4">
+                  <span style="color: red">{{ scope.row.engineeringName }}</span>
+                </template>
+                <template v-else>{{ scope.row.engineeringName }}</template>
+              </template>
+            </el-table-column>
             <el-table-column prop="totalAmount" :label="$t('amountof') + '(' + $t('yuan') + ')'" align="center" width="120">
               <template slot-scope="scope">
-                <span style="float:right;margin-right:20px">{{ scope.row.totalAmount ? scope.row.totalAmount.toFixed(2) :
-                  '0' }}</span>
+                <template v-if="user.companyId == 4811 && scope.row.status == 4">
+                  <span style="color: red">
+                    <span style="float:right;margin-right:20px">{{ scope.row.totalAmount ? scope.row.totalAmount.toFixed(2) : '0' }}</span>
+                  </span>
+                </template>
+                <template v-else>
+                  <span style="float:right;margin-right:20px">{{ scope.row.totalAmount ? scope.row.totalAmount.toFixed(2) : '0' }}</span>
+                </template>
               </template>
             </el-table-column>
             <el-table-column prop="ownerName" :label="$t('peopleconcerned')">
               <template slot-scope="scope">
                 <div>
-                  <span v-if="user.userNameNeedTranslate != 1">
-                    {{ scope.row.ownerName }}
-                  </span>
-                  <span v-if="user.userNameNeedTranslate == 1">
-                    <TranslationOpenDataText type='userName' :openid='scope.row.ownerName'></TranslationOpenDataText>
-                  </span>
+                  <template v-if="user.companyId == 4811 && scope.row.status == 4">
+                    <span style="color: red">
+                      <span v-if="user.userNameNeedTranslate != 1">
+                        {{ scope.row.ownerName }}
+                      </span>
+                      <span v-if="user.userNameNeedTranslate == 1">
+                        <TranslationOpenDataText type='userName' :openid='scope.row.ownerName'></TranslationOpenDataText>
+                      </span>
+                    </span>
+                  </template>
+                  <template v-else>
+                    <span v-if="user.userNameNeedTranslate != 1">
+                      {{ scope.row.ownerName }}
+                    </span>
+                    <span v-if="user.userNameNeedTranslate == 1">
+                      <TranslationOpenDataText type='userName' :openid='scope.row.ownerName'></TranslationOpenDataText>
+                    </span>
+                  </template>
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="createDate" :label="$t('fillinthedate')" width="100"></el-table-column>
+            <el-table-column prop="createDate" :label="$t('fillinthedate')" width="100">
+              <template slot-scope="scope">
+                <template v-if="user.companyId == 4811 && scope.row.status == 4">
+                  <span style="color: red">{{ scope.row.createDate }}</span>
+                </template>
+                <template v-else>{{ scope.row.createDate }}</template>
+              </template>
+            </el-table-column>
             <el-table-column prop="ticketNum" :label="$t('invoicenumber')"
               v-if="this.user.timeType.easyExpense == 0 && user.companyId != 4811"></el-table-column>
             <el-table-column prop="type" :label="$t('ppertype')" v-if="this.user.timeType.easyExpense == 0">
               <template slot-scope="scope">
-                {{ scope.row.expenseMainTypeName }}
+                <template slot-scope="scope">
+                  <template v-if="user.companyId == 4811 && scope.row.status == 4">
+                    <span style="color: red">{{ scope.row.expenseMainTypeName }}</span>
+                  </template>
+                  <template v-else>{{ scope.row.expenseMainTypeName }}</template>
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column prop="equipmentOwnerName" label="设备归属人" v-if="user.companyId == 4811" width="150">
+              <template slot-scope="scope">
+                <template v-if="user.companyId == 4811 && scope.row.status == 4">
+                  <span style="color: red">{{ scope.row.equipmentOwnerName }}</span>
+                </template>
+                <template v-else>{{ scope.row.equipmentOwnerName }}</template>
               </template>
             </el-table-column>
-            <el-table-column prop="equipmentOwnerName" label="设备归属人" v-if="user.companyId == 4811" width="150"></el-table-column>
             <el-table-column prop="remark" :label="$t('bei-zhu')" width="180">
               <template slot-scope="scope">
-                <span style="font-size:12px;">{{ scope.row.remark }}</span>
+                <template slot-scope="scope">
+                  <template v-if="user.companyId == 4811 && scope.row.status == 4">
+                    <span style="color: red">
+                      <span style="font-size:12px;">{{ scope.row.remark }}</span>
+                    </span>
+                  </template>
+                  <template v-else>
+                    <span style="font-size:12px;">{{ scope.row.remark }}</span>
+                  </template>
+                </template>
               </template>
             </el-table-column>
             <el-table-column prop="status" :label="$t('state.states')" width="80">