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

public/static/inspection.html

@@ -171,13 +171,13 @@
             <div>{{tableData.qualityDate}}</div>
           </div>
           <div class="bottom-row2">
-            <div class="left">
+            <!-- <div class="left">
               <img src="../img/add.png" alt="">
-            </div>
+            </div> -->
             <div class="config">收货单位签名或盖章</div>
             <div class="">客户签名</div>
           </div>
-          <div class="bottom-row3">扫一扫</div>
+          <!-- <div class="bottom-row3">扫一扫</div> -->
         </div>
       </div>
       <div class="small-content" v-if="smallContent">
@@ -323,6 +323,7 @@
         console.log(_data)
         this.tableData = JSON.parse(_data)
         console.log(this.tableData)
+        document.title="粮食质检单"
         window.print()
         window.onafterprint = function(event) {
           window.history.back(-1)

public/static/payprint.html

@@ -13,7 +13,7 @@
       }
 
       #app {
-        height: 98vh;
+        height: 88vh;
         position: relative;
       }
 
@@ -22,7 +22,7 @@
         /* height: 583px; */
         margin: auto;
         position: absolute;
-        top: 0;
+        top: -5vh;
         bottom: 0;
         left: 0;
         right: 0;
@@ -271,13 +271,13 @@
               <div>复点：{{printData.qualityInspector}}</div>
             </div>
             <div class="bottom-row2">
-              <div class="left">
+              <!-- <div class="left">
                 <img src="../../../../public/img/add.png" alt="" />
-              </div>
+              </div> -->
               <div class="config">收货单位签名或盖章</div>
               <div class="">客户签名</div>
             </div>
-            <div class="bottom-row3">扫一扫</div>
+            <!-- <div class="bottom-row3">扫一扫</div> -->
           </div>
         </div>
       </div>
@@ -513,6 +513,7 @@
         // console.log(_data)
         this.printData = JSON.parse(_data)
         // console.log(this.tableData)
+        document.title="中天昊元粮食贸易有限公司结算凭证"
         window.print()
         window.onafterprint = function(event) {
           window.history.back(-1)

public/static/print.html

@@ -101,6 +101,7 @@
          this.name = decodeURIComponent(this.getQueryVariable("name"))
         console.log(_data)
         this.tableData = JSON.parse(_data)
+        document.title = this.name+'价格对照表（按水分）'
         window.print()
         window.onafterprint = function(event) {
           window.history.back(-1)

public/static/weightCheck.html

@@ -190,13 +190,13 @@
             <!-- <div>{{tableData.qualityDate}}</div> -->
           </div>
           <div class="bottom-row2">
-            <div class="left">
+            <!-- <div class="left">
               <img src="../img/add.png" alt="">
-            </div>
+            </div> -->
             <div class="config">收货单位签名或盖章：</div>
             <div class="autograph">客户签名：</div>
           </div>
-          <div class="bottom-row3">扫一扫</div>
+          <!-- <div class="bottom-row3">扫一扫</div> -->
         </div>
       </div>
       <div class="small-content" v-if="smallContent">
@@ -325,6 +325,7 @@
         console.log(_data,"sddsd")
         this.tableData = JSON.parse(_data)
         console.log(this.tableData)
+        document.title = "粮食检斤单"
         window.print()
         window.onafterprint = function(event) {
           window.history.back(-1)

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -9,7 +9,7 @@
           <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
           </el-option>
         </el-select>
-        <el-checkbox v-model="checked" @change="allowEdit">允许手动编辑重量</el-checkbox>
+        <el-checkbox v-model="checked" @change="allowEdit" :disabled="tableData.length==0">允许手动编辑重量</el-checkbox>
       </div>
       </template>
     </BaseHeaderLayout>

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -273,6 +273,7 @@
             }
           }
         })
+        this.isCountShow = true
       switch (this.$route.query.type) {
         case "新增":
           this.submitName = "提交"
@@ -340,7 +341,7 @@
           }]
           break;
         case "编辑":
-          // this.isEdit = false;
+          this.isEdit = true;
           this.submitName = "提交"
           this.getData()
           break;
@@ -618,7 +619,7 @@
       //打印
       print() {
         localStorage.setItem('pricePrintList', JSON.stringify(this.baseInfoForm.detailPrints));
-        window.location.href = "../../../static/print.html?name=" + this.baseInfoForm.goodsName
+        window.open("../../../static/print.html?name=" + this.baseInfoForm.goodsName)
       },
       validate() {
         let that = this
@@ -870,7 +871,7 @@
         this.tableData = _list
       },
       // 获取分界价格数据，构造分界价格区间数据
