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

src/components/WsUpload/index.vue

@@ -45,7 +45,7 @@
       <template v-slot:file="{ file }">
         <div class="thumbnail-group">
           <img 
-          v-if='getFileClass(file)=="ext png"'
+          v-if='getFileClass(file)=="ext png"||getFileClass(file)=="ext jpg"||getFileClass(file)=="ext jpeg"'
           :src='file.url'
             class="el-upload-list__item-thumbnail"
             :class="getFileClass(file)"

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

@@ -95,71 +95,71 @@ const contractManagementRouter = {
       hidden: true
     },
     // 收购合同
-    {
-      path: 'acquisitionContract',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/contractManagement/acquisitionContract'),
-      name: 'acquisitionContract',
-      meta: {
-        title: 'acquisitionContract',
-        shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.buyContract',
-        permissicon: [],
-        keepAlive: true,
-        _title:'收购合同'
-      }
-    },
-    //收购合同查看
-    {
-      path: 'acquisitionContractExamine',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/acquisitionContractExamine'),
-      name: 'acquisitionContractExamine',
-      meta: {
-        title: 'acquisitionContractExamine',
-        shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.buyContract.buyContractInfo.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'收购合同查看'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
-    //收购合同编辑
-    {
-      path: 'acquisitionContractEdit',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/acquisitionContractEdit'),
-      name: 'acquisitionContractEdit',
-      meta: {
-        title: 'acquisitionContractEdit',
-        shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.buyContract.buyContractInfo.edit',
-        permissicon: [],
-        keepAlive: true,
-        _title:'收购合同编辑'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
-    //收购合同添加
-    {
-      path: 'acquisitionContractAdd',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/acquisitionContractAdd'),
-      name: 'acquisitionContractAdd',
-      meta: {
-        title: 'acquisitionContractAdd',
-        shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.buyContract.buyContractInfo.add',
-        permissicon: [],
-        keepAlive: true,
-        _title:'收购合同添加'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
+    // {
+    //   path: 'acquisitionContract',
+    //   component: () =>
+    //     import(/* webpackChunkName: "sparepartList" */ '@/views/contractManagement/acquisitionContract'),
+    //   name: 'acquisitionContract',
+    //   meta: {
+    //     title: 'acquisitionContract',
+    //     shortcutEntrance: 'contractManagement',
+    //     module: 'contractManagement.buyContract',
+    //     permissicon: [],
+    //     keepAlive: true,
+    //     _title:'收购合同'
+    //   }
+    // },
+    // //收购合同查看
+    // {
+    //   path: 'acquisitionContractExamine',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/acquisitionContractExamine'),
+    //   name: 'acquisitionContractExamine',
+    //   meta: {
+    //     title: 'acquisitionContractExamine',
+    //     shortcutEntrance: 'contractManagement',
+    //     module: 'contractManagement.buyContract.buyContractInfo.view',
+    //     permissicon: [],
+    //     keepAlive: true,
+    //     _title:'收购合同查看'
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden: true
+    // },
+    // //收购合同编辑
+    // {
+    //   path: 'acquisitionContractEdit',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/acquisitionContractEdit'),
+    //   name: 'acquisitionContractEdit',
+    //   meta: {
+    //     title: 'acquisitionContractEdit',
+    //     shortcutEntrance: 'contractManagement',
+    //     module: 'contractManagement.buyContract.buyContractInfo.edit',
+    //     permissicon: [],
+    //     keepAlive: true,
+    //     _title:'收购合同编辑'
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden: true
+    // },
+    // //收购合同添加
+    // {
+    //   path: 'acquisitionContractAdd',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/acquisitionContractAdd'),
+    //   name: 'acquisitionContractAdd',
+    //   meta: {
+    //     title: 'acquisitionContractAdd',
+    //     shortcutEntrance: 'contractManagement',
+    //     module: 'contractManagement.buyContract.buyContractInfo.add',
+    //     permissicon: [],
+    //     keepAlive: true,
+    //     _title:'收购合同添加'
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden: true
+    // },
 
     // 期货采购合同
     // {

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -4,7 +4,7 @@
     <BaseHeaderLayout :leftSpan="16">
       <template slot="left">
         <el-button v-if='this.zjJurisdiction' @click='warehousetypechange(1)' :type="serviceManagementType == 1 ? 'primary' : ''">贸易入库</el-button>
-        <el-button v-if='this.qyJurisdiction' @click='warehousetypechange(3)' :type="serviceManagementType == 3 ? 'primary' : ''">收购入库</el-button>
+        <el-button @click='warehousetypechange(3)' :type="serviceManagementType == 3 ? 'primary' : ''">收购入库</el-button>
       </template>
       <template slot="right">
         <ws-select v-model="warehouseName" placeholder="" @change="warehouseNameChange" :value="searchType"
@@ -54,22 +54,29 @@
                 </el-checkbox>
               </div>
               <ws-info-table>
-                <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction&&statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"||serviceManagementType == 1' label="任务编号" span="1" prop="inOutTaskNo">
+                <ws-form-item v-if='serviceManagementType == 1' label="任务编号" span="1" prop="inOutTaskNo">
                   <el-select :disabled='recheck' filterable clearable v-model="deptBudgetList.inOutTaskNo"
                     placeholder="请选择任务编号" class="typeselect" @change="contractNoChange">
                     <el-option v-for="item in taskNolist" :key="'renwu' + item.inOutTaskNo" :label="item.inOutTaskNo"
                       :value="item.inOutTaskNo" />
                   </el-select>
                 </ws-form-item>
+                <!-- <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction&&statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"||serviceManagementType == 1' label="任务编号" span="1" prop="inOutTaskNo">
+                  <el-select :disabled='recheck' filterable clearable v-model="deptBudgetList.inOutTaskNo"
+                    placeholder="请选择任务编号" class="typeselect" @change="contractNoChange">
+                    <el-option v-for="item in taskNolist" :key="'renwu' + item.inOutTaskNo" :label="item.inOutTaskNo"
+                      :value="item.inOutTaskNo" />
+                  </el-select>
+                </ws-form-item> -->
                 <ws-form-item v-if='serviceManagementType==3&&deptBudgetList.id' label="业务编号" span="1" prop="qualityNo">
                   <ws-input v-model="deptBudgetList.qualityNo" placeholder="自动获取，不可编辑" maxlength="100" disabled
                     size="small" />
                 </ws-form-item>
-                <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction&&statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"' label="合同编号"
+                <!-- <ws-form-item v-if='serviceManagementType == 3 && qyJurisdiction&&statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"' label="合同编号"
                   span="1" prop="contractNo">
                   <ws-input v-model="deptBudgetList.contractNo" placeholder="自动获取，不可编辑" maxlength="100" disabled
                     size="small" />
-                </ws-form-item>
+                </ws-form-item> -->
                 <ws-form-item v-if='serviceManagementType == 3 && zjJurisdiction&&statusTypetext == "初检"||serviceManagementType == 3 && statusTypetext != "初检"' label="购粮性质" span="1"
                   prop="natureOfGrainPurchase">
                   <ws-input v-model="deptBudgetList.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="10"
@@ -2759,8 +2766,6 @@ export default {
                         }
 
                         this.$message.success('编辑成功')
-                        this.getList()
-                        this.selectWarehouse()
                         // this.$router.push({
                         //   path: 'warehouseManagementList',
                         // })
@@ -2774,6 +2779,7 @@ export default {
                             //             .then((res) => {
                             
                             if (this.zjJurisdiction) {
+                              console.log(response2,2222222)
                               this.deptBudgetList = response2
                               this.isShowPrint = true
                               this.printData = response2
@@ -2793,7 +2799,8 @@ export default {
                             console.log(response)
                             // this.$message.warning(response)
                           })
-
+                          this.getList()
+                          this.selectWarehouse()
                       })
                     }
                     
@@ -3052,10 +3059,11 @@ export default {
           }
           if(this.qyJurisdiction&&!this.zjJurisdiction){
               this.serviceManagementType=3
-              this.taskflag=3
+              
             }
-            if(this.zjJurisdiction){
-              this.serviceManagementType=1
+            if(this.serviceManagementType==3){
+              this.taskflag=3
+            }else{
               this.taskflag=2
             }
           getReceiptTaskNo({

src/views/profitable/cashout.vue

@@ -647,7 +647,7 @@
             })
             this.deptBudgetList={purpose:"合同费用",type:'粮款'}
             this.paymentScreenshot=[]
-            this.$refs.uploadfiles.clearFiles()
+            this.$refs.upload.clearFiles()
             this.$router.go(-1)
           })
           })

src/views/profitable/cashoutaduit.vue

@@ -52,11 +52,8 @@
           </el-form-item>
           <el-form-item label-width='100px' label="附件">
           <div v-if='srcList.length>0'>
-            <span v-for='item in srcList'><el-image
-              style="width: 100px; height: 100px;border:1px solid #000;display:inline-block;margin:10px;"
-              :src="item"
-               :preview-src-list="srcList"></el-image></span>
-             
+            <ws-upload :editable='false' ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
+       />
           </div>
           <div v-else>暂无附件</div>
         </el-form-item>
@@ -145,12 +142,15 @@
   </div>
 </template>
 <script>
+import WsUpload from '@/components/WsUpload'
   import {
     woekflowhandle
   } from '@/model/tasksport/index'
   import {getcontract,getwarehouse,lookexenseinfo,editexenseinfo} from '@/model/profitable/index'
   export default {
-    components: {},
+    components: {
+      WsUpload,
+    },
     data() {
       return {
         value: [],

src/views/profitable/cashoutedit.vue

@@ -57,10 +57,9 @@
             </el-input>
           </el-form-item>
           <el-form-item label-width='100px' label="附件">
-          <el-upload ref='uploadfiles' :file-list='dataList' action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
-            :on-success="handlefujian" :on-remove="handleRemove" class="photo2"  accept="image/jpg,image/jpeg,image/png">
-            <i class="el-icon-plus"></i>
-          </el-upload>
+          <ws-upload ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
+        @onChange="onChange" 
+       />
         </el-form-item>
         </el-form>
        <div style='text-align:right;margin-right:30px;'>
@@ -72,9 +71,12 @@
   </div>
 </template>
 <script>
+  import WsUpload from '@/components/WsUpload'
   import {setexpense,getcontract,getwarehouse,editexenseinfo,getwarehousingorder,lookexenseinfo,} from '@/model/profitable/index'
   export default {
-    components: {},
+    components: {
+      WsUpload,
+    },
     data() {
       return {
         value: [],
@@ -86,6 +88,7 @@
         moneys:'按重量自动分配',
         dataList:[],
         goodsList:[],
+        compId:localStorage.getItem('ws-pf_compId'),
         disabled:false,
         warecontractList:[],
         dateRange: this.disabledDate(),
@@ -136,6 +139,17 @@
       }
     },
     methods: {
+      onChange() {
+        this.$refs.upload
+          .handleSaveBill()
+          .then(async response => {
+            this.deptBudgetList.addressUrl = response
+          })
+          .catch(res => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload.clearFiles()
+          })
+      },
       selectwarehouse(e){
         for (let i = 0; i < this.warehouseList.length; i++) {
           if(this.warehouseList[i].warehouseName==e){

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

@@ -245,6 +245,23 @@ const profitableRouter = {
       },
       hidden:true,
     },  
+    // 费用管理请款审核
+    {
+      path: 'cashoutaduitNQ',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/cashoutaduitNQ'),
+      name: 'cashoutaduitNQ',
+      meta: {
+        title: 'cashoutaduit',
+        shortcutEntrance: 'profitable',
+        module: 'lirunhesuan.feiyongguanli.view',
+        permissicon: [],
+        keepAlive: true,
+        _title:'费用管理请款审核'
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    }, 
     // 费用管理收款
     {
       path: 'receipt',

src/views/profitable/expensemanagementdetails.vue

@@ -32,7 +32,7 @@
           <el-button @click="typeChange(2)" :type="searchType == 2?'primary':''">支出</el-button>
         </el-col>
         <el-col style='text-align:right;' :span="6">
-          <el-button style="margin-left:10px" @click="cashout('')">请款</el-button>
+          <el-button v-hasPermission="`lirunhesuan.feiyongguanli.add`" style="margin-left:10px" @click="cashout('')">请款</el-button>
           <el-button v-hasPermission="`lirunhesuan.feiyongguanli.shouk`" style="margin-right:10px" @click="receipt(1)" >收款</el-button>
         </el-col>
       </el-row>
@@ -125,7 +125,7 @@
               ||!scope.row.distributionStatus&&scope.row.expensesPurpose==3&&!scope.row.approveStatus&&scope.row.status=="已付款"' @click="allot(scope.row)" type="primary">分配</el-button>
               <!-- <el-button v-if='scope.row.approveStatus=="已驳回"' @click="del(0,scope.row)" type="primary">删除</el-button> -->
               <el-button v-if='scope.row.status=="已驳回"' @click="del(0,scope.row)" type="danger">删除</el-button>
-              <el-button v-if='scope.row.approveStatus=="待财务审核"||scope.row.approveStatus=="待决策人审核"' @click="aduit(scope.row)" type="primary">审核</el-button>
+              <el-button v-if='scope.row.approveStatus=="待财务审核"||scope.row.approveStatus=="待决策人审核"||scope.row.approveStatus=="待内勤审核"' @click="aduit(scope.row)" type="primary">审核</el-button>
               <el-button v-if='!scope.row.approveStatus&&scope.row.expensesType==2&&scope.row.status=="待付款"' @click="payment(scope.row)" type="primary">付款</el-button>
             </template>
           </el-table-column>
@@ -165,14 +165,13 @@
     </el-dialog>
     <WinseaContentModal v-model="fujianshow" :title="title"
       @on-cancel="handleClose">
-     <span v-for='item in appendixIdss'><el-image
-              style="width: 100px; height: 100px;border:1px solid #000;display:inline-block;margin:10px;"
-              :src="item"
-               :preview-src-list="appendixIdss"></el-image></span>
+    <ws-upload :editable='false' ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx" :comp-id="compId" :appendix-ids="appendixIdss" :size-limit="size"
+       />
     </WinseaContentModal>
   </div>
 </template>
 <script>
+  import WsUpload from '@/components/WsUpload'
   import {
     getInOutDetailed,
     getexenseinfo,
@@ -180,7 +179,9 @@
     delallocationinfo,editexenseinfo,getAuditRecord
   } from '@/model/profitable/index'
   export default {
-    components: {},
+    components: {
+      WsUpload,
+    },
     data() {
       return {
         value: "",
@@ -189,6 +190,7 @@
         currentPage: 1,
         pageSize: 10,
         recordList:[],
+        compId:localStorage.getItem('ws-pf_compId'),
         dialogVisible1:false,
         deptCircularPage: {},
         searchType:"",
@@ -231,7 +233,7 @@
         this.id = row.id
         this.fujianshow = true
         if(row.addressUrl){
-          this.appendixIdss = row.addressUrl.split(',')
+         this.appendixIdss=row.addressUrl
         }
       },
       look(row){
@@ -341,7 +343,11 @@
       },
       aduit(row){
         if(row.taskId){
-          this.$router.push({name:'cashoutaduit',query:{id:row.id,taskId:row.taskId}})
+          // if(row.approveStatus=='待内勤审核'){
+          //   this.$router.push({name:'cashoutaduitNQ',query:{id:row.id,taskId:row.taskId}})
+          // }else{
+            this.$router.push({name:'cashoutaduit',query:{id:row.id,taskId:row.taskId}})
+          // }
         }else{
           this.$message({
             message: '暂无此权限!',

src/views/profitable/expensemanagentlook.vue

@@ -49,11 +49,8 @@
           </el-form-item>
           <el-form-item label-width='100px' label="附件">
           <div v-if='srcList.length>0'>
-            <span v-for='item in srcList'><el-image
-              style="width: 100px; height: 100px;border:1px solid #000;display:inline-block;margin:10px;"
-              :src="item"
-               :preview-src-list="srcList"></el-image></span>
-             
+           <ws-upload :editable='false' ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
+       />
           </div>
           <div v-else>暂无附件</div>
         </el-form-item>
@@ -130,9 +127,12 @@
   </div>
 </template>
 <script>
+  import WsUpload from '@/components/WsUpload'
   import {lookexenseinfo,getpayeeinfo} from '@/model/profitable/index'
   export default {
-    components: {},
+    components: {
+      WsUpload,
+    },
     data() {
       return {
         value: [],
@@ -144,6 +144,7 @@
         makeWordData: {},
         srcList:[],
         expensesType:'',
+        compId:localStorage.getItem('ws-pf_compId'),
         roleName:localStorage.getItem('ws-pf_roleName'),
         payeeinfo:{},
         valueData: [{

src/views/statisticalReport/autoSettlementList.vue

@@ -585,6 +585,13 @@ export default {
           }
           this.amountNotPayable += Number(this.modification[i].amountNotPayable)
         }
+        var arr=this.modification.filter((item,index)=>{
+          return  this.modification.indexOf(item.contractNo)===index
+        })
+        if(arr.length>1){
+          this.$message.warning('付款只能同时付一个合同编号的数据')
+            return
+        }
         this.amountNotPayable = this.amountNotPayable.toFixed(2)
         this.dialogFormVisible1 = true
       }