Главная Обзор Помощь
Регистрация Вход
wangchao
/
yiliangyiyun-pc-jj
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

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

ccj 2 лет назад
Родитель
6ddb8e2758 6c53efcec5
Сommit
f153bae250
13 измененных файлов с 902 добавлено и 450 удалено
Единый вид Показать статистику Diff
  1. 122 100
      public/static/print.html
  2. 4 0
      src/views/houseSelfCollect/acquisitionManagement.vue
  3. 633 331
      src/views/houseSelfCollect/acquisitionManagementAdd.vue
  4. 29 3
      src/views/houseSelfCollect/inspectionManagementNew.vue
  5. 5 0
      src/views/outboundManagement/weighingManagementNew.vue
  6. 33 4
      src/views/profitable/cashout.vue
  7. 13 0
      src/views/profitable/cashoutaduit.vue
  8. 13 0
      src/views/profitable/cashoutaduitNQ.vue
  9. 13 0
      src/views/profitable/cashoutedit.vue
  10. 13 0
      src/views/profitable/expenseallotaduit.vue
  11. 13 0
      src/views/profitable/expensemanagentedit.vue
  12. 11 11
      src/views/profitable/expensemanagentlook.vue
  13. 0 1
      src/views/warehousenew/warehousingOrder.vue

+ 122 - 100
public/static/print.html
Просмотреть файл 

@@ -150,117 +150,135 @@
 
 
 
   <body>
 
   <body>
 
     <div id="app">
 
     <div id="app">
 
-      <div class="content" :class="'content'+index" v-for="(item,index) in 4">
 
+      <div class="content"  v-if="type == 1"><!--容重打印-->
 
         <div class="title">
 
         <div class="title">
 
-          <div class="name" v-if="index==0">一等单价 {{name}}价格对照表（按水分）</div>
 
-          <div class="name" v-if="index==1">二等单价 {{name}}价格对照表（按水分）</div>
 
-          <div class="name" v-if="index==2">三等单价 {{name}}价格对照表（按水分）</div>
 
-          <div class="name" v-if="index==3">等外单价 {{name}}价格对照表（按水分）</div>
 
+          <div class="name">{{name}}价格对照表（按容重）</div>
 
           <div class="price">价格单位：元/公斤</div>
 
           <div class="price">价格单位：元/公斤</div>
 
         </div>
 
         </div>
 
         <div class="table-row">
 
         <div class="table-row">
 
-          <el-table :data="tableData1" :row-class-name="tableRowClassName" class="tableBox">
 
-            <el-table-column prop="waterMin" label="水分" header-align="center">
 
+          <el-table :data="tableData" :row-class-name="tableRowClassName" >
 
+            <el-table-column prop="bulkDensityMax" label="容重上限" header-align="center">
 
             </el-table-column>
 
             </el-table-column>
 
-            <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
-            </el-table-column> -->
 
-            <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+            <el-table-column prop="bulkDensityMin" label="容重下限" header-align="center">
 
             </el-table-column>
 
             </el-table-column>
 
-            <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
-            </el-table-column>
 
-          </el-table>
 
-          <el-table :data="tableData2" :row-class-name="tableRowClassName" class="tableBox">
 
-            <el-table-column prop="waterMin" label="水分" header-align="center">
 
-            </el-table-column>
 
-            <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
-           </el-table-column> -->
 
-            <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+            <el-table-column prop="bulkDensityPrice" label="容重单价" header-align="center">
 
             </el-table-column>
 
             </el-table-column>
 
           </el-table>
 
           </el-table>
 
-          <el-table :data="tableData3" :row-class-name="tableRowClassName" class="tableBox">
 
-            <el-table-column prop="waterMin" label="水分" header-align="center">
 
-            </el-table-column>
 
-            <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
-           </el-table-column> -->
 
-            <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
-            </el-table-column>
 
-          </el-table>
 
-          <el-table :data="tableData4" :row-class-name="tableRowClassName" class="tableBox">
 
-            <el-table-column prop="waterMin" label="水分" header-align="center">
 
-            </el-table-column>
 
-            <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
-           </el-table-column> -->
 
-            <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
-            </el-table-column>
 
-          </el-table>
 
-          <el-table :data="tableData5" :row-class-name="tableRowClassName" class="tableBox">
 
