Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/api/V2/financialManagement/index.js

@@ -7,4 +7,8 @@ export const API_GET_KUGUAN_LIST = '/commonSysParameter/getStaffInfo'
 //派车查看
 export const API_GET_CHAKAN_LOOK = '/warehouseInOutInfo/selectDistributeCar'
 //删除
-export const API_POST_DEL_LIST = '/collectionManagement/deleteCar'
+export const API_POST_DEL_LIST = '/collectionManagement/deleteCar'
+// 编辑查看
+export const API_GET_EXAMINE_INFO = '/collectionManagement/getInfo'
+// 编辑
+export const API_GET_EDIT_INFO = '/collectionManagement/editInfo'

src/lang/zh.js

@@ -1499,14 +1499,14 @@
       telephone: '联系电话：',
       trialDue: '试用到期',
       trialNotExpired: '试用天数剩余',
-      trialDueClues: '尊敬的用户您好，感谢您使用赢海云管船产品，您的试用账户已到期，如需重新试用或购买该产品，请联系您的产品顾问。',
-      trialNotExpiredBefore: '尊敬的用户您好，为您提供的赢海云管船产品使用天数剩余',
+      trialDueClues: '尊敬的用户您好，感谢您使用易粮易运产品，您的试用账户已到期，如需重新试用或购买该产品，请联系您的产品顾问。',
+      trialNotExpiredBefore: '尊敬的用户您好，为您提供的易粮易运产品使用天数剩余',
       trialNotExpiredAfter: '天，为了不影响您后续使用请尽快联系您的产品顾问。',
       dearUser: '尊敬的用户您好：',
-      dearUserClues: '恭喜您成为赢海云管船的正式用户, 赢海科技会第一时间为您提供最专业的服务，在系统使用期间，如遇任何问题，均可联系您的产品顾问。',
+      dearUserClues: '恭喜您成为易粮易运的正式用户, 易粮易运会第一时间为您提供最专业的服务，在系统使用期间，如遇任何问题，均可联系您的产品顾问。',
       customerService: '联系电话：',
-      stopTenantClues: '尊敬的用户您好，感谢您使用赢海云管船产品，您的试用账户已关闭，如需重新试用或购买该产品，请联系您的产品顾问。',
-      isZero: '尊敬的用户您好，今天是您使用赢海云管船产品最后一天，为了不影响您后续使用，请尽快联系您的产品顾问。'
+      stopTenantClues: '尊敬的用户您好，感谢您使用易粮易运产品，您的试用账户已关闭，如需重新试用或购买该产品，请联系您的产品顾问。',
+      isZero: '尊敬的用户您好，今天是您使用易粮易运产品最后一天，为了不影响您后续使用，请尽快联系您的产品顾问。'
     }
   },
   // 证书

src/model/financialManagement/index.js

@@ -6,6 +6,8 @@ import {
     API_GET_KUGUAN_LIST,
     API_GET_CHAKAN_LOOK,
     API_POST_DEL_LIST,
+    API_GET_EXAMINE_INFO,
+    API_GET_EDIT_INFO
 } from '@/api/V2/financialManagement'
 //采购详情列表
 export const caiwuList = appRx.get(API_GET_CAIWU_LIST, errorCatcher, errorHandle, filter)
