系统报表需求添加（丽知项目）

src/views/systemReports/u8positiveReports/TOBoutputWarehouse.vue

@@ -16,7 +16,7 @@
         <el-date-picker
           v-model="queryCriteria.businessDate_end"
           type="date"
-          placeholder="交易采购-结束"
+          placeholder="出库日期-结束"
           value-format="yyyy-MM-dd"
         >
         </el-date-picker>
@@ -264,7 +264,6 @@ export default {
         {
           label: '销售出库单号',
           prop: 'headCode',
-          tooltip: true,
           width: 150
         },
         {

src/views/systemReports/u8positiveReports/TOBreturnWarehouse.vue

@@ -16,7 +16,7 @@
         <el-date-picker
           v-model="queryCriteria.businessDate_end"
           type="date"
-          placeholder="交易采购-结束"
+          placeholder="出库日期-结束"
           value-format="yyyy-MM-dd"
         >
         </el-date-picker>
@@ -90,7 +90,7 @@
             <div class="chunk">
         <el-input
           v-model="queryCriteria.headCode"
-          placeholder="销售出库单号"
+          placeholder="售后入库单号"
         ></el-input>
       </div>
     </div>
@@ -253,13 +253,11 @@ export default {
         {
           label: '售后入库主键',
           prop: 'headCode',
-          tooltip: true,
           width: 150
         },
         {
           label: '来源单据主键',
           prop: 'reforderdetailid',
-          tooltip: true,
           width: 150
         },
         {

src/views/systemReports/u8positiveReports/TOCoutputWarehouse.vue

@@ -16,7 +16,7 @@
         <el-date-picker
           v-model="queryCriteria.businessDate_end"
           type="date"
-          placeholder="交易采购-结束"
+          placeholder="出库日期-结束"
           value-format="yyyy-MM-dd"
         >
         </el-date-picker>
@@ -113,7 +113,7 @@
         <el-input v-model="queryCriteria.newsystemprimary3" placeholder="TOC确认收入-蓝-下游主键"></el-input>
       </div>
       <div class="chunk">
-        <el-input v-model="queryCriteria.headCode" placeholder="销售出库单号"></el-input>
+        <el-input v-model="queryCriteria.headCode" placeholder="售后入库单号"></el-input>
       </div>
     </div>
     <div>
@@ -275,7 +275,6 @@ export default {
         {
           label: '销售出库单号',
           prop: 'headCode',
-          tooltip: true,
           width: 150
         },
         {

src/views/systemReports/u8positiveReports/TOCreturnWarehouse.vue

@@ -16,7 +16,7 @@
         <el-date-picker
           v-model="queryCriteria.businessDate_end"
           type="date"
-          placeholder="交易采购-结束"
+          placeholder="出库日期-结束"
           value-format="yyyy-MM-dd"
         >
         </el-date-picker>
@@ -280,13 +280,11 @@ export default {
         {
           label: "售后入库主键",
           prop: "headCode",
-          tooltip: true,
           width: 150,
         },
         {
           label: "来源单据主键",
           prop: "reforderdetailid",
-          tooltip: true,
           width: 150,
         },
         {

src/views/systemReports/u8positiveReports/baseNewTable2/baseTable/index.vue

@@ -343,10 +343,10 @@ export default {
         return;
       } else {
         let returnData = val;
-        if (typeof val != "number" && typeof val != "boolean") {
+        // if (typeof val != "number" && typeof val != "boolean") {
-          // console.log(val,"asdasdad")
+        //   // console.log(val,"asdasdad")
-          returnData = val.split("T").join(" ");
+        //   returnData = val.split("T").join(" ");
-        }
+        // }
         return returnData;
         // return val
       }

src/views/systemReports/u8positiveReports/baseNewTable2/index.vue

@@ -38,9 +38,36 @@
         tableHeight="calc(100vh - 370px)"
         id="mainTable"
       >
-        <template #new_state="{row}">
+        <template #newstate="{row}">
-          <div>
+          <div v-if="row.newstate==='成功'" style="color: green">
-            {{ row.new_state === 'Y' ? "成功" : row.new_state === 'N' ? "失败" : "" }}
+            {{ row.newstate }}
+          </div>
+          <div v-if="row.newstate==='失败'" style="color: red">
+            {{ row.newstate }}
+          </div>
+        </template>
+        <template #newstate2="{row}">
+          <div v-if="row.newstate2==='成功'" style="color: green">
+            {{ row.newstate2 }}
+          </div>
+          <div v-if="row.newstate2==='失败'" style="color: red">
+            {{ row.newstate2 }}
+          </div>
+        </template>
+        <template #newstate3="{row}">
+          <div v-if="row.newstate3==='成功'" style="color: green">
+            {{ row.newstate3 }}
+          </div>
+          <div v-if="row.newstate3==='失败'" style="color: red">
+            {{ row.newstate3 }}
+          </div>
+        </template>
+        <template #newstate4="{row}">
+          <div v-if="row.newstate4==='成功'" style="color: green">
+            {{ row.newstate4 }}
+          </div>
+          <div v-if="row.newstate4==='失败'" style="color: red">
+            {{ row.newstate4 }}
           </div>
         </template>
       </base-table>