-            <el-table-column prop="waterMin" label="水分" header-align="center">
 
-            </el-table-column>
 
-            <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
-           </el-table-column> -->
 
-            <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
-            </el-table-column>
 
-          </el-table>
 
-          <el-table :data="tableData6" :row-class-name="tableRowClassName" class="tableBox">
 
-            <el-table-column prop="waterMin" label="水分" header-align="center">
 
-            </el-table-column>
 
-            <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
+        </div>
 
+      </div>
 
+
 
+      <div v-else>
 
+        <div class="content" :class="'content'+index" v-for="(item,index) in 4" >
 
+          <div class="title">
 
+            <div class="name" v-if="index==0">一等单价 {{name}}价格对照表（按水分）</div>
 
+            <div class="name" v-if="index==1">二等单价 {{name}}价格对照表（按水分）</div>
 
+            <div class="name" v-if="index==2">三等单价 {{name}}价格对照表（按水分）</div>
 
+            <div class="name" v-if="index==3">等外单价 {{name}}价格对照表（按水分）</div>
 
+            <div class="price">价格单位：元/公斤</div>
 
+          </div>
 
+          <div class="table-row">
 
+            <el-table :data="tableData1" :row-class-name="tableRowClassName" class="tableBox">
 
+              <el-table-column prop="waterMin" label="水分" header-align="center">
 
+              </el-table-column>
 
+              <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
+              </el-table-column> -->
 
+              <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+              </el-table-column>
 
+            </el-table>
 
+            <el-table :data="tableData2" :row-class-name="tableRowClassName" class="tableBox">
 
+              <el-table-column prop="waterMin" label="水分" header-align="center">
 
+              </el-table-column>
 
+              <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
              </el-table-column> -->
 
              </el-table-column> -->
 
-            <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
-            </el-table-column>
 
-          </el-table>
 
-          <el-table :data="tableData7" :row-class-name="tableRowClassName" class="tableBox tableBox7">
 
-            <el-table-column prop="waterMin" label="水分" header-align="center">
 
-            </el-table-column>
 
-            <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
+              <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+              </el-table-column>
 
+            </el-table>
 
+            <el-table :data="tableData3" :row-class-name="tableRowClassName" class="tableBox">
 
+              <el-table-column prop="waterMin" label="水分" header-align="center">
 
+              </el-table-column>
 
+              <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
              </el-table-column> -->
 
              </el-table-column> -->
 
-            <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
-            </el-table-column>
 
-            <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
-            </el-table-column>
 
-          </el-table>
 
+              <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+              </el-table-column>
 
+            </el-table>
 
+            <el-table :data="tableData4" :row-class-name="tableRowClassName" class="tableBox">
 
+              <el-table-column prop="waterMin" label="水分" header-align="center">
 
+              </el-table-column>
 
+              <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
+             </el-table-column> -->
 
+              <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+              </el-table-column>
 
+            </el-table>
 
+            <el-table :data="tableData5" :row-class-name="tableRowClassName" class="tableBox">
 
+              <el-table-column prop="waterMin" label="水分" header-align="center">
 
+              </el-table-column>
 
+              <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
+             </el-table-column> -->
 
+              <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+              </el-table-column>
 
+            </el-table>
 
+            <el-table :data="tableData6" :row-class-name="tableRowClassName" class="tableBox">
 
+              <el-table-column prop="waterMin" label="水分" header-align="center">
 
+              </el-table-column>
 
+              <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
+               </el-table-column> -->
 
+              <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+              </el-table-column>
 
+            </el-table>
 
+            <el-table :data="tableData7" :row-class-name="tableRowClassName" class="tableBox tableBox7">
 
+              <el-table-column prop="waterMin" label="水分" header-align="center">
 
+              </el-table-column>
 
+              <!-- <el-table-column prop="waterMax" label="水分上限(%)" header-align="center">
 
+               </el-table-column> -->
 
+              <el-table-column prop="price1" label="单价" v-if="index==0" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price2" label="单价" v-if="index==1" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="price3" label="单价" v-if="index==2" header-align="center">
 
+              </el-table-column>
 
+              <el-table-column prop="priceOther" label="单价" v-if="index==3" header-align="center">
 
+              </el-table-column>
 
+            </el-table>
 
