开票未结算详情

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/InvoicingUnsettled.vue

@@ -16,47 +16,49 @@
               }' clearable filterable></el-cascader>
             </template>
         </templateTable>
-        <el-dialog
-      title="详情"
-      :visible.sync="dialogVisible"
-      width="80%"
-      :before-close="handleClose">
-      <templateTable ref="templateTable" :formList="formList1" @handleSearchList="handleSearchList1" :tableConfig="tableConfigDetail" :data="formTableData"
-      @findPage="findPageDetail" >
-    </templateTable>
-      <span slot="footer" class="dialog-footer">
-      <el-button  size="small" @click="dialogVisible = false">取消</el-button>
-    </span>
-  </el-dialog>
-  <el-dialog
-      title="结算"
-      :visible.sync="dialogVisiblebalance"
-      width="20%"
-      :before-close="handleClosebalance">
-      <el-form ref="form" :model="form" label-width="85px">
-        <el-form-item label="进账金额：">
-          <el-input v-model="form.settlementAmount" style="width:220px"></el-input>
-        </el-form-item>
-        <el-form-item label="进账日期：">
-          <el-date-picker
-            v-model="form.settlementTime"
-            type="date"
-            placeholder="选择日期"
-            value-format="yyyy-MM-dd">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="上传凭证：" >
-              <el-upload  action="#" class="upload-demo"  :limit="1" :auto-upload="false"
-                :on-change="drivingupload"  ref="upload3"  accept=".png, .jpg, .jpeg" :file-list="fileList">
-                <el-button size="small" type="primary">点击上传</el-button>
-              </el-upload>
-          </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-      <el-button  size="small" @click="dialogVisiblebalance = false">取消</el-button>
-      <el-button type="primary" size="small" @click="balanceSumbit">确实</el-button>
-    </span>
-  </el-dialog>
+        <el-dialog title="详情" :visible.sync="dialogVisible" width="80%" :before-close="handleClose">
+          <templateTable ref="templateTable" :formList="formList1" @handleSearchList="handleSearchList1" :tableConfig="tableConfigDetail" :data="formTableData"
+            @findPage="findPageDetail" >
+              <template slot="开票方式" slot-scope="scope">
+                <span>{{ scope.row.invoicingMethod == 0 ? '保司开票' : scope.row.invoicingMethod == 1 ? '掌柜开票' : scope.row.invoicingMethod }}</span>
+              </template>
+              <template slot="结算状态" slot-scope="scope">
+                <span>{{ scope.row.completionStatus == 0 ? '开票未结算' : scope.row.completionStatus == 1 ? '开票已结算' : scope.row.completionStatus == 2 ? '开票结算清' : scope.row.completionStatus }}</span>
+              </template>
+          </templateTable>
+          <span slot="footer" class="dialog-footer">
+            <el-button  size="small" @click="dialogVisible = false">取消</el-button>
+          </span>
+        </el-dialog>
+      <el-dialog
+          title="结算"
+          :visible.sync="dialogVisiblebalance"
+          width="20%"
+          :before-close="handleClosebalance">
+          <el-form ref="form" :model="form" label-width="85px">
+            <el-form-item label="进账金额：">
+              <el-input v-model="form.settlementAmount" style="width:220px"></el-input>
+            </el-form-item>
+            <el-form-item label="进账日期：">
+              <el-date-picker
+                v-model="form.settlementTime"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="上传凭证：" >
+                  <el-upload  action="#" class="upload-demo"  :limit="1" :auto-upload="false"
+                    :on-change="drivingupload"  ref="upload3"  accept=".png, .jpg, .jpeg" :file-list="fileList">
+                    <el-button size="small" type="primary">点击上传</el-button>
+                  </el-upload>
+              </el-form-item>
+          </el-form>
+          <span slot="footer" class="dialog-footer">
+          <el-button  size="small" @click="dialogVisiblebalance = false">取消</el-button>
+          <el-button type="primary" size="small" @click="balanceSumbit">确实</el-button>
+        </span>
+      </el-dialog>
     </div>
 </template>
 <script>
