Página inicial Explorar Ajuda
Registrar Entrar
gdc
/
yiliangyiyun-pc
1
0
Fork 0
Arquivos Issues 0 Pull Requests 0 Wiki
Ver código fonte

前端

gjy 2 anos atrás
pai
65b8e9199e
commit
f5d0b6989b
10 arquivos alterados com 122 adições e 17 exclusões
Visão unificada Mostrar estatísticas do Diff
  1. 1 1
      public/static/print.html
  2. 7 1
      src/views/houseSelfCollect/inspectionManagementNew.vue
  3. 5 0
      src/views/outboundManagement/weighingManagementNew.vue
  4. 33 4
      src/views/profitable/cashout.vue
  5. 13 0
      src/views/profitable/cashoutaduit.vue
  6. 13 0
      src/views/profitable/cashoutaduitNQ.vue
  7. 13 0
      src/views/profitable/cashoutedit.vue
  8. 13 0
      src/views/profitable/expenseallotaduit.vue
  9. 13 0
      src/views/profitable/expensemanagentedit.vue
  10. 11 11
      src/views/profitable/expensemanagentlook.vue

+ 1 - 1
public/static/print.html
Ver arquivo 

@@ -150,7 +150,7 @@
 
 
 
   <body>
 
   <body>
 
     <div id="app">
 
     <div id="app">
 
-      <div class="content" :class="content" v-if="type == 1"><!--容重打印-->
 
+      <div class="content"  v-if="type == 1"><!--容重打印-->
 
         <div class="title">
 
         <div class="title">
 
           <div class="name">{{name}}价格对照表（按容重）</div>
 
           <div class="name">{{name}}价格对照表（按容重）</div>
 
           <div class="price">价格单位：元/公斤</div>
 
           <div class="price">价格单位：元/公斤</div>

+ 7 - 1
src/views/houseSelfCollect/inspectionManagementNew.vue
Ver arquivo 

@@ -3388,8 +3388,14 @@ export default {
 
             // this.carstatus = true
 
             // this.carstatus = true
 
           } else {
 
           } else {
 
             this.options2 = []
 
             this.options2 = []
 
+            this.tranCarInfoList = []
 
           }
 
           }
 
-          this.fleetNameList = this.outContractNo[i].tranCarInfoList1
 
+          if(this.outContractNo[i].tranCarInfoList1){
 
+            this.fleetNameList = this.outContractNo[i].tranCarInfoList1
 
+          }else{
 
+            this.fleetNameList = []
 
+          }
 
+          
         }
 
         }
 
       }
 
       }
 
     },
 
     },

+ 5 - 0
src/views/outboundManagement/weighingManagementNew.vue
Ver arquivo 

@@ -2189,9 +2189,14 @@
 
               this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
 
               this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
 
               this.carjudge = false
 
               this.carjudge = false
 
 
 