@@ -17,3 +19,7 @@ export const kuguan = appRx.get(API_GET_KUGUAN_LIST, errorCatcher, errorHandle,
 export const paiLook = appRx.get(API_GET_CHAKAN_LOOK, errorCatcher, errorHandle, filter)
 //删除
 export const carDel = appRx.post(API_POST_DEL_LIST,errorCatcher, errorHandle,filter)
+//编辑查看
+export const examineinfo = appRx.get(API_GET_EXAMINE_INFO,errorCatcher, errorHandle,filter)
+//编辑
+export const editinfo = appRx.post(API_GET_EDIT_INFO,errorCatcher, errorHandle,filter)

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -780,7 +780,7 @@ export default {
     },
     loaddata() {
       // 包装方式
-      packList({ constId: 'CON1' })
+      packList({ constId: 'PRO2' })
         .toPromise()
         .then((response) => {
           this.packtypeList = response

src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -778,7 +778,7 @@ export default {
         })
 
       // 包装方式
-      packList({ constId: 'CON1' })
+      packList({ constId: 'PRO2' })
         .toPromise()
         .then((response) => {
           this.packtypeList = response

src/views/contractManagement/futuresSalesContractAdd.vue

@@ -85,10 +85,10 @@
         
         <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">
           <el-radio v-model="deptBudgetList.deliverType" label="1"
-            >我方自提</el-radio
+            >我方送货</el-radio
           >
           <el-radio v-model="deptBudgetList.deliverType" label="2"
-            >对方送货</el-radio
+            >对方自提</el-radio
           >
         </ws-form-item>
         <!--卖方-->
@@ -780,7 +780,7 @@ export default {
     },
     loaddata() {
       // 包装方式
-      packList({ constId: 'CON1' })
+      packList({ constId: 'PRO2' })
         .toPromise()
         .then((response) => {
           this.packtypeList = response

src/views/contractManagement/futuresSalesContractEdit.vue

@@ -763,9 +763,9 @@ export default {
             TextToCode[response.contractGoodsInfo.outputPrivate][response.contractGoodsInfo.outputCity].code
           this.selectedOptions1 = tmp1
           if (this.deptBudgetList.deliverType == 1) {
-            this.deptBudgetList.deliverType1 = '我方自提'
+            this.deptBudgetList.deliverType1 = '我方送货'
           } else if (this.deptBudgetList.deliverType == 2) {
-            this.deptBudgetList.deliverType1 = '对方送货'
+            this.deptBudgetList.deliverType1 = '对方自提'
           }
           if(this.deptBudgetList.addressUrl != null){
             this.addressUrls = this.deptBudgetList.addressUrl.split(",")
@@ -774,7 +774,7 @@ export default {
         })
 
       // 包装方式
-      packList({ constId: 'CON1' })
+      packList({ constId: 'PRO2' })
         .toPromise()
         .then((response) => {
           this.packtypeList = response

src/views/contractManagement/salesContractEdit.vue

@@ -688,9 +688,9 @@ export default {
           this.selectedOptions1 = tmp1
           this.deptBudgetList = response
           if (this.deptBudgetList.deliverType == 1) {
-            this.deptBudgetList.deliverType1 = '我方自提'
+            this.deptBudgetList.deliverType1 = '我方送货'
           } else if (this.deptBudgetList.deliverType == 2) {
-            this.deptBudgetList.deliverType1 = '对方送货'
+            this.deptBudgetList.deliverType1 = '对方自提'
           }
           if(this.deptBudgetList.addressUrl != null){
             this.addressUrls = this.deptBudgetList.addressUrl.split(",")

src/views/customer/component/router/route.js

@@ -8,7 +8,7 @@ const customerRouter = {
     alwaysShow: true, // will always show the root menu
     meta: {
       title: 'customerList',
-      module: 'warehouseManagement.warehouse.warehouseInfo',
+      module: 'customerManagement.customer.customerInfo',
       icon: '-kehuguanli'
     },
     children: [
@@ -20,7 +20,7 @@ const customerRouter = {
         meta: {
           title: 'customerList',
           shortcutEntrance: 'customerList',
-          module: 'warehouseManagement.warehouse.warehouseInfo',
+          module: 'customerManagement.customer.customerInfo',
           permissicon: [],
           keepAlive: true
           // module: 'procurement.sparepart.applDetail'

src/views/customer/customerList.vue

@@ -131,7 +131,7 @@
         class="wenzi"
         :data="customerList.records"
         style="width: 100%"
-        height="780"
+        height="680"
       >
         <el-table-column prop="index" label="序号" width="80">
           <template scope="scope">
@@ -218,11 +218,17 @@
             <el-button
               class="find"
               type="primary"
+              v-hasPermission="
+            `customerManagement.customer.customerInfo.View`
+          "
               @click="editClick(1, scope.row)"
               >增加定金</el-button
             >
             <el-button
               class="find"
+              v-hasPermission="
+            `customerManagement.customer.customerInfo.View`
+          "
               type="primary"
               @click="editClick(2, scope.row)"
               >退回定金</el-button

src/views/financialManagement/collectionManagementList.vue

@@ -46,7 +46,7 @@
       class="wenzi"
       :data="warehouseList.records"
       style="width: 100%; margin-top: 10px"
-      height="780"
+      height="680"
     >
       <el-table-column type="index" label="序号">
         <template scope="scope">
@@ -58,12 +58,28 @@
       <el-table-column class="table_td" prop="goodsName" label="货名"></el-table-column>
       <el-table-column class="table_td" prop="buyer" label="买方"></el-table-column>
       <el-table-column class="table_td" prop="seller" label="卖方"></el-table-column>
+      <el-table-column class="table_td" prop="loan" label="货款（元）"></el-table-column>
+      <el-table-column class="table_td" prop="freight" label="运费（元）"></el-table-column>
+      <el-table-column width='100' class="table_td" prop="storageFee" label="仓储费（元）"></el-table-column>
+      <el-table-column class="table_td" prop="interest" label="利息（元）"></el-table-column>
       <el-table-column class="table_td" prop="collectionIngPayable" label="应收(元)"></el-table-column>
       <el-table-column class="table_td" prop="collectionEdPayable" label="已收(元)"></el-table-column>
       <el-table-column class="table_td" prop="collectionNotPayable" label="未收(元)"></el-table-column>
-      <el-table-column class="table_td" prop="outWeight" label="出货量(吨)"></el-table-column>
-      <el-table-column class="table_td" prop="alreadyInvoice" label="已开发票(元)"></el-table-column>
-      <el-table-column class="table_td" prop="notInvoice" label="未开发票(元)"></el-table-column>
+      <el-table-column width='100' class="table_td" prop="outWeight" label="出货量(吨)"></el-table-column>
+      <el-table-column width='120' class="table_td" prop="alreadyInvoice" label="已开发票(元)"></el-table-column>
+      <el-table-column width='120' class="table_td" prop="notInvoice" label="未开发票(元)"></el-table-column>
+      <el-table-column class="table_td" prop="notInvoice" label="附加">
+        <template slot-scope="scope">
+            <img
+              width="18"
+              height="20"
+              style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/fujian.png"
+              @click="fujian(scope.row)"
+              alt=""
+            />
+          </template>
+      </el-table-column>
       <el-table-column prop="status" label="状态">
             <template slot-scope="scope">
               <el-popover
@@ -85,9 +101,12 @@
             </template>
           </el-table-column>
       <el-table-column class="table_td" prop="updateDate" label="更新时间" width="130"></el-table-column>
-      <el-table-column prop="seller" label="操作" width="200">
+      <el-table-column prop="seller" label="操作" width='200'>
         <template slot-scope="scope">
           <div class="record" @click="dianlog(scope.row)">派发</div>
+          <div class="record" v-hasPermission="
+            `financial.collection.collectionInfo.edit`
+          " @click="edit(scope.row)">编辑</div>
         </template>
       </el-table-column>
     </el-table>
@@ -170,6 +189,82 @@
         </el-table>
       </el-form>
     </el-dialog>
+    <el-dialog width="60%" :visible.sync="editshow" :append-to-body="true">
+      <el-form>
+        <el-form-item label="货款（元）" :label-width="formLabelWidth">
+          <el-input
+              @input='calculate'
+              v-model="editlist.loan"
+              class="typeselect"
+              placeholder="请输入贷款"
+            />
+        </el-form-item>
+        <el-form-item label="运费（元）" :label-width="formLabelWidth">
+          <el-input
+          @input='calculate'
+              v-model="editlist.freight"
+              class="typeselect"
+              placeholder="请输入运费"
+            />
+        </el-form-item>
+        <el-form-item label="仓储费（元）" :label-width="formLabelWidth">
+          <el-input
+          @input='calculate'
+              v-model="editlist.storageFee"
+              class="typeselect"
+              placeholder="请输入仓储费"
+            />
+        </el-form-item>
+        <el-form-item label="利息（元）" :label-width="formLabelWidth">
+          <el-input
+          @input='calculate'
+              v-model="editlist.interest"
+              class="typeselect"
+              placeholder="请输入利息"
+            />
+        </el-form-item>
+        <el-form-item label="合计应收（元）" :label-width="formLabelWidth">
+          <el-input
+              v-model="editlist.collectionIngPayable"
+              class="typeselect"
+              placeholder=""
+            />
+        </el-form-item>
+        <el-form-item label="已收金额（元）" :label-width="formLabelWidth">
+          <el-input
+              v-model="editlist.collectionEdPayable"
+              class="typeselect"
+              placeholder="请输入已收金额"
+            />
+        </el-form-item>
+        <el-form-item label="已开发票（元）" :label-width="formLabelWidth">
+          <el-input
+              v-model="editlist.alreadyInvoice"
+              class="typeselect"
+              placeholder="请输入发票金额"
+            />
+        </el-form-item>
+      </el-form>
+       <div slot="footer" class="dialog-footer">
+              <el-button @click="editshow = false">取 消</el-button>
+              <el-button type="primary" @click="editconfirm">确 定</el-button>
+            </div>
+    </el-dialog>
+    <!-- 附件弹框 -->
+    <el-dialog width="60%" :visible.sync="accessoryTFs" :before-close="handlefujianClose" :append-to-body="true">
+      <p>查看附件</p>
+      <el-upload
+  class="avatar-uploader"
+  action="https://www.zthymaoyi.com/upload/admin"
+  :show-file-list="false"
+  :on-success="handleAvatarSuccess">
+  <i style='margin:0 auto;' class="el-icon-plus avatar-uploader-icon"></i>
+</el-upload>
+<div style='display:inline-block;' v-for='item in addressUrls'>
+  <img style='width:100px;height:100px;' :src="item" alt="">
+</div>
+
+   </el-dialog>
   </div>
 </template>
 <script>
@@ -178,7 +273,9 @@ import {
   paifa,
   kuguan,
   paiLook,
-  carDel
+  carDel,
+  examineinfo,
+  editinfo
 } from '@/model/financialManagement/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
@@ -200,6 +297,15 @@ export default {
   },
   data() {
     return {
+      editlist:{
+        loan:0,
+        freight:0,
+        storageFee:0,
+        interest:0,
+        collectionIngPayable:0,
+        collectionEdPayable:0,
+        alreadyInvoice:0
+      },
       paifaDialogForm: {},
       paifaKuguanList: [],
       //弹出框
@@ -247,6 +353,7 @@ export default {
           agent: ''
         }
       ],
+      editshow:false,
       carNo: '',
       boxNo: '',
       titleNo: '',
@@ -321,6 +428,126 @@ export default {
     },
   },
   methods: {
+     handlefujianClose() {
+        this.accessoryTFs=false
+        this.getList()
+      },
+    fujian(row) {
+      this.addressUrls=row.addressUrl.split(',')
+      this.editlist.id=row.id
+      this.accessoryTFs=true
+    },
+    handleAvatarSuccess(res){
+      this.addressUrls.push(res.url)
+       editinfo({addressUrl:this.addressUrls.join(),id:this.editlist.id}).toPromise().then(response => {
+      })
+    },
+    calculate(){
+      if(this.editlist.loan&&this.editlist.freight&&this.editlist.storageFee&&this.editlist.interest){
+        this.editlist.collectionIngPayable=Number(this.editlist.loan)+Number(this.editlist.freight)+Number(this.editlist.storageFee)+Number(this.editlist.interest)
+      }else if(this.editlist.loan&&this.editlist.freight&&this.editlist.storageFee){
+        this.editlist.collectionIngPayable=Number(this.editlist.loan)+Number(this.editlist.freight)+Number(this.editlist.storageFee)
+      }else if(this.editlist.loan&&this.editlist.freight&&this.editlist.interest){
+        this.editlist.collectionIngPayable=Number(this.editlist.loan)+Number(this.editlist.freight)+Number(this.editlist.interest)
+      }else if(this.editlist.loan&&this.editlist.storageFee&&this.editlist.interest){
+        this.editlist.collectionIngPayable=Number(this.editlist.loan)+Number(this.editlist.storageFee)+Number(this.editlist.interest)
+      }else if(this.editlist.freight&&this.editlist.storageFee&&this.editlist.interest){
+        this.editlist.collectionIngPayable=Number(this.editlist.freight)+Number(this.editlist.storageFee)+Number(this.editlist.interest)
+      }else if(this.editlist.loan&&this.editlist.freight){
+        this.editlist.collectionIngPayable=Number(this.editlist.loan)+Number(this.editlist.freight)
+      }else if(this.editlist.loan&&this.editlist.storageFee){
+        this.editlist.collectionIngPayable=Number(this.editlist.loan)+Number(this.editlist.storageFee)
+      }else if(this.editlist.loan&&this.editlist.interest){
+        this.editlist.collectionIngPayable=Number(this.editlist.loan)+Numberthis.editlist.interest()
+      }else if(this.editlist.freight&&this.editlist.storageFee){
+        this.editlist.collectionIngPayable=Number(this.editlist.freight)+Number(this.editlist.storageFee)
+      }else if(this.editlist.freight&&this.editlist.interest){
+        this.editlist.collectionIngPayable=Number(this.editlist.freight)+Number(this.editlist.interest)
+      }else if(this.editlist.storageFee&&this.editlist.interest){
+        this.editlist.collectionIngPayable=Number(this.editlist.storageFee)+Number(this.editlist.interest)
+      }else if(this.editlist.loan){
+        this.editlist.collectionIngPayable=this.editlist.loan
+      }else if(this.editlist.freight){
+        this.editlist.collectionIngPayable=this.editlist.freight
+      }else if(this.editlist.storageFee){
+        this.editlist.collectionIngPayable=this.editlist.storageFee
+      }else if(this.editlist.interest){
+        this.editlist.collectionIngPayable=this.editlist.interest
+      }else{
+        this.editlist.collectionIngPayable=0
+      }
+    },
+    editconfirm(){
+      if(this.editlist.loan<0||this.editlist.loan>100000000|| String(this.editlist.loan).indexOf('.') != -1 &&
+            String(this.editlist.loan).length - String(this.editlist.loan).indexOf('.') + 1 >
+              2){
+         this.$message({
+              message: '货款输入错误!',
+              type: 'warning',
+            })
+        return
+      }
+      if(this.editlist.freight<0||this.editlist.freight>1000000|| String(this.editlist.freight).indexOf('.') != -1 &&
+            String(this.editlist.freight).length - String(this.editlist.freight).indexOf('.') + 1 >
+              2){
+         this.$message({
+              message: '运费输入错误!',
+              type: 'warning',
+            })
+        return
+      }
+      if(this.editlist.storageFee<0||this.editlist.storageFee>1000000|| String(this.editlist.storageFee).indexOf('.') != -1 &&
+            String(this.editlist.storageFee).length - String(this.editlist.storageFee).indexOf('.') + 1 >
+              2){
+         this.$message({
+              message: '仓储费输入错误!',
+              type: 'warning',
+            })
+        return
+      }
+      if(this.editlist.interest<0||this.editlist.interest>1000000|| String(this.editlist.interest).indexOf('.') != -1 &&
+            String(this.editlist.interest).length - String(this.editlist.interest).indexOf('.') + 1 >
+              2){
+         this.$message({
+              message: '利息输入错误!',
+              type: 'warning',
+            })
+        return
+      }
+      if(this.editlist.collectionEdPayable<0||this.editlist.collectionEdPayable>100000000|| String(this.editlist.collectionEdPayable).indexOf('.') != -1 &&
+            String(this.editlist.collectionEdPayable).length - String(this.editlist.collectionEdPayable).indexOf('.') + 1 >
+              2){
+         this.$message({
+              message: '已收金额输入错误!',
+              type: 'warning',
+            })
+        return
+      }
+      if(this.editlist.alreadyInvoice<0||this.editlist.alreadyInvoice>1000000|| String(this.editlist.alreadyInvoice).indexOf('.') != -1 &&
+            String(this.editlist.alreadyInvoice).length - String(this.editlist.alreadyInvoice).indexOf('.') + 1 >
+              2){
+         this.$message({
+              message: '发票金额输入错误!',
+              type: 'warning',
+            })
+        return
+      }
+      if(this.editlist.collectionEdPayable==0&&this.editlist.alreadyInvoice>0){
+         this.$message({
+              message: '发票金额不能超过已收金额!',
+              type: 'warning',
+            })
+        return
+      }
+      editinfo(this.editlist).toPromise().then(response => {
+        this.editshow=false
+        this.$message({
+              message: '编辑成功',
+              type: 'success',
+            })
+        this.getList()
+      })
+    },
     changeCarNo(e) {
       this.$forceUpdate()
       this.$set(this.freightspace[0],'carNo',e)
@@ -651,6 +878,12 @@ export default {
           return false
         })
     },
+    edit(item){
+      this.editshow=true
+      examineinfo({id:item.id}).toPromise().then(response => {
+          this.editlist=response
+      })
+    },
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {
         if (this.taskTypeList[i].value == e) {
@@ -826,6 +1059,11 @@ export default {
 .vertical-circle:first-child {
   color: red;
 }
+.avatar-uploader{
+  border:1px solid #ccc;
+  width:100px;height:100px;border-radius:3px;
+  line-height:100px;
+}
 .vertical-text {
   margin: 0 10px;
   color: #8890b1;
@@ -1076,4 +1314,7 @@ export default {
   border-bottom-left-radius: 0px;
   margin-top: 0px;
 }
+/deep/.el-upload--text{
+  width:100px;
+}
 </style>

src/views/financialManagement/component/routers/route.js

@@ -8,7 +8,7 @@ const financialManagementRouter = {
   alwaysShow: true, // will always show the root menu
   meta: {
     title: 'financialManagement',
-    module: 'contractManagement',
+    module: 'financial.collection',
     icon: '-caiwuguanli'
   },
   children: [
@@ -21,7 +21,7 @@ const financialManagementRouter = {
       meta: {
         title: 'collectionManagementList',
         shortcutEntrance: 'financialManagement',
-        module: 'contractManagement.salesContract',
+        module: 'financial.collection.collectionInfo',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'

src/views/platformaudit/component/router/route.js

@@ -8,7 +8,7 @@ const platformauditRouter = {
     alwaysShow: true, // will always show the root menu
     meta: {
       title: 'platformaudit',
-      module: '',
+      module: 'audit.driverMerchant',
       icon: '-shenhe'
     },
     children: [
@@ -22,7 +22,7 @@ const platformauditRouter = {
         meta: {
           title: 'grainmerchantreview',
           shortcutEntrance: 'grainmerchantreview',
-          module: 'warehouseManagement.warehouse.warehouseInfo',
+          module: 'audit.grainMerchant.grainMerchantInfo',
           permissicon: [],
           keepAlive: true
         },
@@ -37,7 +37,7 @@ const platformauditRouter = {
         meta: {
           title: 'driverreview',
           shortcutEntrance: 'driverreview',
-          module: 'warehouseManagement.warehouse.warehouseInfo',
+          module: 'audit.driverMerchant.driverMerchantInfo',
           permissicon: [],
           keepAlive: true
         },
@@ -52,7 +52,7 @@ const platformauditRouter = {
         meta: {
           title: 'transactioninformationreview',
           shortcutEntrance: 'transactioninformationreview',
-          module: 'warehouseManagement.warehouse.warehouseInfo',
+          module: 'audit.tranMerchant.tranMerchantInfo',
           permissicon: [],
           keepAlive: true
         },
@@ -67,7 +67,7 @@ const platformauditRouter = {
         meta: {
           title: 'saletransactioninformationreview',
           shortcutEntrance: 'saletransactioninformationreview',
-          module: 'warehouseManagement.warehouse.warehouseInfo',
+          module: 'audit.tranMerchant.tranMerchantInfo',
           permissicon: [],
           keepAlive: true
         },

src/views/platformaudit/driverreview.vue

@@ -4,9 +4,6 @@
     <BaseHeaderLayout :leftSpan="15">
       <template slot="left"> </template>
       <template slot="right">
-        <span style="width: 70px; display: inline-block; color: #8890b1"
-          >状态：</span
-        >
         <ws-select
           v-model="searchTypeText"
           placeholder=""
@@ -158,7 +155,6 @@
             <ws-select
               v-model="scope.row.carNumber"
               placeholder=""
-              class="typeselect"
               @change="selectcar($event, scope.row)"
             >
               <ws-option
@@ -238,6 +234,9 @@
               type="text"
               class="record"
               v-if="scope.row.authenticationStatusKey==1"
+              v-hasPermission="
+            `audit.driverMerchant.driverMerchantInfo.view`
+          "
               @click="reject(scope.row)"
               >驳回</el-button
             >
@@ -246,13 +245,19 @@
               type="text"
               class="record"
               v-if="scope.row.authenticationStatusKey==1"
+              v-hasPermission="
+            `audit.driverMerchant.driverMerchantInfo.view`
+          "
               @click="adopt(scope.row)"
               >通过</el-button
             >
-             <template v-else-if="scope.row.authenticationStatusKey == 3" slot-scope="scope">
+             <template v-hasPermission="
+            `audit.driverMerchant.driverMerchantInfo.view`
+          " v-else-if="scope.row.authenticationStatusKey == 3" slot-scope="scope">
               已驳回
             </template>
-            <template v-else slot-scope="scope"> 
+            <template v-hasPermission="
+            `audit.driverMerchant.driverMerchantInfo.view`" v-else slot-scope="scope"> 
             {{ scope.row.authenticationStatus}}
           </template>
           </template>
@@ -531,6 +536,9 @@ export default {
         .toPromise()
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
+            response.records[i].carNumber =''
+            response.records[i].carModel =''
+            response.records[i].carLength =''
             response.records[i].expandsStatus = false
             if (response.records[i].addressUrl != null) {
               response.records[i].addressUrlArray =
@@ -539,8 +547,16 @@ export default {
             } else {
               response.records[i].addressUrlArray = []
             }
+            if(response.records[i].driverCarInfoList.length>0){
+              response.records[i].carNumber =
+              response.records[i].driverCarInfoList[0].carNumber
+              response.records[i].carModel =
+              response.records[i].driverCarInfoList[0].carModel
+              response.records[i].carLength =
+              response.records[i].driverCarInfoList[0].carLength
+            }
           }
-
+            
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size
           this.deptBudgetTotal = response.total
@@ -553,6 +569,7 @@ export default {
           this.searchType = this.searchTypeList[i].type
         }
       }
+      this.getList()
     },
     fujian(row) {
       if (row.addressUrl === null || row.addressUrl === '') {
@@ -636,7 +653,9 @@ export default {
   color: #8890b1;
   font-size: 12px;
 }
-
+.typeselect{
+  margin-right:10px;
+}
 /deep/.ws-info-table .el-form-item.company,
 /deep/.ws-info-table .el-form-item.personage {
   width: 33.333%;

src/views/platformaudit/grainmerchantreview.vue

@@ -4,9 +4,6 @@
     <BaseHeaderLayout :leftSpan="15">
       <template slot="left"> </template>
       <template slot="right">
-        <span style="width: 70px; display: inline-block; color: #8890b1"
-          >状态：</span
-        >
         <ws-select
           v-model="searchTypeText"
           placeholder=""
@@ -54,7 +51,7 @@
         ref="expandstable"
         :expand-row-keys="expands"
         :row-key="getRowKeys"
-        height="780"
+        height="680"
       >
         <el-table-column type="expand">
           <template slot-scope="props">
@@ -255,9 +252,29 @@
       <p>查看附件</p>
       <div
         style="display: inline-block; margin: 5px"
-        v-for="item in appendixIdss"
+        v-if='accessoryimages.businessLicenseAddressUrl'
+      >
+        <img width="100" height="100" :src="accessoryimages.businessLicenseAddressUrl" alt="" />
+      </div>
+      <div
+        style="display: inline-block; margin: 5px"
+      >
+        <img width="100" height="100" :src="accessoryimages.cardAddressUrl" alt="" />
+      </div>
+      <div
+        style="display: inline-block; margin: 5px"
+      >
+        <img width="100" height="100" :src="accessoryimages.cardAddressUrl1" alt="" />
+      </div>
+      <div
+        style="display: inline-block; margin: 5px"
       >
-        <img width="100" height="100" :src="item" alt="" />
+        <img width="100" height="100" :src="accessoryimages.payeeAddressUrl" alt="" />
+      </div>
+      <div
+        style="display: inline-block; margin: 5px"
+      >
+        <img width="100" height="100" :src="accessoryimages.payeeAddressUrl" alt="" />
       </div>
     </WinseaContentModal>
     <WinseaContentModal
@@ -306,6 +323,7 @@ export default {
       showType: true,
       // 年
       year: '',
+      accessoryimages:{},
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
@@ -524,6 +542,7 @@ export default {
           this.searchType = this.searchTypeList[i].type
         }
       }
+      this.getList()
     },
     handlestatus(status) {
       this.searchType = status
@@ -537,15 +556,15 @@ export default {
       this.getList()
     },
     fujian(row) {
-      if (row.addressUrl === null || row.addressUrl === '') {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
+      console.log(row)
+      if(row.customerTypeFlag==2){
+        this.accessoryimages.businessLicenseAddressUrl=row.businessLicenseAddressUrl
       }
-      this.appendixIdss = row.addressUrlArray
+      this.accessoryimages.cardAddressUrl=row.cardAddressUrl.split(',')[0]
+      this.accessoryimages.cardAddressUrl1=row.cardAddressUrl.split(',')[1]
+      this.accessoryimages.payeeAddressUrl=row.payeeAddressUrl.split(',')[0]
+      this.accessoryimages.payeeAddressUrl1=row.payeeAddressUrl.split(',')[1]
+      this.accessoryTFs=true
     },
     fujian1(item) {
       if (item.cardAddressUrl === null || item.cardAddressUrl === '') {
@@ -586,6 +605,9 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.typeselect{
+  margin-right:10px;
+}
 .connert {
   width: 90%;
   margin: 0 auto;

src/views/platformaudit/saletransactioninformationreview.vue

@@ -3,9 +3,6 @@
   <div>
     <BaseHeaderLayout :leftSpan="15">
       <template slot="right">
-        <span style="width: 70px; display: inline-block; color: #8890b1"
-          >状态：</span
-        >
         <ws-select
           v-model="searchTypeText"
           placeholder=""
@@ -49,7 +46,7 @@
         class="wenzi"
         :data="tranManagementList.records"
         style="width: 100%"
-        height="780"
+        height="680"
       >
         <el-table-column type="index" label="序号" width="50">
           <template scope="scope">
@@ -79,21 +76,21 @@
               class="record"
               @click="nocomplete(scope.row)"
               v-hasPermission="
-           `warehouseManagement.warehouse.warehouseInfoTask.View`
+           `audit.tranMerchant.tranMerchantInfo.view`
           "
             >查看</div>
             <div
               class="record"
               @click="delivery(scope.row)"
               v-hasPermission="
-           `transportationTask.transportation.transportationInfo.edit`
+           `audit.tranMerchant.tranMerchantInfo.view`
           "
             >编辑</div>
             <div
               class="record"
               @click="deleteclick(scope.row)"
               v-hasPermission="
-           `transportationTask.transportation.transportationInfo.delete`
+           `audit.tranMerchant.tranMerchantInfo.view`
           "
             >删除</div>
           </template>
@@ -105,6 +102,9 @@
               type="text"
               class="record"
               v-if="scope.row.statusFlag==1"
+              v-hasPermission="
+           `audit.tranMerchant.tranMerchantInfo.view`
+          "
               @click="reject(scope.row)"
               >驳回</el-button
             >
@@ -114,9 +114,14 @@
               class="record"
               v-if="scope.row.statusFlag==1"
               @click="adopt(scope.row)"
+              v-hasPermission="
+           `audit.tranMerchant.tranMerchantInfo.view`
+          "
               >通过</el-button
             >
-            <template v-else slot-scope="scope"> 
+            <template v-else v-hasPermission="
+           `audit.tranMerchant.tranMerchantInfo.view`
+          " slot-scope="scope"> 
             {{ scope.row.status}}
           </template>
           </template>
@@ -288,6 +293,7 @@ export default {
           this.searchType = this.searchTypeList[i].type
         }
       }
+      this.getList()
     },
     //审核通过
     adopt(row) {

src/views/platformaudit/transactioninformationreview.vue

@@ -3,9 +3,6 @@
   <div>
     <BaseHeaderLayout :leftSpan="15">
       <template slot="right">
-        <span style="width: 70px; display: inline-block; color: #8890b1"
-          >状态：</span
-        >
         <ws-select
           v-model="searchTypeText"
           placeholder=""
@@ -49,7 +46,7 @@
         class="wenzi"
         :data="tranManagementList.records"
         style="width: 100%"
-        height="780"
+        height="680"
       >
         <el-table-column type="index" label="序号" width="50">
           <template scope="scope">
@@ -79,21 +76,21 @@
               class="record"
               @click="nocomplete(scope.row)"
               v-hasPermission="
-           `warehouseManagement.warehouse.warehouseInfoTask.View`
+           `audit.tranMerchant.tranMerchantInfo.view`
           "
             >查看</div>
             <div
               class="record"
               @click="delivery(scope.row)"
               v-hasPermission="
-           `transportationTask.transportation.transportationInfo.edit`
+           `audit.tranMerchant.tranMerchantInfo.view`
           "
             >编辑</div>
             <div
               class="record"
               @click="deleteclick(scope.row)"
               v-hasPermission="
-           `transportationTask.transportation.transportationInfo.delete`
+           `audit.tranMerchant.tranMerchantInfo.view`
           "
             >删除</div>
           </template>
@@ -105,6 +102,9 @@
               type="text"
               class="record"
               v-if="scope.row.statusFlag==1"
+              v-hasPermission="
+           `audit.tranMerchant.tranMerchantInfo.view`
+          "
               @click="reject(scope.row)"
               >驳回</el-button
             >
@@ -113,10 +113,15 @@
               type="text"
               class="record"
               v-if="scope.row.statusFlag==1"
+              v-hasPermission="
+           `audit.tranMerchant.tranMerchantInfo.view`
+          "
               @click="adopt(scope.row)"
               >通过</el-button
             >
-            <template v-else slot-scope="scope"> 
+            <template v-else v-hasPermission="
+           `audit.tranMerchant.tranMerchantInfo.view`
+          " slot-scope="scope"> 
             {{ scope.row.status}}
           </template>
           </template>
@@ -288,6 +293,7 @@ export default {
           this.searchType = this.searchTypeList[i].type
         }
       }
+      this.getList()
     },
     //审核通过
     adopt(row) {

src/views/purchasingManagement/component/routers/route.js

@@ -8,7 +8,7 @@ const purchasingManagementRouter = {
   alwaysShow: true, // will always show the root menu
   meta: {
     title: 'purchasingManagement',
-    module: 'contractManagement',
+    module: 'procurement',
     icon: '-caigouguanli'
   },
   children: [
@@ -21,7 +21,7 @@ const purchasingManagementRouter = {
       meta: {
         title: 'procurementPlanList',
         shortcutEntrance: 'purchasingManagement',
-        module: 'contractManagement.salesContract',
+        module: 'procurement.procurementPlan',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -36,7 +36,7 @@ const purchasingManagementRouter = {
       meta: {
         title: 'procurementPlanAdd',
         shortcutEntrance: 'purchasingManagement',
-        module: 'contractManagement.salesContract',
+        module: 'procurement.procurementPlan.procurementInfo.add',
         permissicon: [],
         keepAlive: true
       },
@@ -51,7 +51,7 @@ const purchasingManagementRouter = {
       meta: {
         title: 'procurementPlanEdit',
         shortcutEntrance: 'purchasingManagement',
-        module: 'contractManagement.salesContract',
+        module: 'procurement.procurementPlan.procurementInfo.edit',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -66,7 +66,7 @@ const purchasingManagementRouter = {
       meta: {
         title: 'procurementPlanLook',
         shortcutEntrance: 'purchasingManagement',
-        module: 'contractManagement.salesContract',
+        module: 'procurement.procurementPlan.procurementInfo.view',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -82,7 +82,7 @@ const purchasingManagementRouter = {
       meta: {
         title: 'purchaseOrderList',
         shortcutEntrance: 'purchasingManagement',
-        module: 'contractManagement.salesContract',
+        module: 'procurement.procurementOrder.view',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -833,7 +833,7 @@ export default {
             (String(this.dataList.imperfectGrain).indexOf('.') + 1) >
             2||this.dataList.imperfectGrain>40||this.dataList.imperfectGrain<1) {
         this.$message({
-          message: '不完整粒输入错误',
+          message: '不完善粒输入错误',
           type: 'warning'
         })
         return

src/views/purchasingManagement/procurementPlanEdit.vue

@@ -472,7 +472,7 @@ export default {
     returnsales() {
       this.dataList = {}
       // this.selectedOptions = ''
-      this.$router.push({ path: 'procurementPlanList' })
+      this.$router.go(-1)
     },
     // 获取当前年月日
     getdate() {
@@ -868,7 +868,7 @@ export default {
             (String(this.dataList.imperfectGrain).indexOf('.') + 1) >
             2||this.dataList.imperfectGrain>40||this.dataList.imperfectGrain<1) {
         this.$message({
-          message: '不完整粒输入错误',
+          message: '不完善粒输入错误',
           type: 'warning'
         })
         return

src/views/purchasingManagement/procurementPlanList.vue

@@ -3,7 +3,9 @@
   <div class="container">
     <BaseHeaderLayout :leftSpan="10">
       <template slot="left">
-        <ws-button type="primary" @click="handleAdd()">添加</ws-button>
+        <ws-button type="primary" v-hasPermission="
+            `procurement.procurementPlan.procurementInfo.add`
+          " @click="handleAdd()">添加</ws-button>
       </template>
 
       <!-- 接单开始 -->
@@ -188,9 +190,15 @@
       ></el-table-column>
       <el-table-column prop="seller" label="操作" width="300">
         <template slot-scope="scope">
-          <div class="record" @click="handleLook(scope.row)">查看</div>
-          <div class="record" @click="handleEdit(scope.row)">编辑</div>
-          <div class="record" @click="handleDelete(scope.row)">删除</div>
+          <div class="record"  v-hasPermission="
+            `procurement.procurementPlan.procurementInfo.view`
+          " @click="handleLook(scope.row)">查看</div>
+          <div class="record" v-hasPermission="
+            `procurement.procurementPlan.procurementInfo.edit`
+          " @click="handleEdit(scope.row)">编辑</div>
+          <div class="record" v-hasPermission="
+            `procurement.procurementPlan.procurementInfo.delete`
+          " @click="handleDelete(scope.row)">删除</div>
         </template>
       </el-table-column>
     </el-table>

src/views/purchasingManagement/purchaseOrderList.vue

@@ -311,6 +311,9 @@
             "
             class="record"
             @click="makeabargain(scope.row)"
+            v-hasPermission="
+            `procurement.procurementOrder.deal`
+          "
           >
             成交
           </div>
@@ -322,6 +325,9 @@
             "
             class="record"
             @click="addthedeposit(scope.row)"
+            v-hasPermission="
+            `procurement.procurementOrder.deposit`
+          "
           >
             补充定金
           </div>
@@ -332,6 +338,9 @@
             "
             class="record"
             @click="unfreeze(scope.row)"
+            v-hasPermission="
+            `procurement.procurementOrder.thaw`
+          "
           >
             解冻定金
           </div>
@@ -344,6 +353,9 @@
             "
             class="record"
             @click="cloaeposition1(scope.row)"
+            v-hasPermission="
+            `procurement.procurementOrder.close`
+          "
           >
             平仓
           </div>
@@ -354,6 +366,9 @@
             "
             class="record"
             @click="handle(scope.row)"
+            v-hasPermission="
+            `procurement.procurementOrder.complete`
+          "
           >
             完成
           </div>
@@ -365,6 +380,9 @@
             type="text"
             class="record"
             @click="aduit(scope.row)"
+            v-hasPermission="
+            `procurement.procurementOrder.view`
+          "
           >
             审核
           </div>
@@ -372,6 +390,9 @@
             v-if="scope.row.status == '待审核'"
             class="record"
             @click="deletehandle(scope.row)"
+            v-hasPermission="
+            `procurement.procurementOrder.delete`
+          "
           >
             删除
           </div>

src/views/salesManagement/component/routers/route.js

@@ -8,7 +8,7 @@ const purchasingManagementRouter = {
   alwaysShow: true, // will always show the root menu
   meta: {
     title: 'salesManagement',
-    module: 'contractManagement',
+    module: 'sale',
     icon: '-xiaoshou2'
   },
   children: [
@@ -21,7 +21,7 @@ const purchasingManagementRouter = {
       meta: {
         title: 'salesPlanList',
         shortcutEntrance: 'salesManagement',
-        module: 'contractManagement.salesContract',
+        module: 'sale.salePlan.view',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -36,7 +36,7 @@ const purchasingManagementRouter = {
       meta: {
         title: 'salesPlanAdd',
         shortcutEntrance: 'salesManagement',
-        module: 'contractManagement.salesContract',
+        module: 'sale.salePlan.add',
         permissicon: [],
         keepAlive: true
       },
@@ -51,7 +51,7 @@ const purchasingManagementRouter = {
       meta: {
         title: 'salesPlanEdit',
         shortcutEntrance: 'salesManagement',
-        module: 'contractManagement.salesContract',
+        module: 'sale.salePlan.edit',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -66,7 +66,7 @@ const purchasingManagementRouter = {
       meta: {
         title: 'salesPlanLook',
         shortcutEntrance: 'salesManagement',
-        module: 'contractManagement.salesContract',
+        module: 'sale.salePlan.view',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -82,7 +82,7 @@ const purchasingManagementRouter = {
       meta: {
         title: 'salesOrderList',
         shortcutEntrance: 'salesManagement',
-        module: 'contractManagement.salesContract',
+        module: 'sale.salePlan.view',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'

src/views/salesManagement/salesPlanAdd.vue

@@ -805,6 +805,13 @@ export default {
         })
         return
       }
+      if (this.selectedOptions.length == 0) {
+        this.$message({
+          message: '请选择出货库所在地区！',
+          type: 'warning',
+        })
+        return
+      }
       if (!this.dataList.seller) {
         this.$message({
           message: '卖方不能为空！',
@@ -941,7 +948,7 @@ export default {
           2||this.dataList.imperfectGrain>40||this.dataList.imperfectGrain<1
       ) {
         this.$message({
-          message: '不完整粒输入错误',
+          message: '不完善粒输入错误',
           type: 'warning',
         })
         return

src/views/salesManagement/salesPlanEdit.vue

@@ -414,7 +414,7 @@ export default {
     returnsales() {
       this.dataList = {}
       // this.selectedOptions = ''
-      this.$router.push({ path: 'salesPlanList' })
+      this.$router.go(-1)
     },
     // 获取当前年月日
     getdate() {
@@ -850,7 +850,7 @@ export default {
           2||this.dataList.imperfectGrain>40||this.dataList.imperfectGrain<1
       ) {
         this.$message({
-          message: '不完整粒输入错误',
+          message: '不完善粒输入错误',
           type: 'warning',
         })
         return

src/views/salesManagement/salesPlanList.vue

@@ -2,7 +2,9 @@
 <template>
   <div class="container">
     <BaseHeaderLayout :leftSpan="10">
-      <template slot="left">  <ws-button type="primary" @click="handleAdd()">添加</ws-button> </template>
+      <template slot="left">  <ws-button type="primary" v-hasPermission="
+            `sale.salePlan.add`
+          " @click="handleAdd()">添加</ws-button> </template>
       <!-- 接单开始 -->
       <template slot="right">
         <ws-input
@@ -184,9 +186,15 @@
       ></el-table-column>
       <el-table-column prop="seller" label="操作" width="300">
         <template slot-scope="scope">
-          <div class="record" @click="handleLook(scope.row)">查看</div>
-          <div class="record" @click="handleEdit(scope.row)">编辑</div>
-          <div class="record" @click="handleDelete(scope.row)">删除</div>
+          <div class="record"  v-hasPermission="
+            `sale.salePlan.view`
+          " @click="handleLook(scope.row)">查看</div>
+          <div class="record"  v-hasPermission="
+            `sale.salePlan.edit`
+          " @click="handleEdit(scope.row)">编辑</div>
+          <div class="record" v-hasPermission="
+            `sale.salePlan.delete`
+          " @click="handleDelete(scope.row)">删除</div>
         </template>
       </el-table-column>
     </el-table>

src/views/salesManagement/salesPlanLook.vue

@@ -277,7 +277,7 @@ export default {
   methods: {
     //返回按钮
     returnsales() {
-       this.$router.go(-1)
+      this.$router.go(-1)
     },
     // 获取当前年月日
     getdate() {

src/views/salesManagement/salesPlanOrderList.vue

@@ -359,6 +359,9 @@
               scope.row.salePlanType == '期货'
             "
             class="record"
+            v-hasPermission="
+            `sale.saleOrder.deal`
+          "
             @click="makeabargain(scope.row)"
           >
             成交
@@ -369,6 +372,9 @@
               scope.row.defaultDeposit > 0 && scope.row.salePlanType == '期货'
             "
             class="record"
+            v-hasPermission="
+            `sale.saleOrder.deposit`
+          "
             @click="addthedeposit(scope.row)"
           >
             补充定金
@@ -379,6 +385,9 @@
               scope.row.freezingDeposit > 0 && scope.row.salePlanType == '期货'
             "
             class="record"
+            v-hasPermission="
+            `sale.saleOrder.thaw`
+          "
             @click="unfreeze(scope.row)"
           >
             解冻定金
@@ -389,6 +398,9 @@
               scope.row.openPosition > 0 && scope.row.salePlanType == '期货'
             "
             class="record"
+            v-hasPermission="
+            `sale.saleOrder.close`
+          "
             @click="cloaeposition1(scope.row)"
           >
             平仓
@@ -400,6 +412,9 @@
               scope.row.salePlanType == '期货'
             "
             class="record"
+            v-hasPermission="
+            `sale.saleOrder.complete`
+          "
             @click="handle(scope.row)"
           >
             完成
@@ -409,6 +424,9 @@
             v-if="scope.row.status == '待审核'"
             type="text"
             class="record"
+            v-hasPermission="
+            `sale.saleOrder.view`
+          "
             @click="aduit(scope.row)"
           >
             审核
@@ -417,6 +435,9 @@
           <div
             v-if="scope.row.status == '待审核'"
             class="record"
+            v-hasPermission="
+            `sale.saleOrder.delete`
+          "
             @click="deletehandle(scope.row)"
           >
             删除

src/views/statisticalReport/component/routers/route.js

@@ -8,7 +8,7 @@ const statisticalReportRouter = {
   alwaysShow: true, // will always show the root menu
   meta: {
     title: 'statisticalReport',
-    module: 'contractManagement',
+    module: 'report',
     icon: '-tongjibaobiao'
   },
   children: [
@@ -21,7 +21,7 @@ const statisticalReportRouter = {
       meta: {
         title: 'purchaseReceiptStatisticsList',
         shortcutEntrance: 'statisticalReport',
-        module: 'contractManagement.salesContract',
+        module: 'report.procurementInReport',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -36,7 +36,7 @@ const statisticalReportRouter = {
           meta: {
           title: 'purchaseClosingCashierList',
           shortcutEntrance: 'statisticalReport',
-          module: 'contractManagement.salesContract',
+          module: 'report.procurementCloseReport',
           permissicon: [],
           keepAlive: true
           // module: 'procurement.sparepart.applDetail'
@@ -51,7 +51,7 @@ const statisticalReportRouter = {
         meta: {
         title: 'salesClosingCashierList',
         shortcutEntrance: 'statisticalReport',
-        module: 'contractManagement.salesContract',
+        module: 'report.saleCloseReport',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -66,7 +66,7 @@ const statisticalReportRouter = {
       meta: {
         title: 'salesDeliveryReportList',
         shortcutEntrance: 'statisticalReport',
-        module: 'contractManagement.salesContract',
+        module: 'report.saleOutReport',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'

src/views/statisticalReport/purchaseClosingCashierList.vue

@@ -3,20 +3,34 @@
   <div class="container">
     <el-scrollbar style="height:100%">
       <el-row>
-        <el-col style='padding-left:15px;' :span="12">
+        <el-col style='padding-left:15px;' :span="16">
           <ws-button :type="searchType==1?'primary':''" @click="handlestatus(1)">待审核</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="handlepass1()">通过1</ws-button>
-          <ws-button v-if='roleId=="9ad8abb997714ef29068f23c2ad3b125"' type="primary" @click="handlereject(3)">驳回1</ws-button>
-          <ws-button v-if='roleId=="cca3cf0ca2814d1e918f5b0a4380fe69"' type="primary" @click="handlepass()">通过</ws-button>
-          <ws-button v-if='roleId=="cca3cf0ca2814d1e918f5b0a4380fe69"' type="primary" @click="handlereject(2)">驳回</ws-button>
-          <ws-button v-if='roleId=="4c2d50d8ff2943c1b7a1e947feefe048"' type="primary" @click="handleAudit()">审核</ws-button>
-          <ws-button v-if='roleId=="3d7b9179552b4c3e9c2d7af43962e2e4"' type="primary" @click="handlepayment()">付款</ws-button>
-          <ws-button v-if='roleId=="3d7b9179552b4c3e9c2d7af43962e2e4"' type="primary" @click="handlecollect()">收款</ws-button>
+         <ws-button v-if='roleId=="9ad8abb997714ef29068f23c2ad3b125"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.procurementCloseReport.view`
+          " @click="handlepass1()">通过</ws-button>
+          <ws-button v-if='roleId=="9ad8abb997714ef29068f23c2ad3b125"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.procurementCloseReport.view`
+          " @click="handlereject(3)">驳回</ws-button>
+          <ws-button v-if='roleId=="cca3cf0ca2814d1e918f5b0a4380fe69"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.procurementCloseReport.view`
+          " @click="handlepass()">通过</ws-button>
+          <ws-button v-if='roleId=="cca3cf0ca2814d1e918f5b0a4380fe69"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.procurementCloseReport.view`
+          " @click="handlereject(2)">驳回</ws-button>
+          <ws-button v-if='roleId=="4c2d50d8ff2943c1b7a1e947feefe048"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.procurementCloseReport.view`
+          " @click="handleAudit()">审核</ws-button>
+          <ws-button v-if='roleId=="3d7b9179552b4c3e9c2d7af43962e2e4"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.procurementCloseReport.payment`
+          " @click="handlepayment()">付款</ws-button>
+          <ws-button v-if='roleId=="3d7b9179552b4c3e9c2d7af43962e2e4"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.procurementCloseReport.recive`
+          " @click="handlecollect()">收款</ws-button>
         </el-col>
-        <el-col style='text-align:right;line-height:60px;padding-right:10px;' :span="12">
+        <el-col style='text-align:right;line-height:60px;padding-right:10px;' :span="8">
           <ws-select
             v-model="contractNo"
             placeholder="请选择合同"
@@ -441,6 +455,8 @@ export default {
         this.roleFlag=3
       }else if(this.roleId=='3d7b9179552b4c3e9c2d7af43962e2e4'){
         this.roleFlag=4
+      }else if(this.roleId=="4ef070439cd64784bce8844fd3f0f8e1"){
+        this.roleFlag=''
       }
       getclose({
         compId: sessionStorage.getItem('ws-pf_compId'),

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -3,22 +3,40 @@
   <div class="container">
     <el-scrollbar style="height: 100%">
      <el-row>
-        <el-col style='padding-left:15px;' :span="12">
+        <el-col style='padding-left:15px;' :span="16">
         <ws-button :type="searchType==1?'primary':''" @click="handlestatus(1)">待审核</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="handlepass1()">通过</ws-button>
-        <ws-button v-if='roleId=="9ad8abb997714ef29068f23c2ad3b125"' type="primary" @click="handlereject(3)">驳回</ws-button>
-        <ws-button v-if='roleId=="cca3cf0ca2814d1e918f5b0a4380fe69"' type="primary" @click="handlepass()">通过</ws-button>
-        <ws-button v-if='roleId=="cca3cf0ca2814d1e918f5b0a4380fe69"' type="primary" @click="handlereject(2)">驳回</ws-button>
-        <ws-button v-if='roleId=="3d7b9179552b4c3e9c2d7af43962e2e4"' type="primary" @click="handlepayment">付款</ws-button>
-        <ws-button v-if='roleId=="3d7b9179552b4c3e9c2d7af43962e2e4"' type="primary" @click="handleninvoice">开发票</ws-button>
-        <ws-button v-if='roleId=="4c2d50d8ff2943c1b7a1e947feefe048"' type="primary" @click="amend()">修改</ws-button>
-        <ws-button v-if='roleId=="4c2d50d8ff2943c1b7a1e947feefe048"' type="primary" @click="carryover">补货结转</ws-button>
-        <ws-button  v-if='roleId=="4c2d50d8ff2943c1b7a1e947feefe048"' type="primary" @click="handleAudit()">审核</ws-button>
+        <ws-button v-if='roleId=="9ad8abb997714ef29068f23c2ad3b125"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary"  v-hasPermission="
+            `report.procurementInReport.view`
+          " @click="handlepass1()">通过</ws-button>
+        <ws-button v-if='roleId=="9ad8abb997714ef29068f23c2ad3b125"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.procurementInReport.view`
+          " @click="handlereject(3)">驳回</ws-button>
+        <ws-button v-if='roleId=="cca3cf0ca2814d1e918f5b0a4380fe69"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.procurementInReport.view`
+          " @click="handlepass()">通过</ws-button>
+        <ws-button v-if='roleId=="cca3cf0ca2814d1e918f5b0a4380fe69"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.procurementInReport.view`
+          " @click="handlereject(2)">驳回</ws-button>
+        <ws-button v-if='roleId=="3d7b9179552b4c3e9c2d7af43962e2e4"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.procurementInReport.payment`
+          " @click="handlepayment">付款</ws-button>
+        <ws-button v-if='roleId=="3d7b9179552b4c3e9c2d7af43962e2e4"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.procurementInReport.draw`
+          " @click="handleninvoice">开发票</ws-button>
+        <ws-button v-if='roleId=="4c2d50d8ff2943c1b7a1e947feefe048"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.procurementInReport.edit`
+          " @click="amend()">修改</ws-button>
+        <ws-button v-if='roleId=="4c2d50d8ff2943c1b7a1e947feefe048"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.procurementInReport.carry`
+          " @click="carryover">补货结转</ws-button>
+        <ws-button  v-if='roleId=="4c2d50d8ff2943c1b7a1e947feefe048"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.procurementInReport.view`
+          " @click="handleAudit()">审核</ws-button>
         </el-col>
-        <el-col style='text-align:right;line-height:60px;padding-right:10px;' :span="12">
+        <el-col style='text-align:right;line-height:60px;padding-right:10px;' :span="8">
         <ws-select
           v-model="contractNo"
           placeholder="请选择合同"
@@ -1026,6 +1044,8 @@ export default {
         this.roleFlag=3
       }else if(this.roleId=='3d7b9179552b4c3e9c2d7af43962e2e4'){
         this.roleFlag=4
+      }else if(this.roleId=="4ef070439cd64784bce8844fd3f0f8e1"){
+        this.roleFlag=''
       }
       getpurchreceipt({
         compId: sessionStorage.getItem('ws-pf_compId'),

src/views/statisticalReport/salesClosingCashierList.vue

@@ -2,20 +2,34 @@
 <template>
   <div class="container">
         <el-row>
-        <el-col style='padding-left:15px;' :span="12">
+        <el-col style='padding-left:15px;' :span="16">
           <ws-button :type="searchType==1?'primary':''" @click="handlestatus(1)">待审核</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>
-          <ws-button v-if='roleId=="9ad8abb997714ef29068f23c2ad3b125"' type="primary" @click="handleAudit(3,1)">通过</ws-button>
-          <ws-button v-if='roleId=="cca3cf0ca2814d1e918f5b0a4380fe69"' type="primary" @click="handleAudit(2,2)">驳回</ws-button>
-          <ws-button v-if='roleId=="cca3cf0ca2814d1e918f5b0a4380fe69"' type="primary" @click="handleAudit(2,1)">通过</ws-button>
-          <ws-button v-if='roleId=="4c2d50d8ff2943c1b7a1e947feefe048"' type="primary" @click="handleAudit(1)">审核</ws-button>
-          <ws-button v-if='roleId=="3d7b9179552b4c3e9c2d7af43962e2e4"' type="primary" @click="payment()">付款</ws-button>
-          <ws-button v-if='roleId=="3d7b9179552b4c3e9c2d7af43962e2e4"' type="primary" @click="collection()">收款</ws-button>
+          <ws-button v-if='roleId=="9ad8abb997714ef29068f23c2ad3b125"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.saleCloseReport.view`
+          " @click="handleAudit(3,2)">驳回</ws-button>
+          <ws-button v-if='roleId=="9ad8abb997714ef29068f23c2ad3b125"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.saleCloseReport.view`
+          " @click="handleAudit(3,1)">通过</ws-button>
+          <ws-button v-if='roleId=="cca3cf0ca2814d1e918f5b0a4380fe69"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.saleCloseReport.view`
+          " @click="handleAudit(2,2)">驳回</ws-button>
+          <ws-button v-if='roleId=="cca3cf0ca2814d1e918f5b0a4380fe69"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.saleCloseReport.view`
+          " @click="handleAudit(2,1)">通过</ws-button>
+          <ws-button v-if='roleId=="4c2d50d8ff2943c1b7a1e947feefe048"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.saleCloseReport.view`
+          " @click="handleAudit(1)">审核</ws-button>
+          <ws-button v-if='roleId=="3d7b9179552b4c3e9c2d7af43962e2e4"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.saleCloseReport.payment`
+          " @click="payment()">付款</ws-button>
+          <ws-button v-if='roleId=="3d7b9179552b4c3e9c2d7af43962e2e4"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.saleCloseReport.recive`
+          " @click="collection()">收款</ws-button>
            </el-col>
-        <el-col style='text-align:right;line-height:60px;padding-right:10px;' :span="12">
+        <el-col style='text-align:right;line-height:60px;padding-right:10px;' :span="8">
           <ws-select
             v-model="contractNo"
             placeholder="请选择合同"
@@ -601,6 +615,8 @@ export default {
         this.roleFlag=3
       }else if(this.roleId=='3d7b9179552b4c3e9c2d7af43962e2e4'){
         this.roleFlag=4
+      }else if(this.roleId=="4ef070439cd64784bce8844fd3f0f8e1"){
+        this.roleFlag=''
       }
       getsalelist({
         compId: sessionStorage.getItem('ws-pf_compId'),

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -3,21 +3,37 @@
   <div class="container">
     <el-scrollbar style="height:100%">
         <el-row>
-        <el-col style='padding-left:15px;' :span="12">
+        <el-col style='padding-left:15px;' :span="16">
           <ws-button :type="searchType==1?'primary':''" @click="handlestatus(1)">待审核</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="handlepass1()">通过</ws-button>
-          <ws-button  v-if='roleId=="9ad8abb997714ef29068f23c2ad3b125"' type="primary" @click="handlereject(3)">驳回</ws-button>
-          <ws-button  v-if='roleId=="cca3cf0ca2814d1e918f5b0a4380fe69"' type="primary" @click="handlepass()">通过</ws-button>
-          <ws-button  v-if='roleId=="cca3cf0ca2814d1e918f5b0a4380fe69"' type="primary" @click="handlereject(2)">驳回</ws-button>
-          <ws-button v-if='roleId=="3d7b9179552b4c3e9c2d7af43962e2e4"' type="primary" @click="handlecollect()">收款</ws-button>
-          <ws-button v-if='roleId=="3d7b9179552b4c3e9c2d7af43962e2e4"' type="primary" @click="handleninvoice()">开发票</ws-button>
-          <ws-button v-if='roleId=="4c2d50d8ff2943c1b7a1e947feefe048"' type="primary" @click="amend()">最终结算价</ws-button>
-          <ws-button v-if='roleId=="4c2d50d8ff2943c1b7a1e947feefe048"' type="primary" @click="handleAudit()">审核</ws-button>
+          <ws-button  v-if='roleId=="9ad8abb997714ef29068f23c2ad3b125"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.saleOutReport.view`
+          " @click="handlepass1()">通过</ws-button>
+          <ws-button  v-if='roleId=="9ad8abb997714ef29068f23c2ad3b125"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.saleOutReport.view`
+          " @click="handlereject(3)">驳回</ws-button>
+          <ws-button  v-if='roleId=="cca3cf0ca2814d1e918f5b0a4380fe69"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.saleOutReport.view`
+          " @click="handlepass()">通过</ws-button>
+          <ws-button  v-if='roleId=="cca3cf0ca2814d1e918f5b0a4380fe69"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.saleOutReport.view`
+          " @click="handlereject(2)">驳回</ws-button>
+          <ws-button v-if='roleId=="3d7b9179552b4c3e9c2d7af43962e2e4"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.saleOutReport.payment`
+          " @click="handlecollect()">收款</ws-button>
+          <ws-button v-if='roleId=="3d7b9179552b4c3e9c2d7af43962e2e4"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.saleOutReport.draw`
+          " @click="handleninvoice()">开发票</ws-button>
+          <ws-button v-if='roleId=="4c2d50d8ff2943c1b7a1e947feefe048"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.saleOutReport.carry`
+          " @click="amend()">最终结算价</ws-button>
+          <ws-button v-if='roleId=="4c2d50d8ff2943c1b7a1e947feefe048"||roleId=="4ef070439cd64784bce8844fd3f0f8e1"' type="primary" v-hasPermission="
+            `report.saleOutReport.view`
+          " @click="handleAudit()">审核</ws-button>
           </el-col>
-        <el-col style='text-align:right;line-height:60px;padding-right:10px;' :span="12">
+        <el-col style='text-align:right;line-height:60px;padding-right:10px;' :span="8">
           <ws-select
             v-model="contractNo"
             placeholder="请选择合同"
@@ -715,6 +731,8 @@ export default {
         this.roleFlag=3
       }else if(this.roleId=='3d7b9179552b4c3e9c2d7af43962e2e4'){
         this.roleFlag=4
+      }else if(this.roleId=="4ef070439cd64784bce8844fd3f0f8e1"){
+        this.roleFlag=''
       }
       salelist({
         compId: sessionStorage.getItem('ws-pf_compId'),