@@ -88,19 +90,43 @@ export default {
             label: "开票号",
             type: "text"
           },
+          {
+            prop: "invoicingMethod",
+            label: "开票方式",
+            // type: "text"
+            name: '开票方式',
+            type: 'slot'
+          },
           {
             prop: "invoicCommissionFeevalue",
             label: "开票金额",
             type: "text"
           },
           {
-            prop: "invoicTime",
-            label: "开票时间",
+            prop: "invoicedSettledAmount",
+            label: "已开票已结算金额",
+            type: "text"
+          },
+          {
+            prop: "invoicedNotSettledAmount",
+            label: "已开票未结算金额",
             type: "text"
           },
+          {
+            prop: "completionStatus",
+            label: "结算状态",
+            name: "结算状态",
+            type: "slot"
+          },
+          // {
+          //   prop: "invoicTime",
+          //   label: "开票时间",
+          //   type: "text"
+          // },
          
         ],
         loading: true,
+        isShowIndex: true,
         optBtns:[
           {
             type:'primary',
@@ -141,13 +167,18 @@ export default {
                     prop: "settlementStatus",
                     type: "select",
                     options: [
-                        {
-                            label: '开票已结算',
-                            value: '2'
-                        }, {
-                            label: '开票未结算',
-                            value: '1'
-                        },
+                      {
+                        label: '开票未结算',
+                        value: '0'
+                      },
+                      {
+                        label: '开票已结算',
+                        value: '1'
+                      }, 
+                      {
+                        label: '开票结算清',
+                        value: '2'
+                      },
                     ]
                 },
                
@@ -226,25 +257,25 @@ export default {
             this.$refs.yearMonthYay.clear()
         },
       drivingupload(file, fileList){
-      this.fileList=[]
-      const params = new FormData(); // 声明formData数据类型
-      params.append("multipartFile", file.raw);
-      params.append("type", "image");
-      // params.append("isNotCar", "0");
-      this.$api.letter.uploadFile(params).then(res => {
-        if (res.code == "200") {
-          this.batchData =res.data
-          this.fileList = fileList
-        }
-        else{
-          this.fileList=[]
-          this.$message.error(res.msg)
-        }
-      });
-    },
-        getYearData(val){
-      this.formData.year=val
-    },
+        this.fileList=[]
+        const params = new FormData(); // 声明formData数据类型
+        params.append("multipartFile", file.raw);
+        params.append("type", "image");
+        // params.append("isNotCar", "0");
+        this.$api.letter.uploadFile(params).then(res => {
+          if (res.code == "200") {
+            this.batchData =res.data
+            this.fileList = fileList
+          }
+          else{
+            this.fileList=[]
+            this.$message.error(res.msg)
+          }
+        });
+      },
+      getYearData(val){
+        this.formData.year=val
+      },
     getMonthData(val){
       this.formData.month=val
     },
@@ -272,7 +303,9 @@ export default {
         isNotCar: '0',
         isNotDocumentary : '0',
         handlingFeesStatus:'0',
-        settlementStatus:data.settlementStatus,
+        // settlementStatus:data.settlementStatus,
+        completionStatus:data.settlementStatus,
+        settlementStatus: '1'
 
     })
     .then(res => {

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryFeesSettled.vue

@@ -19,6 +19,9 @@
     <el-dialog title="记录" :visible.sync="dialogVisiblerecord" width="30%" :before-close="handleCloserecord">
       <templateTable ref="templateTable1" :pagination="pageDatarecord" @getList="getListrecord"
         :tableConfig="tableConfigDetailrecord" :data="formTableDatarecord" @findPage="findPageDetailrecord">
+        <template slot="imageUrl" slot-scope="scope">
+        <img v-if="scope.row.imageUrl" :src="`${process + scope.row.imageUrl}`" class="imageclass" />
+      </template>
       </templateTable>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisiblerecord = false">取消</el-button>
@@ -51,6 +54,7 @@ export default {
   },
   data() {
     return {
+      process:process.env.BASE_URL,
       ztreeNodes:[],
       recordDetailData:[],
       pageDatarecorddetail: {
@@ -110,6 +114,11 @@ export default {
             label: "进帐金额",
             type: "text"
           },
+          {
+            name: "imageUrl",
+            label: "进帐截图",
+            type: "slot"
+          },
 
         ],
         loading: true,
@@ -358,4 +367,10 @@ export default {
 .invoiceAnd >>>.el-table__body-wrapper {
     overflow-y: auto !important;
     height: auto !important;
-  }</style>
+  }
+  .imageclass {
+    max-width: 100px;
+    max-height: 50px;
+    text-align: center;
+  }  
+</style>

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryUnsettled.vue

@@ -33,7 +33,7 @@
       :visible.sync="dialogVisiblebalance"
       width="20%"
       :before-close="handleClosebalance">
-      <el-form ref="form" :model="form" label-width="80px">
+      <el-form ref="form" :model="form" label-width="85px">
         <el-form-item label="进账金额">
           <el-input v-model="form.settlementAmount" style="width:220px"></el-input>
         </el-form-item>
@@ -45,6 +45,13 @@
             value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="上传凭证" >
+            <el-upload  action="#" class="upload-demo"  :limit="1" :auto-upload="false"
+              :on-change="drivingupload"  ref="upload3"  accept=".png, .jpg, .jpeg" :file-list="fileList">
+              <el-button size="small" type="primary">点击上传</el-button>
+            </el-upload>
+        </el-form-item>
+
       </el-form>
       <span slot="footer" class="dialog-footer">
       <el-button  size="small" @click="dialogVisiblebalance = false">取消</el-button>
@@ -70,6 +77,8 @@ export default {
   },
   data() {
     return {
+      fileList:[],
+      batchData:{},
       ztreeNodes:[],
       year: '',
       searchData: {},
@@ -225,6 +234,23 @@ export default {
             }
         });
     },
+    drivingupload(file, fileList){
+        this.fileList=[]
+        const params = new FormData(); // 声明formData数据类型
+        params.append("multipartFile", file.raw);
+        params.append("type", "image");
+        // params.append("isNotCar", "0");
+        this.$api.letter.uploadFile(params).then(res => {
+          if (res.code == "200") {
+            this.batchData =res.data
+            this.fileList = fileList
+          }
+          else{
+            this.fileList=[]
+            this.$message.error(res.msg)
+          }
+        });
+      },
     getYearData(val){
       this.formData.year=val
     },
@@ -275,6 +301,7 @@ export default {
           partnerCompaniesId:this.findPageDetailList.partnerCompaniesId,
           companyId:this.findPageDetailList.companyId,
           handlingFeesStatus:'1',
+          settlementImageId:this.batchData.id,
           ...this.form})
         .then(res => {
           if (res.code==200) {

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/InvoicedAndSettled.vue

@@ -60,20 +60,6 @@ export default {
     components: { KtCommonTable, templateTable, yearMonthYay,
         "el-image-viewer": () =>
       import("element-ui/packages/image/src/image-viewer") },
-    created() {
-        this.$api.insCompany.findLeftInsTree( {
-            classname: "",
-            type: '1',
-            }).then((res) => {
-        this.ztreeNodes = res.data;
-        });
-        this.findPage();
-    },
-    computed: {
-        ...mapState({
-            perms: state => state.user.perms
-        })
-    },
     data() {
         return {
             ztreeNodes:[],
@@ -301,8 +287,19 @@ export default {
         };
     },
     created() {
+        this.$api.insCompany.findLeftInsTree( {
+            classname: "",
+            type: '1',
+            }).then((res) => {
+        this.ztreeNodes = res.data;
+        });
         this.findPage();
     },
+    computed: {
+        ...mapState({
+            perms: state => state.user.perms
+        })
+    },
     methods: {
         closeViewer() {
       this.showViewer = false;

src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalance.vue

@@ -616,7 +616,7 @@ export default {
         agreementType: '1',
         isNotCar:'0',
         isOther:'0',
-        handlingFeesStatus:'0'
+        // handlingFeesStatus:'0'
       },
       dataValue:'',
       selectionOption:[],