前端gjy

src/views/statisticalReport/salesClosingCashierList.vue

@@ -4,7 +4,7 @@
         <!-- <div> -->
         <div>
           <ws-button :type="searchType==1?'primary':''" @click="handlestatus(1)">待审核</ws-button>
-          <ws-button :type="searchType==3?'primary':''" @click="handlestatus(2)">待结算</ws-button>
+          <ws-button :type="searchType==2?'primary':''" @click="handlestatus(2)">待结算</ws-button>
           <ws-button :type="searchType==3?'primary':''" @click="handlestatus(3)">已结算</ws-button>
           <ws-button :type="searchType==''?'primary':''" @click="handlestatus('')">全部</ws-button>
           <ws-button v-if='roleId=="9ad8abb997714ef29068f23c2ad3b125"' type="primary" @click="handleAudit(3,2)">驳回</ws-button>
@@ -51,50 +51,50 @@
           <el-table-column type="index" label="序号" width="50"></el-table-column>
           <el-table-column class="table_td" prop="contractNo" label="合同编号"></el-table-column>
           <el-table-column class="table_td" prop="closePositionDate" label="平仓日期"></el-table-column>
-          <el-table-column class="table_td" prop="closingQuantity" label="平仓数量(吨)"></el-table-column>
-          <el-table-column class="table_td" prop="transactionPrice" label="成交价格(元/吨)"></el-table-column>
-          <el-table-column class="table_td" prop="closeRate" label="平仓价格(元/吨)"></el-table-column>
-          <el-table-column class="table_td" prop="basisPrice" label="基差(元/吨)"></el-table-column>
-          <el-table-column class="table_td" prop="amountIngPayable" label="应付金额(元)">
+          <el-table-column class="table_td" prop="closingQuantity" width='100' label="平仓数量(吨)"></el-table-column>
+          <el-table-column class="table_td" prop="transactionPrice"  width="120" label="成交价格(元/吨)"></el-table-column>
+          <el-table-column class="table_td" prop="closeRate" width="120" label="平仓价格(元/吨)"></el-table-column>
+          <el-table-column class="table_td" prop="basisPrice" width='90' label="基差(元/吨)"></el-table-column>
+          <el-table-column class="table_td" prop="amountIngPayable" width='100' label="应付金额(元)">
             <template scope="scope">
-            <span v-if="scope.row.amountIngPayable">{{ scope.row.amountIngPayable }}</span>
+            <span v-if="scope.row.amountIngPayable!=null">{{ scope.row.amountIngPayable }}</span>
             <span v-else>-</span>
           </template>
           </el-table-column>
-          <el-table-column class="table_td" prop="amountEdPayable" label="已付金额(元)">
+          <el-table-column class="table_td" prop="amountEdPayable"  width='100' label="已付金额(元)">
             <template scope="scope">
-            <span v-if="scope.row.amountEdPayable">{{ scope.row.amountEdPayable }}</span>
+            <span @click='amountEdPayableimage(scope.row)' v-if="scope.row.amountEdPayable!=null">{{ scope.row.amountEdPayable }}</span>
             <span v-else>-</span>
           </template>
           </el-table-column>
-          <el-table-column class="table_td" prop="amountNotPayable" label="未付金额(元)">
+          <el-table-column class="table_td" prop="amountNotPayable" width='100' label="未付金额(元)">
             <template scope="scope">
-            <span v-if="scope.row.amountNotPayable">{{ scope.row.amountNotPayable }}</span>
+            <span v-if="scope.row.amountNotPayable!=null">{{ scope.row.amountNotPayable }}</span>
             <span v-else>-</span>
           </template>
           </el-table-column>
           <el-table-column class="table_td" prop="paymentDate" label="付款日期"></el-table-column>
-          <el-table-column class="table_td" prop="collectionIngPayable" label="应收金额(元)">
+          <el-table-column class="table_td" prop="collectionIngPayable" width='100' label="应收金额(元)">
             <template scope="scope">
-            <span v-if="scope.row.collectionIngPayable">{{ scope.row.collectionIngPayable }}</span>
+            <span v-if="scope.row.collectionIngPayable!=null">{{ scope.row.collectionIngPayable }}</span>
             <span v-else>-</span>
           </template>
           </el-table-column>
-          <el-table-column class="table_td" prop="collectionEdPayable" label="已收金额(元)">
+          <el-table-column class="table_td" prop="collectionEdPayable" width='100' label="已收金额(元)">
             <template scope="scope">
-            <span v-if="scope.row.collectionEdPayable">{{ scope.row.collectionEdPayable }}</span>
+            <span @click='collectionScreenshotimage(scope.row)' v-if="scope.row.collectionEdPayable!=null">{{ scope.row.collectionEdPayable }}</span>
             <span v-else>-</span>
           </template>
           </el-table-column>
