qukaidi пре 4 година
родитељ
комит
2506b1e943

+ 5 - 1
src/views/finance/charge/index.vue

@@ -887,7 +887,11 @@
           <el-table-column label="货权方" align="center" prop="fName" />
           <el-table-column label="提单号" align="center" prop="fMblno" />
           <el-table-column label="品名" align="center" prop="fProductName" />
-          <el-table-column label="业务日期" align="center" prop="fBsdate" />
+                <el-table-column label="业务日期" align="center">
+          <template slot-scope="scope" v-if="scope.row.fBsdate">
+            <span>{{ scope.row.fBsdate.slice(0, 10) }}</span>
+          </template>
+        </el-table-column>
           <el-table-column label="业务类型" align="center" prop="fBilltype">
             <template slot-scope="scope">
               <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>

+ 6 - 2
src/views/finance/contrast/index.vue

@@ -752,7 +752,7 @@
               </el-select>
             </template>
           </el-form-item>
-          <el-form-item label="仓储业务" prop="fFeeid">
+          <el-form-item label="仓储业务" prop="fFeeid" v-if="typevalue == 1">
             <el-select
               v-model="TWareHouseFees.fBilltype"
               size="small"
@@ -855,7 +855,11 @@
             <!-- <el-table-column label="账单日期" align="center" prop="fAccbilldate"/> -->
             <el-table-column label="提单号" align="center" prop="fMblno" />
             <el-table-column label="品名" align="center" prop="fProductName" />
-            <el-table-column label="业务日期" align="center" prop="fBsdate" />
+            <el-table-column label="业务日期" align="center">
+              <template slot-scope="scope" v-if="scope.row.fBsdate">
+                <span>{{ scope.row.fBsdate.slice(0, 10) }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="业务类型" align="center" prop="fBilltype">
               <template slot-scope="scope">
                 <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>

+ 11 - 12
src/views/finance/payment/index.vue

@@ -170,15 +170,11 @@
           <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="付费日期"
-        align="center"
-        sortable
-        width="120">
+      <el-table-column label="付费日期" align="center" sortable width="120">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fAccbilldate, "{y}-{m}-{d}") }}</span>
         </template>
-        </el-table-column>
+      </el-table-column>
       <el-table-column
         label="提单号"
         align="center"
@@ -263,7 +259,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['finance:payment:edit']"
-             v-if="
+            v-if="
               scope.row.fBillstatus == '保存' ||
               scope.row.fBillstatus == '暂存' ||
               scope.row.fBillstatus == '审批驳回'
@@ -276,7 +272,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['finance:payment:remove']"
-             v-if="
+            v-if="
               scope.row.fBillstatus == '保存' ||
               scope.row.fBillstatus == '暂存' ||
               scope.row.fBillstatus == '审批驳回'
@@ -475,7 +471,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-         <el-form-item label="业务类型" prop="fSystemType">
+        <el-form-item label="业务类型" prop="fSystemType">
           <el-select
             v-model="queryParams.fSystemType"
             placeholder="请选择业务类型"
@@ -541,7 +537,7 @@
         <el-table-column label="提单号" align="center" prop="fMblno" />
         <el-table-column label="存货单号" align="center" prop="fBscorpno" />
         <el-table-column label="品名" align="center" prop="fProductName" />
-        <el-table-column label="业务日期" align="center" prop="fBsdate">
+        <el-table-column label="业务日期" align="center">
           <template slot-scope="scope" v-if="scope.row.fBsdate">
             <span>{{ scope.row.fBsdate.slice(0, 10) }}</span>
           </template>
@@ -837,7 +833,11 @@
           <el-table-column label="货权方" align="center" prop="fName" />
           <el-table-column label="提单号" align="center" prop="fMblno" />
           <el-table-column label="品名" align="center" prop="fProductName" />
-          <el-table-column label="业务日期" align="center" prop="fBsdate" />
+          <el-table-column label="业务日期" align="center">
+             <template slot-scope="scope" v-if="scope.row.fBsdate">
+            <span>{{ scope.row.fBsdate.slice(0, 10) }}</span>
+          </template>
+          </el-table-column>
           <el-table-column label="业务类型" align="center" prop="fBilltype">
             <template slot-scope="scope">
               <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
@@ -925,7 +925,6 @@
         <el-table-column
           label="业务日期"
           align="center"
-          prop="fBsdate"
           width="120"
         >
           <template slot-scope="scope" v-if="scope.row.fBsdate">