+            }else{
 
+              this.options2 = []
 
+              this.tranCarInfoList = []
 
             }
 
             }
 
             if (this.outContractNo[i].tranCarInfoList1) {
 
             if (this.outContractNo[i].tranCarInfoList1) {
 
               this.fleetNameList = this.outContractNo[i].tranCarInfoList1
 
               this.fleetNameList = this.outContractNo[i].tranCarInfoList1
 
+            }else{
 
+              this.fleetNameList = []
 
             }
 
             }
 
             if (this.carjudge) {
 
             if (this.carjudge) {
 
                 this.weighingList.selfLoading = '1'
 
                 this.weighingList.selfLoading = '1'

+ 33 - 4
src/views/profitable/cashout.vue
Ver arquivo 

@@ -71,6 +71,19 @@
 
             <i class="el-icon-plus"></i>
 
             <i class="el-icon-plus"></i>
 
           </el-upload> -->
 
           </el-upload> -->
 
         </el-form-item>
 
         </el-form-item>
 
+        <div style='margin:20px -30px;font-weight:bold'>收款账户信息</div>
 
+        <el-form-item label-width='100px' label="收款方" span="1" prop="payee">
 
+            <el-input class='input50 input_css' placeholder="输入收款方" v-model="deptBudgetList.payee"></el-input>
 
+          </el-form-item>
 
+          <el-form-item label-width='100px' label="账号" span="1" prop="accountNumber">
 
+            <el-input class='input50 input_css' placeholder="输入账号" v-model="deptBudgetList.accountNumber"></el-input>
 
+          </el-form-item>
 
+          <el-form-item label-width='100px' label="开户行" span="1" prop="bank">
 
+            <el-input class='input50 input_css' placeholder="输入开户行" v-model="deptBudgetList.bank"></el-input>
 
+          </el-form-item>
 
+          <el-form-item label-width='100px' label="开户支行" span="1" prop="bankBranch">
 
+            <el-input class='input50 input_css' placeholder="输入开户支行" v-model="deptBudgetList.bankBranch"></el-input>
 
+          </el-form-item>
 
         </el-form>
 
         </el-form>
 
         <div v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"&&deptBudgetList.flag!="是"' class='expensetitle'>费用分配</div>
 
         <div v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"&&deptBudgetList.flag!="是"' class='expensetitle'>费用分配</div>
 
         <div v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"&&deptBudgetList.flag!="是"' style='margin:0  auto 10px;width:90%;'>
 
         <div v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"&&deptBudgetList.flag!="是"' style='margin:0  auto 10px;width:90%;'>
 
@@ -108,13 +121,19 @@
 
               </el-select>
 
               </el-select>
 
             </template>
 
             </template>
 
           </el-table-column>
 
           </el-table-column>
 
-          <el-table-column v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="日期">
 
+          <!-- <el-table-column v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="日期">
 
             <template slot-scope="scope">
 
             <template slot-scope="scope">
 
                <el-select v-model="scope.row.receiptDocDate" filterable placeholder="选择日期" @change="((value)=>{selecttime(value, scope.row,scope.$index)})">
 
                <el-select v-model="scope.row.receiptDocDate" filterable placeholder="选择日期" @change="((value)=>{selecttime(value, scope.row,scope.$index)})">
 
                 <el-option v-for="item in datelist[scope.$index]" :key="item.time" :label="item.time" :value="item.time"
 
                 <el-option v-for="item in datelist[scope.$index]" :key="item.time" :label="item.time" :value="item.time"
 
                   style="color: #8890b1" />
 
                   style="color: #8890b1" />
 
               </el-select>
 
               </el-select>
 
             </template>
 
             </template>
 
+          </el-table-column> -->
 
+          <el-table-column v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="日期">
 
+            <template slot-scope="scope">
 
+                <el-date-picker @change="((value)=>{selectware(value, scope.$index)})" v-model="scope.row.receiptDocDate" type="date" placeholder="请选择日期"
 
+              value-format="yyyy-MM-dd"   ></el-date-picker>
 
+            </template>
 
           </el-table-column>
 
           </el-table-column>
 
           <el-table-column v-if='deptBudgetList.purpose=="库点费用"' prop="date" label="日期">
 
           <el-table-column v-if='deptBudgetList.purpose=="库点费用"' prop="date" label="日期">
 
             <template slot-scope="scope">
 
             <template slot-scope="scope">
 
@@ -122,7 +141,7 @@
 
               value-format="yyyy-MM-dd"   ></el-date-picker>
 
               value-format="yyyy-MM-dd"   ></el-date-picker>
 
             </template>
 
             </template>
 
           </el-table-column>
 
           </el-table-column>
 
-          <el-table-column v-if='deptBudgetList.purpose=="库点费用"' prop="date" label="货源">
 
+          <el-table-column v-if='deptBudgetList.purpose=="库点费用"||deptBudgetList.purpose=="合同费用"' prop="date" label="货源">
 
               <template slot-scope="scope">
 
               <template slot-scope="scope">
 
                 <!-- {{scope.row.goodsourcelist}} -->
 
                 <!-- {{scope.row.goodsourcelist}} -->
 
                 <el-select v-model="scope.row.orderId" placeholder="选择货源" @change="((value)=>{selectgoodsSource(value, scope.row,scope.$index)})">
 
                 <el-select v-model="scope.row.orderId" placeholder="选择货源" @change="((value)=>{selectgoodsSource(value, scope.row,scope.$index)})">
 
@@ -163,7 +182,7 @@
 
 </template>
 
 </template>
 
 <script>
 
 <script>
 
   import WsUpload from '@/components/WsUpload'
 
   import WsUpload from '@/components/WsUpload'
 
-  import {setexpense,getcontract,getwarehouse,addexenseinfo,getwarehousingorder,getexpensecount} from '@/model/profitable/index'
 
+  import {setexpense,getcontract,getwarehouse,addexenseinfo,getwarehousingorder,getexpensecount,getpayeeinfo} from '@/model/profitable/index'
 
   export default {
 
   export default {
 
     components: {
 
     components: {
 
       WsUpload,
 
       WsUpload,
 
@@ -304,7 +323,7 @@
 
       selectware(e,index){
 
       selectware(e,index){
 
         var arr=[]
 
         var arr=[]
 
         this.datelist=[]
 
         this.datelist=[]
 
-        getwarehousingorder({contractNo:this.deptBudgetList.contractNo,warehouseName:e}).toPromise()
 
+        getwarehousingorder({contractNo:this.deptBudgetList.contractNo,warehouseName:this.feeDetailsDistributions[index].warehouseName,receiptDocDate:this.feeDetailsDistributions[index].receiptDocDate}).toPromise()
 
           .then(response => {
 
           .then(response => {
 
             for (let i = 0; i < response.length; i++) {
 
             for (let i = 0; i < response.length; i++) {
 
               response[i].issuingDate=response[i].issuingTime.split(' ')[0]
 
               response[i].issuingDate=response[i].issuingTime.split(' ')[0]
 
@@ -401,6 +420,16 @@
 
           if(this.contractList[i].contractNo==e){
 
           if(this.contractList[i].contractNo==e){
 
             this.deptBudgetList.contractId=this.contractList[i].id
 
             this.deptBudgetList.contractId=this.contractList[i].id
 
             this.signingDate=this.contractList[i].signingDate
 
             this.signingDate=this.contractList[i].signingDate
 
+            getpayeeinfo({compId:localStorage.getItem('ws-pf_compId'),contractNo:e}).toPromise()
 
+              .then((response1) => {
 
+                this.deptBudgetList.payee=response1.customerType=="企业客户"?response1.compName:response1.customerName
 
+                this.deptBudgetList.accountNumber=response1.bankCard
 
+                this.deptBudgetList.bank=response1.bankDeposit
 
+                this.deptBudgetList.bankBranch=response1.bankDepositBranch
 
+                this.$forceUpdate()
 
+                // this.payeeinfo=response1
 
+                // console.log(this.payeeinfo)
 
+              })
 
             // this.disabledDate()
 
             // this.disabledDate()
 
           }
 
           }
 
         }
 
         }

+ 13 - 0
src/views/profitable/cashoutaduit.vue
Ver arquivo 

@@ -57,6 +57,19 @@
 
           </div>
 
           </div>
 
           <div v-else>暂无附件</div>
 
           <div v-else>暂无附件</div>
 
         </el-form-item>
 
         </el-form-item>
 
+        <div style='margin:20px -30px;font-weight:bold'>收款账户信息</div>
 
+        <el-form-item label-width='100px' label="收款方" span="1" prop="payee">
 
+            <el-input disabled class='input50 input_css' placeholder="输入收款方" v-model="deptBudgetList.payee"></el-input>
 
+          </el-form-item>
 
+          <el-form-item label-width='100px' label="账号" span="1" prop="accountNumber">
 
+            <el-input disabled class='input50 input_css' placeholder="输入账号" v-model="deptBudgetList.accountNumber"></el-input>
 
+          </el-form-item>
 
+          <el-form-item label-width='100px' label="开户行" span="1" prop="bank">
 
+            <el-input disabled class='input50 input_css' placeholder="输入开户行" v-model="deptBudgetList.bank"></el-input>
 
+          </el-form-item>
 
+          <el-form-item label-width='100px' label="开户支行" span="1" prop="bankBranch">
 
+            <el-input disabled class='input50 input_css' placeholder="输入开户支行" v-model="deptBudgetList.bankBranch"></el-input>
 
+          </el-form-item>
 
         </el-form>
 
         </el-form>
 
         <!-- <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
 
         <!-- <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
 
           <div style='margin-bottom:20px;display:flex;justify-content: space-between;'>
 
           <div style='margin-bottom:20px;display:flex;justify-content: space-between;'>

+ 13 - 0
src/views/profitable/cashoutaduitNQ.vue
Ver arquivo 

@@ -50,6 +50,19 @@
 
         @onChange="onChange" 
         @onChange="onChange" 
        />
 
        />
 
         </el-form-item>
 
         </el-form-item>
 
+        <div style='margin:20px -30px;font-weight:bold'>收款账户信息</div>
 
+        <el-form-item label-width='100px' label="收款方" span="1" prop="payee">
 
+            <el-input disabled class='input50 input_css' placeholder="输入收款方" v-model="deptBudgetList.payee"></el-input>
 
+          </el-form-item>
 
+          <el-form-item label-width='100px' label="账号" span="1" prop="accountNumber">
 
+            <el-input disabled class='input50 input_css' placeholder="输入账号" v-model="deptBudgetList.accountNumber"></el-input>
 
+          </el-form-item>
 
+          <el-form-item label-width='100px' label="开户行" span="1" prop="bank">
 
+            <el-input disabled class='input50 input_css' placeholder="输入开户行" v-model="deptBudgetList.bank"></el-input>
 
+          </el-form-item>
 
+          <el-form-item label-width='100px' label="开户支行" span="1" prop="bankBranch">
 
+            <el-input disabled class='input50 input_css' placeholder="输入开户支行" v-model="deptBudgetList.bankBranch"></el-input>
 
+          </el-form-item>
 
         </el-form>
 
         </el-form>
 
         <!-- 经营性费用不分配 -->
 
         <!-- 经营性费用不分配 -->
 
         <div v-if='deptBudgetList.expensesPurpose!=5'>
 
         <div v-if='deptBudgetList.expensesPurpose!=5'>

+ 13 - 0
src/views/profitable/cashoutedit.vue
Ver arquivo 

@@ -61,6 +61,19 @@
 
         @onChange="onChange" 
         @onChange="onChange" 
        />
 
        />
 
         </el-form-item>
 
         </el-form-item>
 
+        <div style='margin:20px -30px;font-weight:bold'>收款账户信息</div>
 
+        <el-form-item label-width='100px' label="收款方" span="1" prop="payee">
 
+            <el-input class='input50 input_css' placeholder="输入收款方" v-model="deptBudgetList.payee"></el-input>
 
+          </el-form-item>
 
+          <el-form-item label-width='100px' label="账号" span="1" prop="accountNumber">
 
+            <el-input class='input50 input_css' placeholder="输入账号" v-model="deptBudgetList.accountNumber"></el-input>
 
+          </el-form-item>
 
+          <el-form-item label-width='100px' label="开户行" span="1" prop="bank">
 
+            <el-input class='input50 input_css' placeholder="输入开户行" v-model="deptBudgetList.bank"></el-input>
 
+          </el-form-item>
 
+          <el-form-item label-width='100px' label="开户支行" span="1" prop="bankBranch">
 
+            <el-input class='input50 input_css' placeholder="输入开户支行" v-model="deptBudgetList.bankBranch"></el-input>
 
+          </el-form-item>
 
         </el-form>
 
         </el-form>
 
        <div style='text-align:right;margin-right:30px;'>
 
        <div style='text-align:right;margin-right:30px;'>
 
         <el-button class="bg-bottom" type="primary" size="small" @click="submit()">提交
 
         <el-button class="bg-bottom" type="primary" size="small" @click="submit()">提交

+ 13 - 0
src/views/profitable/expenseallotaduit.vue
Ver arquivo 

@@ -58,6 +58,19 @@
 
        />
 
        />
 
           </div>
 
           </div>
 
         </el-form-item>
 
         </el-form-item>
 
+        <div style='margin:20px -30px;font-weight:bold'>收款账户信息</div>
 
+            <el-form-item label-width='100px' label="收款方" span="1" prop="payee">
 
+              <el-input disabled class='input50 input_css' placeholder="输入收款方" v-model="deptBudgetList.payee"></el-input>
 
+            </el-form-item>
 
+            <el-form-item label-width='100px' label="账号" span="1" prop="accountNumber">
 
+              <el-input disabled class='input50 input_css' placeholder="输入账号" v-model="deptBudgetList.accountNumber"></el-input>
 
+            </el-form-item>
 
+            <el-form-item label-width='100px' label="开户行" span="1" prop="bank">
 
+              <el-input disabled class='input50 input_css' placeholder="输入开户行" v-model="deptBudgetList.bank"></el-input>
 
+            </el-form-item>
 
+            <el-form-item label-width='100px' label="开户支行" span="1" prop="bankBranch">
 
+              <el-input disabled class='input50 input_css' placeholder="输入开户支行" v-model="deptBudgetList.bankBranch"></el-input>
 
+            </el-form-item>
 
         </el-form>
 
         </el-form>
 
         <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
 
         <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
 
           <div style='margin-bottom:20px;display:flex;justify-content: space-between;'>
 
           <div style='margin-bottom:20px;display:flex;justify-content: space-between;'>

+ 13 - 0
src/views/profitable/expensemanagentedit.vue
Ver arquivo 

@@ -66,6 +66,19 @@
 
           <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"
 
           <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"
 
        />
 
        />
 
         </el-form-item>
 
         </el-form-item>
 
+        <div style='margin:20px -30px;font-weight:bold'>收款账户信息</div>
 
+            <el-form-item label-width='100px' label="收款方" span="1" prop="payee">
 
+              <el-input disabled class='input50 input_css' placeholder="输入收款方" v-model="deptBudgetList.payee"></el-input>
 
+            </el-form-item>
 
+            <el-form-item label-width='100px' label="账号" span="1" prop="accountNumber">
 
+              <el-input disabled class='input50 input_css' placeholder="输入账号" v-model="deptBudgetList.accountNumber"></el-input>
 
+            </el-form-item>
 
+            <el-form-item label-width='100px' label="开户行" span="1" prop="bank">
 
+              <el-input disabled class='input50 input_css' placeholder="输入开户行" v-model="deptBudgetList.bank"></el-input>
 
+            </el-form-item>
 
+            <el-form-item label-width='100px' label="开户支行" span="1" prop="bankBranch">
 
+              <el-input disabled class='input50 input_css' placeholder="输入开户支行" v-model="deptBudgetList.bankBranch"></el-input>
 
+            </el-form-item>
 
         </el-form>
 
         </el-form>
 
         <div v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"||deptBudgetList.expensesPurpose==2' class='expensetitle'>费用分配</div>
 
         <div v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"||deptBudgetList.expensesPurpose==2' class='expensetitle'>费用分配</div>
 
         <div v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"||deptBudgetList.expensesPurpose==2' style='margin:0  auto 10px;width:90%;'>
 
         <div v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"||deptBudgetList.expensesPurpose==2' style='margin:0  auto 10px;width:90%;'>

+ 11 - 11
src/views/profitable/expensemanagentlook.vue
Ver arquivo 

@@ -56,21 +56,21 @@
 
           <div v-else>暂无附件</div>
 
           <div v-else>暂无附件</div>
 
         </el-form-item>
 
         </el-form-item>
 
         </el-form>
 
         </el-form>
 
-        <el-form v-if='roleName=="出纳"' label-position="left">
 
-               <div v-if="payeeinfo" style='margin:0 0 10px;width:90%;'>账户信息</div>
 
-            <el-form-item  label-width='100px' label="收款方" span="1" prop="purpose" class="readonly">
 
-            {{payeeinfo.customerType=="企业客户"?payeeinfo.compName:payeeinfo.customerName}}
 
+        <el-form label-position="left">
 
+            <div style='margin:20px -30px;font-weight:bold'>收款账户信息</div>
 
+            <el-form-item label-width='100px' label="收款方" span="1" prop="payee">
 
+              <el-input disabled class='input50 input_css' placeholder="输入收款方" v-model="deptBudgetList.payee"></el-input>
 
             </el-form-item>
 
             </el-form-item>
 
-            <el-form-item  label-width='100px' label="账号" span="1" prop="purpose" class="readonly">
 
-            {{payeeinfo.bankCard}}
 
+            <el-form-item label-width='100px' label="账号" span="1" prop="accountNumber">
 
+              <el-input disabled class='input50 input_css' placeholder="输入账号" v-model="deptBudgetList.accountNumber"></el-input>
 
             </el-form-item>
 
             </el-form-item>
 
-            <el-form-item  label-width='100px' label="开户行" span="1" prop="purpose" class="readonly">
 
-            {{payeeinfo.bankDeposit}}
 
+            <el-form-item label-width='100px' label="开户行" span="1" prop="bank">
 
+              <el-input disabled class='input50 input_css' placeholder="输入开户行" v-model="deptBudgetList.bank"></el-input>
 
             </el-form-item>
 
             </el-form-item>
 
-            <el-form-item  label-width='100px' label="开户支行" span="1" prop="purpose" class="readonly">
 
-            {{payeeinfo.bankDepositBranch}}
 
+            <el-form-item label-width='100px' label="开户支行" span="1" prop="bankBranch">
 
+              <el-input disabled class='input50 input_css' placeholder="输入开户支行" v-model="deptBudgetList.bankBranch"></el-input>
 
             </el-form-item>
 
             </el-form-item>
 
-             </el-form>
 
+          </el-form>
 
         </div>
 
         </div>
 
         <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
 
         <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
 
           <div style='margin-bottom:20px;'>费用分配</div>
 
           <div style='margin-bottom:20px;'>费用分配</div>