+          </div>
 
         </div>
 
         </div>
 
-
 
       </div>
 
       </div>
 
-
 
+      
     </div>
 
     </div>
 
   </body>
 
   </body>
 
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
 
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
 
@@ -279,7 +297,8 @@
 
         tableData7: [],
 
         tableData7: [],
 
         name: "",
 
         name: "",
 
         waterMin: '',
 
         waterMin: '',
 
-        waterMax: ''
 
+        waterMax: '',
 
+        type:""//1为容重打印
 
       },
 
       },
 
       computed: {},
 
       computed: {},
 
       methods: {
 
       methods: {
 
@@ -309,7 +328,10 @@
 
       mounted() {
 
       mounted() {
 
         let _data = localStorage.getItem("pricePrintList")
 
         let _data = localStorage.getItem("pricePrintList")
 
         this.name = decodeURIComponent(this.getQueryVariable("name"))
 
         this.name = decodeURIComponent(this.getQueryVariable("name"))
 
+        this.type = decodeURIComponent(this.getQueryVariable("type"))
 
+        console.log(this.type)
 
         console.log(_data)
 
         console.log(_data)
 
+        this.$forceUpdate()
 
         this.tableData = JSON.parse(_data)
 
         this.tableData = JSON.parse(_data)
 
         // 构造显示数据
 
         // 构造显示数据
 
         this.waterMin = this.tableData[0].waterMin
 
         this.waterMin = this.tableData[0].waterMin

+ 4 - 0
src/views/houseSelfCollect/acquisitionManagement.vue
Просмотреть файл 

@@ -303,7 +303,11 @@
 
               'pricePrintList',
 
               'pricePrintList',
 
               JSON.stringify(response.detailPrints)
 
               JSON.stringify(response.detailPrints)
 
             )
 
             )
 
+            if(response.bulkDensityStandard == 1){
 
+              window.open('../../../static/print.html?name=' + row.goodsName+"&type=" + 1)
 
+            }else{
 
             window.open('../../../static/print.html?name=' + row.goodsName)
 
             window.open('../../../static/print.html?name=' + row.goodsName)
 
+            }
 
           })
 
           })
 
       },
 
       },
 
       validate() {}
 
       validate() {}

Разница между файлами не показана из-за своего большого размера
+ 633 - 331
src/views/houseSelfCollect/acquisitionManagementAdd.vue


+ 29 - 3
src/views/houseSelfCollect/inspectionManagementNew.vue
Просмотреть файл 

@@ -7,7 +7,7 @@
 
         <el-button @click='warehousetypechange(3)' :type="serviceManagementType == 3 ? 'primary' : ''">收购入库</el-button>
 
         <el-button @click='warehousetypechange(3)' :type="serviceManagementType == 3 ? 'primary' : ''">收购入库</el-button>
 
       </template>
 
       </template>
 
       <template slot="right">
 
       <template slot="right">
 
-        <el-select v-model="warehouseName"  filterable placeholder="" @change="warehouseNameChange" :value="searchType"
 
+        <el-select v-model="warehouseName" filterable placeholder="" @change="warehouseNameChange" :value="searchType"
 
           style="margin: 0 10px">
 
           style="margin: 0 10px">
 
           <el-option v-for="item in warehouseList" :key="'cangku' + item.value" :label="item.value" :value="item.value"
 
           <el-option v-for="item in warehouseList" :key="'cangku' + item.value" :label="item.value" :value="item.value"
 
             style="color: #8890b1" />
 
             style="color: #8890b1" />
 
@@ -367,7 +367,7 @@
 
                 </ws-form-item>
 
                 </ws-form-item>
 
                 <!--容重(克/升)-->
 
                 <!--容重(克/升)-->
 
                 <ws-form-item :label="deptBudgetList.goodsName!='大豆'?'容重(克/升)':'蛋白'" span="1" prop="bulkDensity">
 
                 <ws-form-item :label="deptBudgetList.goodsName!='大豆'?'容重(克/升)':'蛋白'" span="1" prop="bulkDensity">
 
-                  <ws-input v-if='statusTypetext != "复检"'
 