-          <el-table-column class="table_td" prop="collectionNotPayable" label="未收金额(元)">
+          <el-table-column class="table_td" prop="collectionNotPayable" width='100' label="未收金额(元)">
             <template scope="scope">
-            <span v-if="scope.row.collectionNotPayable">{{ scope.row.collectionNotPayable }}</span>
+            <span v-if="scope.row.collectionNotPayable!=null">{{ scope.row.collectionNotPayable }}</span>
             <span v-else>-</span>
           </template>
           </el-table-column>
           <el-table-column class="table_td" prop="collectionDate" label="收款日期"></el-table-column>
-          <el-table-column class="table_td"  prop="customerName" label="客户"></el-table-column>
-          <el-table-column class="table_td"  prop="warehouseName" label="库点"></el-table-column>
+          <el-table-column class="table_td"  prop="customerName"  width='60' label="客户"></el-table-column>
+          <el-table-column class="table_td"  prop="warehouseName"  width='60' label="库点"></el-table-column>
           <el-table-column prop="status" label="状态"></el-table-column>
         </el-table>
 
@@ -164,58 +164,24 @@
           </el-dialog>
          <el-dialog
             width="25%"
-            title="收款"
-            :visible.sync="dialogFormVisible2"
+            title="付款图片"
+            :visible.sync="dialogFormVisible3"
             :append-to-body="true"
           >
-            <el-form :model="form">
-              <el-form-item label="未收金额（元）" :label-width="formLabelWidth">
-                {{collectionlist.collectionNotPayable}}
-              </el-form-item>
-              <el-form-item label="本次收款金额（元）" :label-width="formLabelWidth">
-                <el-input
-                  v-model="collectionlist.money"
-                  autocomplete="off"
-                  placeholder="请输入本次付款金额"
-                  class="deal"
-                ></el-input>
-              </el-form-item>
-              <el-form-item
-                label="收款日期"
-                prop="submissionDate"
-                :label-width="formLabelWidth"
-                class="deal"
-              >
-                <ws-date-picker
-                  v-model="collectionlist.paymentDate"
-                  type="date"
-                  placeholder="请选择收款日期"
-                  value-format="yyyy-MM-dd"
-                  class="deal"
-                />
-              </el-form-item>
-              <el-form-item label="上传收款截图" :label-width="formLabelWidth">
-                <el-upload
-                v-if='collectionlist.collectionScreenshot==""'
-                  action="https://www.zthymaoyi.com/upload/admin"
-                  list-type="picture-card"
-                  :on-success="
-                  (res, file) => {
-                    handlecollectionScreenshot( res, file)
-                  }
-                "
-                  :on-remove="handleRemove"
-                  class="photo2"
-                >
-                  <i class="el-icon-plus"></i>
-                </el-upload>
-                <img v-if='collectionlist.collectionScreenshot!=""' style='width:148px;height:148px;border:1px solid #ccc;' :src="collectionlist.collectionScreenshot" alt="">
-              </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-              <el-button @click="dialogFormVisible2 = false">取 消</el-button>
-              <el-button type="primary" @click="collectionconfirm">提 交</el-button>
-            </div>
+          <div v-for='item in addressurl'>
+            <img  style='width:100px;height:100px;' :src="item" alt="">
+          </div>
+            
+          </el-dialog>
+          <el-dialog
+            width="25%"
+            title="收款图片"
+            :visible.sync="dialogFormVisible4"
+            :append-to-body="true"
+          >
+          <div v-for='item in addressurl1'>
+            <img style='width:100px;height:100px;' :src="item" alt="">
+          </div>
           </el-dialog>
   </div>
 
@@ -252,6 +218,8 @@ export default {
       checked: true,
       dialogFormVisible1: false,
       dialogFormVisible2: false,
+      dialogFormVisible3:false,
+      dialogFormVisible4:false,
       dialogVisible: false,
 
       form: {
@@ -309,6 +277,8 @@ export default {
       deptBudgetList: {},
       pcFlag: 1,
       historyList: [],
+      addressurl:[],
+      addressurl1:[],
       paymentlist:{paymentScreenshot:''},
       collectionlist:{collectionScreenshot:''},
       accessoryTFs: false
@@ -320,6 +290,18 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    contractchange(e) {
+      this.contractNo = e
+      this.getList()
+    },
+    amountEdPayableimage(item){
+      this.dialogFormVisible3=true
+      this.addressurl=item.paymentScreenshot.split('$')
+    },
+    collectionScreenshotimage(item){
+      this.dialogFormVisible4=true
+      this.addressurl1=item.collectionScreenshot.split('$')
+    },
     handlestatus(status){
       this.searchType=status
       this.getList()