Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue

@@ -41,10 +41,8 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>销售类型</div>
-              <el-form-item prop="saleTypeValue">
-                <el-select v-model="formobj.saleTypeValue" placeholder="请选择" @change="changeSaleType" clearable class="addinputInfo">
-                  <el-option v-for="item in saleType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
-                </el-select>
+              <el-form-item>
+                <span class="addinputInfo">{{ formobj.saleTypeValue }}</span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -284,7 +282,6 @@ export default {
       },
       rules: {
         oneBillMoney: [{ required: true, message: '单台开票金额不能为空', trigger: 'blur' }],
-        saleTypeValue: [{ required: true, message: '销售类型不能为空', trigger: 'change' }],
         isLQOrigInvoice: [{ required: true, message: '是否领取发票原件请选择是或否', trigger: 'change' }],
         arrearsOpenYYValue: [{ required: true, message: '欠款开票原因不能为空', trigger: 'change' }],
         returnedMoneyDate: [{ required: true, message: '承诺回款日期不能为空', trigger: 'blur' }]
@@ -351,6 +348,8 @@ export default {
       this.formobj.openTickUnitName = row.partyA
       this.formobj.modelName = row.modelName
       this.formobj.modelSid = row.modelSid
+      this.formobj.saleTypeValue = row.saleTypeValue
+      this.formobj.saleTypeKey = row.saleTypeKey
       this.formobj.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
       fetchByContractNo(this.formobj.contractNo).then((res) => {
         if (res.success) {
@@ -468,7 +467,7 @@ export default {
             this.formobj.finBillTrailers.push({
               gcVinNo: k.gcVinNo,
               vinNo: k.vinNo,
-              oneBillMoney: ''
+              oneBillMoney: k.oneBillMoney
             })
           })
         }
@@ -667,6 +666,7 @@ export default {
       this.image_list1 = []
       this.image_list2 = []
       this.image_list3 = []
+      this.image_list4 = []
       this.moneyEdit = false
       this.submitdisabled = false
       this.$refs['form_obj'].resetFields()

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingByDivisionDaiBanInfo.vue

@@ -80,26 +80,31 @@
               <span>{{ scope.row.vinNo }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="合格证状态" align="center">
+          <el-table-column label="合格证状态" align="center" width="110">
             <template slot-scope="scope">
-              <span>{{ scope.row.certificateStateValue }}</span>
+              <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="开票类型" align="center">
+          <el-table-column label="开票类型" align="center" width="150">
             <template slot-scope="scope">
               <span>{{ scope.row.billTypeValue }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="开票名称" align="center">
+          <el-table-column label="开票名称" align="center" width="160">
             <template slot-scope="scope">
               <span>{{ scope.row.openTickName }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="开票信息" align="center">
+          <el-table-column label="开票信息" align="center" min-width="200">
             <template slot-scope="scope">
               <span>{{ scope.row.openTickRemarks }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="开票金额" align="center" width="120">
+            <template>
+              <span>{{ formobj.oneBillMoney }}</span>
+            </template>
+          </el-table-column>
         </el-table>
         <el-row>
           <el-col :span="12">
@@ -133,11 +138,26 @@
               <span>{{ scope.row.vinNo }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="开票金额" align="center">
+          <el-table-column label="开票名称" align="center" width="160">
+            <template slot-scope="scope">
+              <span>{{ scope.row.openTickName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票信息" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.openTickRemarks }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票金额" align="center" width="120">
             <template slot-scope="scope">
               <span>{{ scope.row.oneBillMoney }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="合格证" align="center" width="100">
+            <template slot-scope="scope">
+              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+            </template>
+          </el-table-column>
         </el-table>
         <div class="title">证件(营业执照或身份证)</div>
         <el-row>
@@ -169,6 +189,11 @@
         </el-row>
       </el-form>
     </div>
+
+    <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
+      <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in srcList" :key="index" :src="item" :preview-src-list="srcList"></el-image>
+    </el-dialog>
+
     <!-- 选择待办人 的弹出框-->
     <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
       <el-form class="formadd" >
@@ -207,6 +232,8 @@ export default {
       tableKey: 0,
       billingKey: 1,
       index: 0,
+      dialogVisible: false,
+      srcList: [],
       image_list1: [],
       image_list2: [],
       image_list3: [],
@@ -343,6 +370,11 @@ export default {
         }
       })
     },
+    handleLook(row) {
+      this.srcList = []
+      this.dialogVisible = true
+      this.srcList = row
+    },
     // 同意
     openAgree(val) {
       this.operation = val

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingByFileDaiBanInfo.vue

@@ -80,26 +80,31 @@
               <span>{{ scope.row.vinNo }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="合格证状态" align="center">
+          <el-table-column label="合格证状态" align="center" width="110">
             <template slot-scope="scope">
-              <span>{{ scope.row.certificateStateValue }}</span>
+              <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="开票类型" align="center">
+          <el-table-column label="开票类型" align="center" width="150">
             <template slot-scope="scope">
               <span>{{ scope.row.billTypeValue }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="开票名称" align="center">
+          <el-table-column label="开票名称" align="center" width="160">
             <template slot-scope="scope">
               <span>{{ scope.row.openTickName }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="开票信息" align="center">
+          <el-table-column label="开票信息" align="center" min-width="200">
             <template slot-scope="scope">
               <span>{{ scope.row.openTickRemarks }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="开票金额" align="center" width="120">
+            <template>
+              <span>{{ formobj.oneBillMoney }}</span>
+            </template>
+          </el-table-column>
         </el-table>
         <el-row>
           <el-col :span="12">
@@ -133,11 +138,26 @@
               <span>{{ scope.row.vinNo }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="开票金额" align="center">
+          <el-table-column label="开票名称" align="center" width="160">
+            <template slot-scope="scope">
+              <span>{{ scope.row.openTickName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票信息" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.openTickRemarks }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票金额" align="center" width="120">
             <template slot-scope="scope">
               <span>{{ scope.row.oneBillMoney }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="合格证" align="center" width="100">
+            <template slot-scope="scope">
+              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+            </template>
+          </el-table-column>
         </el-table>
         <div class="title"><span class="icon">*</span>证件(营业执照或身份证)</div>
         <el-row>
@@ -167,6 +187,11 @@
         </el-row>
       </el-form>
     </div>
+
+    <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
+      <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in srcList" :key="index" :src="item" :preview-src-list="srcList"></el-image>
+    </el-dialog>
+
     <!-- 选择待办人 的弹出框-->
     <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
       <el-form class="formadd" >
@@ -211,6 +236,8 @@ export default {
       billingKey: 1,
       index: 0,
       accept: '.jpg,.jpeg,.png,.JPG,.JPEG',
+      dialogVisible: false,
+      srcList: [],
       image_list1: [],
       image_list2: [],
       image_list3: [],
@@ -363,6 +390,11 @@ export default {
         }
       })
     },
+    handleLook(row) {
+      this.srcList = []
+      this.dialogVisible = true
+      this.srcList = row
+    },
     getUrl() {
       if (this.image_list1.length > 0) {
         const aa = []

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingDaiBanInfo.vue

@@ -80,26 +80,31 @@
               <span>{{ scope.row.vinNo }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="合格证状态" align="center">
+          <el-table-column label="合格证状态" align="center" width="110">
             <template slot-scope="scope">
-              <span>{{ scope.row.certificateStateValue }}</span>
+              <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="开票类型" align="center">
+          <el-table-column label="开票类型" align="center" width="150">
             <template slot-scope="scope">
               <span>{{ scope.row.billTypeValue }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="开票名称" align="center">
+          <el-table-column label="开票名称" align="center" width="160">
             <template slot-scope="scope">
               <span>{{ scope.row.openTickName }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="开票信息" align="center">
+          <el-table-column label="开票信息" align="center" min-width="200">
             <template slot-scope="scope">
               <span>{{ scope.row.openTickRemarks }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="开票金额" align="center" width="120">
+            <template>
+              <span>{{ formobj.oneBillMoney }}</span>
+            </template>
+          </el-table-column>
         </el-table>
         <el-row>
           <el-col :span="12">
@@ -133,11 +138,26 @@
               <span>{{ scope.row.vinNo }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="开票金额" align="center">
+          <el-table-column label="开票名称" align="center" width="160">
+            <template slot-scope="scope">
+              <span>{{ scope.row.openTickName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票信息" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.openTickRemarks }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票金额" align="center" width="120">
             <template slot-scope="scope">
               <span>{{ scope.row.oneBillMoney }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="合格证" align="center" width="100">
+            <template slot-scope="scope">
+              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+            </template>
+          </el-table-column>
         </el-table>
         <div class="title">证件(营业执照或身份证)</div>
         <el-row>
@@ -169,6 +189,10 @@
         </el-row>
       </el-form>
     </div>
+
+    <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
+      <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in srcList" :key="index" :src="item" :preview-src-list="srcList"></el-image>
+    </el-dialog>
     <!-- 选择待办人 的弹出框-->
     <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
       <el-form class="formadd" >
@@ -207,6 +231,8 @@ export default {
       tableKey: 0,
       billingKey: 1,
       index: 0,
+      dialogVisible: false,
+      srcList: [],
       image_list1: [],
       image_list2: [],
       image_list3: [],
@@ -343,6 +369,11 @@ export default {
         }
       })
     },
+    handleLook(row) {
+      this.srcList = []
+      this.dialogVisible = true
+      this.srcList = row
+    },
     // 同意
     openAgree(val) {
       this.operation = val

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingYiBanInfo.vue

@@ -78,26 +78,31 @@
               <span>{{ scope.row.vinNo }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="合格证状态" align="center">
+          <el-table-column label="合格证状态" align="center" width="110">
             <template slot-scope="scope">
-              <span>{{ scope.row.certificateStateValue }}</span>
+              <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="开票类型" align="center">
+          <el-table-column label="开票类型" align="center" width="150">
             <template slot-scope="scope">
               <span>{{ scope.row.billTypeValue }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="开票名称" align="center">
+          <el-table-column label="开票名称" align="center" width="160">
             <template slot-scope="scope">
               <span>{{ scope.row.openTickName }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="开票信息" align="center">
+          <el-table-column label="开票信息" align="center" min-width="200">
             <template slot-scope="scope">
               <span>{{ scope.row.openTickRemarks }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="开票金额" align="center" width="120">
+            <template>
+              <span>{{ formobj.oneBillMoney }}</span>
+            </template>
+          </el-table-column>
         </el-table>
         <el-row>
           <el-col :span="12">
@@ -131,11 +136,26 @@
               <span>{{ scope.row.vinNo }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="开票金额" align="center">
+          <el-table-column label="开票名称" align="center" width="160">
+            <template slot-scope="scope">
+              <span>{{ scope.row.openTickName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票信息" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.openTickRemarks }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开票金额" align="center" width="120">
             <template slot-scope="scope">
               <span>{{ scope.row.oneBillMoney }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="合格证" align="center" width="100">
+            <template slot-scope="scope">
+              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+            </template>
+          </el-table-column>
         </el-table>
         <div class="title">证件(营业执照或身份证)</div>
         <el-row>
@@ -167,6 +187,10 @@
         </el-row>
       </el-form>
     </div>
+
+    <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
+      <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in srcList" :key="index" :src="item" :preview-src-list="srcList"></el-image>
+    </el-dialog>
   </div>
 </template>
 
@@ -180,6 +204,8 @@ export default {
       tableKey: 0,
       billingKey: 1,
       index: 0,
+      dialogVisible: false,
+      srcList: [],
       image_list1: [],
       image_list2: [],
       image_list3: [],
@@ -302,6 +328,11 @@ export default {
         }
       })
     },
+    handleLook(row) {
+      this.srcList = []
+      this.dialogVisible = true
+      this.srcList = row
+    },
     /** 确认撤回任务 */
     openRevoke() {
       this.$confirm('是否确认执行撤回操作', '提示', {