+                  <ws-input v-if='statusTypetext != "复检"' @change="obtainPrice()"
 
                     v-model="deptBudgetList.bulkDensity" type="number" @mousewheel.native.prevent :placeholder="deptBudgetList.goodsName!='大豆'?'请输入容重':'请输入蛋白'"
 
                     v-model="deptBudgetList.bulkDensity" type="number" @mousewheel.native.prevent :placeholder="deptBudgetList.goodsName!='大豆'?'请输入容重':'请输入蛋白'"
 
                     maxlength="40" size="small" />
 
                     maxlength="40" size="small" />
 
                   <ws-input :disabled='disablednotarize' v-if='statusTypetext != "初检"'
 
                   <ws-input :disabled='disablednotarize' v-if='statusTypetext != "初检"'
 
@@ -1016,16 +1016,36 @@ export default {
 
                       this.$set(this.deptBudgetList, 'dryGrainPrice', response)
 
                       this.$set(this.deptBudgetList, 'dryGrainPrice', response)
 
                     })
 
                     })
 
                 } else {
 
                 } else {
 
+                  if(response>0){
 
                   this.deptBudgetList.dryGrainPrice = response
 
                   this.deptBudgetList.dryGrainPrice = response
 
+                  }
 
                 }
 
                 }
 
               } else {
 
               } else {
 
+                if(response>0){
 
                 this.deptBudgetList.tidalGrainPrice = response
 
                 this.deptBudgetList.tidalGrainPrice = response
 
+                  
+                }
 
               }
 
               }
 
             }
 
             }
 
           })
 
           })
 
       }
 
       }
 
       if (this.deptBudgetList.goodsName && this.deptBudgetList.customerName) { }
 
       if (this.deptBudgetList.goodsName && this.deptBudgetList.customerName) { }
 
     },
 
     },
 
+    obtainPrice(){
 
+      getinspectLookUnitPrice({
 
+          warehouseId: this.cangid,
 
+          goodsName: this.deptBudgetList.goodsName,
 
+          bulkDensity: this.deptBudgetList.bulkDensity,
 
+        })
 
+          .toPromise()
 
+          .then((response) => {
 
+            if(response){
 
+             this.deptBudgetList.dryGrainPrice = response
 
+            }
 
+
 
+          })
 
+
 
+    },
 
     opendBtn() {
 
     opendBtn() {
 
       html2canvas(this.$refs.saveImg.$el).then(canvas => {
 
       html2canvas(this.$refs.saveImg.$el).then(canvas => {
 
         let dataURL = canvas.toDataURL('image/png');
 
         let dataURL = canvas.toDataURL('image/png');
 
@@ -3368,8 +3388,14 @@ export default {
 
             // this.carstatus = true
 
             // this.carstatus = true
 
           } else {
 
           } else {
 
             this.options2 = []
 
             this.options2 = []
 
+            this.tranCarInfoList = []
 
+          }
 
+          if(this.outContractNo[i].tranCarInfoList1){
 
+            this.fleetNameList = this.outContractNo[i].tranCarInfoList1
 
+          }else{
 
+            this.fleetNameList = []
 
           }
 
           }
 
-          this.fleetNameList = this.outContractNo[i].tranCarInfoList1
 
+          
         }
 
         }
 
       }
 
       }
 
     },
 
     },

+ 5 - 0
src/views/outboundManagement/weighingManagementNew.vue
Просмотреть файл 

@@ -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
Просмотреть файл 

@@ -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
Просмотреть файл 

@@ -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
Просмотреть файл 

@@ -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
Просмотреть файл 

@@ -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
Просмотреть файл 

@@ -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
Просмотреть файл 

@@ -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
Просмотреть файл 

@@ -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>

+ 0 - 1
src/views/warehousenew/warehousingOrder.vue
Просмотреть файл 

@@ -669,7 +669,6 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
 
           this.currectfocusdata.remark=this.textarea
 
           this.currectfocusdata.remark=this.textarea
 
           this.$forceUpdate()
 
           this.$forceUpdate()
 
         }
 
         }
 
-        
       },
 
       },
 
       interestratesubmit(){
 
       interestratesubmit(){
 
         setenabledinfo({id:this.interestratevalue.id,value:this.interestratevalue.value}).toPromise()
 
         setenabledinfo({id:this.interestratevalue.id,value:this.interestratevalue.value}).toPromise()

Некоторые файлы не были показаны из-за большого количества измененных файлов