-      getSplitPrice() {
+      getSplitPrice() {debugger
         let _priceList = this.priceList
         for (let i = 0; i < _priceList.length; i++) {
           for (let k = 0; k < _priceList[i].checkList.length; k++) {
@@ -947,7 +948,7 @@
         return _leftTotalPrice + _rightTotalPrice
       },
       // 计算价格
-      calculatePrice(_waterMin) {
+      calculatePrice(_waterMin) {debugger
         let prcieList = []
         let totalPrice = []
         let _price = 0

src/views/houseSelfCollect/component/inspectInfoPrint.vue

@@ -54,13 +54,13 @@
         <div>{{ printData.qualityDate }}</div>
       </div>
       <div class="bottom-row2">
-        <div class="left">
+        <!-- <div class="left">
           <img src="../../../../public/img/add.png" alt="" />
-        </div>
+        </div> -->
         <div class="config">收货单位签名或盖章：</div>
         <div class="">客户签名：</div>
       </div>
-      <div class="bottom-row3">扫一扫</div>
+      <!-- <div class="bottom-row3">扫一扫</div> -->
     </div>
   </div>
 </template>

src/views/houseSelfCollect/component/paymentPrint.vue

@@ -125,13 +125,13 @@
         <div>复点：{{ printData.qualityInspector}}</div>
       </div>
       <div class="bottom-row2">
-        <div class="left">
+        <!-- <div class="left">
           <img src="../../../../public/img/add.png" alt="" />
-        </div>
+        </div> -->
         <div class="config">收货单位签名或盖章</div>
         <div class="">客户签名</div>
       </div>
-      <div class="bottom-row3">扫一扫</div>
+      <!-- <div class="bottom-row3">扫一扫</div> -->
       <!-- <div class="bottom-row4">
         <el-button type="primary">关闭</el-button> 
          <el-button type="primary" @click="printSmall">打印小票</el-button> 
@@ -167,14 +167,10 @@
         return datas
       },
       printSmall() {
-        window.location.href =
-          '../../../../../static/payprint.html?type=1&dataList=' +
-          JSON.stringify(this.printData)
+        window.open('../../../../../static/payprint.html?type=1&dataList=' +JSON.stringify(this.printData))
       },
       printBig() {
-        window.location.href =
-          '../../../../../static/payprint.html?type=2&dataList=' +
-          JSON.stringify(this.printData)
+         window.open('../../../../../static/payprint.html?type=2&dataList=' +JSON.stringify(this.printData))
       },
     },
   }

src/views/houseSelfCollect/component/weightCheckPrint.vue

@@ -70,13 +70,13 @@
             <!-- <div>{{tableData.qualityDate}}</div> -->
           </div>
           <div class="bottom-row2">
-            <div class="left">
+            <!-- <div class="left">
               <img src="../../../../public/img/add.png" alt="" />
-            </div>
+            </div> -->
             <div class="config">收货单位签名或盖章：</div>
             <div class="autograph">客户签名：</div>
           </div>
-          <div class="bottom-row3">扫一扫</div>
+          <!-- <div class="bottom-row3">扫一扫</div> -->
            <!-- <div class="bottom-row4">
          <el-button type="primary">关闭</el-button>
         <el-button type="primary" @click="printSmall">打印小票</el-button>

src/views/houseSelfCollect/inspectInfo.vue

@@ -211,14 +211,10 @@
     },
     methods: {
       printSmall() {
-        window.location.href =
-          '../../../static/inspection.html?type=1&dataList=' +
-          JSON.stringify(this.inspect)
+        window.open('../../../static/inspection.html?type=1&dataList=' +JSON.stringify(this.inspect))
       },
       printBig() {
-        window.location.href =
-          '../../../static/inspection.html?type=2&dataList=' +
-          JSON.stringify(this.inspect)
+        window.open('../../../static/inspection.html?type=2&dataList=' +JSON.stringify(this.inspect)) 
       },
       getdate() {
         var date = new Date()

src/views/houseSelfCollect/inspectionManagement.vue

@@ -154,14 +154,10 @@ export default {
   },
   methods: {
     printSmall() {
-        window.location.href =
-          '../../../static/inspection.html?type=1&dataList=' +
-          JSON.stringify(this.printData)
+      window.open('../../../static/inspection.html?type=1&dataList=' +JSON.stringify(this.printData))
       },
       printBig() {
-        window.location.href =
-          '../../../static/inspection.html?type=2&dataList=' +
-          JSON.stringify(this.printData)
+         window.open('../../../static/inspection.html?type=2&dataList=' +JSON.stringify(this.printData))
       },
      closePrint(){
         this.isShowPrint = false

src/views/houseSelfCollect/paymentManagement.vue

@@ -70,7 +70,7 @@
       <el-table-column
         class="table_td"
         prop="paymentNo"
-        width="120"
+        width="150"
         label="编号"
       ></el-table-column>
       <el-table-column
@@ -90,32 +90,32 @@
       ></el-table-column>
       <el-table-column
         class="table_td"
-        width="180"
+        width="80"
         prop="type"
         label="类型"
       ></el-table-column>
       <el-table-column
         class="table_td"
         prop="tidalGrainPrice"
-        width="180"
+        width="140"
         label="净重单价（元/公斤）"
       ></el-table-column>
       <el-table-column
         class="table_td"
         prop="solidGrainPrice"
-        width="180"
+        width="140"
         label="纯重单价（元/公斤）"
       ></el-table-column>
       <el-table-column
         class="table_td"
         prop="netWeight"
-        width="140"
+        width="120"
         label="净重（公斤）"
       ></el-table-column>
       <el-table-column
         class="table_td"
         prop="pureWeight"
-        width="140"
+        width="120"
         label="纯重（公斤）"
       ></el-table-column>
       <el-table-column
@@ -286,7 +286,6 @@ export default {
     })
       .toPromise()
       .then((response) => {
-        this.warehouseList = response
         this.warehouseList = response
         this.warehouseNameKey = this.warehouseList[0].id
         this.warehouseName = this.warehouseList[0].warehouseName
@@ -299,14 +298,12 @@ export default {
       this.imageUrl = e.url
     },
     printSmall() {
-      window.location.href =
-        '../../../../../static/payprint.html?type=1&dataList=' +
-        JSON.stringify(this.printData)
+      window.open('../../../../../static/payprint.html?type=1&dataList=' +JSON.stringify(this.printData))
+        
     },
     printBig() {
-      window.location.href =
-        '../../../../../static/payprint.html?type=2&dataList=' +
-        JSON.stringify(this.printData)
+      window.open('../../../../../static/payprint.html?type=2&dataList=' +JSON.stringify(this.printData),"结算凭证")
+        
     },
     getList() {
       getpayment({
@@ -361,6 +358,7 @@ export default {
           data = this.warehouseList[i]
         }
       }
+      debugger
       for (let i = 0; i < data.purchasePriceList.length; i++) {
         if (data.purchasePriceList[i].goodsName == row.goodsName) {
           data1 = data.purchasePriceList[i]

src/views/houseSelfCollect/settlement.vue

@@ -459,14 +459,10 @@ export default {
 
     },
     printSmall() {
-        window.location.href =
-          '../../../../../static/payprint.html?type=1&dataList=' +
-          JSON.stringify(this.printData)
+      window.open('../../../../../static/payprint.html?type=1&dataList=' +JSON.stringify(this.printData))
       },
       printBig() {
-        window.location.href =
-          '../../../../../static/payprint.html?type=2&dataList=' +
-          JSON.stringify(this.printData)
+        window.open('../../../../../static/payprint.html?type=2&dataList=' +JSON.stringify(this.printData))
       },
     getList(){
       getpaymentexamine({id:this.$route.query.id}).toPromise().then((response) => {
@@ -484,13 +480,13 @@ export default {
           }
           if(this.paymentList.type =='潮粮'){
             this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.tidalGrainPrice*this.paymentList.weighingManagement.netWeight
-            this.paymentList.calculationPayable =  this.paymentList.grainMoney
+            this.paymentList.calculationPayable =  this.paymentList.grainMoney.toFixed(2)
               this.paymentList.actualPayment = this.paymentList.calculationPayable
               this.actualPayment( this.paymentList.actualPayment)
           }else{
             // this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.solidGrainPrice*this.paymentList.weighingManagement.netWeight
              this.paymentList.grainMoney = this.paymentList.qualityInspectionManagement.dryGrainPrice * this.paymentList.weighingManagement.netWeight
-              this.paymentList.calculationPayable =  this.paymentList.grainMoney
+              this.paymentList.calculationPayable =  this.paymentList.grainMoney.toFixed(2)
                 this.paymentList.actualPayment = this.paymentList.calculationPayable
                 this.actualPayment( this.paymentList.actualPayment)
           }
@@ -695,7 +691,7 @@ export default {
           })
           return
         }
-        if (this.paymentList.remarks.length > 20) {
+        if (this.paymentList.remarks&&this.paymentList.remarks.length > 20) {
           this.$message({
             message: '记事字数应在0-20个字',
             type: 'warning',

src/views/houseSelfCollect/weighingManagement.vue

@@ -172,14 +172,10 @@ export default {
   },
   methods: {
      printSmall() {
-      window.location.href =
-        '../../../../static/weightCheck.html?type=1&tableData=' +
-        JSON.stringify(this.dialogData)
+       window.open('../../../../static/weightCheck.html?type=1&tableData=' +JSON.stringify(this.dialogData))
     },
     printBig() {
-      window.location.href =
-        '../../../../static/weightCheck.html?type=2&tableData=' +
-        JSON.stringify(this.dialogData)
+      window.open( '../../../../static/weightCheck.html?type=2&tableData=' +JSON.stringify(this.dialogData))
     },
     print(row) {
        getPrint({

src/views/houseSelfCollect/weightCheck.vue

@@ -247,14 +247,10 @@ export default {
       }
     },
     printSmall() {
-      window.location.href =
-        '../../../../static/weightCheck.html?type=1&tableData=' +
-        JSON.stringify(this.inspect)
+      window.open('../../../../static/weightCheck.html?type=1&tableData=' +JSON.stringify(this.inspect))
     },
     printBig() {
-      window.location.href =
-        '../../../../static/weightCheck.html?type=2&tableData=' +
-        JSON.stringify(this.inspect)
+      window.open( '../../../../static/weightCheck.html?type=2&tableData=' +JSON.stringify(this.inspect))
     },
     closeDialog() {
       html2canvas(this.$refs.saveImg.$el).then((canvas) => {

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -72,14 +72,14 @@
           >
             <el-option
               v-if="item.reportStatus"
-              v-for="item in options"
+              v-for="item in option"
               :key="item.constKey"
               :label="item.contractNo + '(' + item.reportStatus + ')'"
               :value="item.contractNo"
             />
             <el-option
               v-if="!item.reportStatus"
-              v-for="item in options"
+              v-for="item in option"
               :key="item.constKey"
               :label="item.contractNo"
               :value="item.contractNo"
@@ -90,32 +90,55 @@
       <div v-if="contractNo != ''">
         <span v-if="orderList.goodsName">货名: {{ orderList.goodsName }}</span>
         <span v-else>货名:——</span>
-        <span v-if="orderList.transactionsNumber"
-          >合同重量: {{ orderList.transactionsNumber }} 吨</span
+        
+        <span v-if="orderList.weight"
+          >合同重量: {{ orderList.weight }} 吨</span
         >
         <span v-else>合同重量: 0 吨</span>
-        <span v-if="orderList.stockInQuantity"
-          >入库量: {{ orderList.stockInQuantity }} 吨</span
+
+        <span v-if="warehouseList.settlementWeight"
+          >入库量: {{ warehouseList.settlementWeight }} 吨</span
         >
         <span v-else>入库量: 0 吨</span>
-        <span v-if="orderList.contractPrice"
-          >合同单价: {{ orderList.contractPrice }} 元/吨</span
+
+        <span v-if="orderList.unitContractPrice"
+          >合同单价: {{ orderList.unitContractPrice }} 元/吨</span
         >
         <span v-else>合同单价: 0 元/吨</span>
-        <span v-if="orderList.amountIngPayable"
-          >应付: {{ orderList.amountIngPayable }} 元</span
+
+        <span v-if="payingMoney"
+          >应付: {{ payingMoney }} 元</span
         >
         <span v-else>应付: 0 元</span>
-        <span v-if="orderList.amountEdPayable"
-          >已付: {{ orderList.amountEdPayable }} 元</span
+
+        <span v-if="payedMoney"
+          >已付: {{ payedMoney }} 元</span
         >
         <span v-else>已付: 0 元</span>
+
+        <span v-if="payNotMoney"
+          >未付: {{ payNotMoney }} 元</span
+        >
+        <span v-else>未付: 0 元</span>
+
         <span v-if="orderList.deposit"
-          >定金: {{ orderList.deposit }} 元 {{ orderList.depositUrl }}</span
+          >定金: {{ orderList.deposit }} 元 
+          <!-- {{ orderList.depositUrl }} -->
+           <img
+            width="18"
+            height="20"
+            style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png"
+            @click="fujian()"
+            alt=""
+          />
+          <!-- <span v-if="addressUrlArray.length > 0">{{
+            addressUrlArray.length
+          }}</span> -->
+          </span
         >
         <span v-else>定金: 0 元</span>
       </div>
-
       <el-table
         class="wenzi"
         :data="warehouseList.records"
@@ -252,6 +275,15 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="deptBudgetTotal"
       ></el-pagination>
+      <WinseaContentModal
+      v-model="accessoryTFs"
+      :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose"
+    >
+      <div v-for="(item,index) in addressUrlArray" :key="index">
+      <img width="100" height="100" :src="item" alt="">
+      </div>
+    </WinseaContentModal>
     </el-scrollbar>
     <el-dialog
       width="25%"
@@ -420,7 +452,7 @@ export default {
       showType: true,
       // 年
       year: '',
-      options: [],
+      option: [],
       pickerOptions: {},
       value2: '',
       deptBudgetTotal: 0,
@@ -447,15 +479,16 @@ export default {
       orderList: {},
       deptBudgetList: {},
       id: '',
-      //settlementWeightchange: false,
       pcFlag: 1,
       deposit: '0',
       stockPurchaseInfo: {
         id: '',
         settlementWeight: '',
       },
+      payingMoney:'',
+      payedMoney:'',
+      payNotMoney:'',
       settlementWeight: '',
-      // carryoverlist: {},
       modification: [],
       contractManagementInfoList: {},
       contractManagementInfo: {
@@ -466,7 +499,7 @@ export default {
         id: '',
       },
       remark:'',
-      depositUrls: [],
+      // depositUrls: [],
       roleFlag: 1,
       money: '',
       paymentDate: '',
@@ -479,7 +512,9 @@ export default {
         paymentDate: '',
         paymentScreenshot: '',
         id: '',
+        
       },
+      addressUrlArray:[],
 
       amountNotPayable: 0,
       amountEdPayable: 0,
@@ -491,6 +526,7 @@ export default {
         },
       },
       accessoryTFs: false,
+      appendixIdss: [],
     }
   },
   activated() {
@@ -611,6 +647,18 @@ export default {
           })
       })
     },
+    //定金附件
+    fujian() {
+      debugger
+      if (this.orderList.depositUrl === null || this.orderList.depositUrl === '') {
+        EventBus.$emit(
+          'warning',
+          this.$t('system.noticeCircular.NoInformation')
+        )
+      }
+      this.appendixIdss = this.orderList.depositUrl
+      this.accessoryTFs = true
+    },
     //备注
     addRemarks() {
       this.dialogFormVisible11 = true
@@ -802,20 +850,20 @@ export default {
     dataFilter(val) {
       // console.log(val,"名")
       this.contractNo = val
-      if (val) {
-        //val存在
-        this.options = this.contractNoList.filter((item) => {
-          if (
-            !!~item.contractNo.indexOf(val) ||
-            !!~item.contractNo.toUpperCase().indexOf(val.toUpperCase())
-          ) {
-            return true
-          }
-        })
-      } else {
-        //val为空时，还原数组
-        this.options = this.contractNoList
-      }
+      // if (val) {
+      //   //val存在
+      //   this.options = this.contractNoList.filter((item) => {
+      //     if (
+      //       !!~item.contractNo.indexOf(val) ||
+      //       !!~item.contractNo.toUpperCase().indexOf(val.toUpperCase())
+      //     ) {
+      //       return true
+      //     }
+      //   })
+      // } else {
+      //   //val为空时，还原数组
+      //   this.options = this.contractNoList
+      // }
     },
     handlepass() {
       var that = this
@@ -839,6 +887,17 @@ export default {
       this.getList()
     },
     contractchange(e) {
+        for (var i = 0; i < this.contractNoList.length; i++) {
+          if (this.contractNoList[i].contractNo == e) {
+           this.orderList= this.contractNoList[i]
+           if (this.contractNoList[i].depositUrl ) {
+             this.addressUrlArray = this.contractNoList[i].depositUrl.split(',')
+            } else {
+              this.addressUrlArray = []
+            }
+          }
+        }
+        console.log(this.addressUrlArray,'tyis')
       this.contractNo = e
       this.getList()
     },
@@ -904,8 +963,14 @@ export default {
         .toPromise()
         .then((response) => {
           // debugger
+          this.payingMoney = 0
+          this.payedMoney = 0
+          this.payNotMoney = 0
           for (var i = 0; i < response.records.length; i++) {
             response.records[i].identification = 'false'
+            this.payingMoney += response.records[i].amountIngPayable
+            this.payedMoney += response.records[i].amountEdPayable
+            this.payNotMoney += response.records[i].amountNotPayable
           }
           this.deptBudgetTotal = response.total
           this.warehouseList = response
@@ -920,7 +985,8 @@ export default {
         .toPromise()
         .then((response) => {
           this.contractNoList = response
-          this.options = this.contractNoList
+          this.option = this.contractNoList
+        
         })
     },
     handleRemove(file) {