Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -84,46 +84,12 @@
         compId: '',
         accountName: '',
         tableData: [],
-        // tableData: [{
-        //   date: '2016-05-02',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1518 弄'
-        // }, {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // }, {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // }, {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }],
-        warehouseList: [],
-        // warehouseList: [{
-        //   value: '选项1',
-        //   label: '黄金糕'
-        // }, {
-        //   value: '选项2',
-        //   label: '双皮奶'
-        // }, {
-        //   value: '选项3',
-        //   label: '蚵仔煎'
-        // }, {
-        //   value: '选项4',
-        //   label: '龙须面'
-        // }, {
-        //   value: '选项5',
-        //   label: '北京烤鸭'
-        // }],
-        selectVal: ''
+        selectVal: '',
+        goodsNameList:[],
+        warehouseList:[]
       }
     },
-    activated() {
-      this.getList()
-    },
+    activated() {},
     computed() {},
     created() {
       debugger
@@ -150,8 +116,8 @@
       },
       newAcquisition(index, row, type) {
         debugger
-          let _obj = {}
-          let _query = {}
+        let _obj = {}
+        let _query = {}
         switch (type) {
           case '新增':
             _obj = this.warehouseList.find((item) => {
@@ -159,19 +125,20 @@
             });
             console.log(_obj)
             _query = {
-            warehouseId: _obj.id,
-            warehouseName: _obj.warehouseName,
-            compId: this.compId,
-            type:type
-          }
+              warehouseId: _obj.id,
+              warehouseName: _obj.warehouseName,
+              compId: this.compId,
+              type: type,
+              goodsNameList:this.goodsNameList
+            }
             break
           case '编辑':
             break
           case "查看":
-          _query = {
-            data:row,
-            type:type
-          }
+            _query = {
+              data: row,
+              type: type
+            }
             break
           default:
             break
@@ -187,10 +154,13 @@
           compId: this.compId,
           personCharge: this.accountName,
         }).toPromise().then((response) => {
+          debugger
           console.log(response)
           this.warehouseList = response
           this.selectVal = this.warehouseList[0].id
           // this.tableData = response.records
+          this.getList()
+
 
         })
       },
@@ -203,6 +173,9 @@
           compId: this.compId,
         }).toPromise().then((response) => {
           console.log(response)
+          for(let i=0;i<response.records.length;i++){
+            this.goodsNameList.push(response.records[i].goodsName)
+          }
           this.tableData = response.records
         })
       },
@@ -220,7 +193,9 @@
         this.visible = true
         console.log(index, row);
       },
-      print() {}
+      print() {
+        window.location.href="../../../static/print.html"
+      }
     },
   }
 </script>

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -14,7 +14,12 @@
         <div class="row1">
           <div class="grid-content">
             <el-form-item label="货名">
-              <el-input v-model="baseInfoForm.goodsName"></el-input>
+              <!-- <el-input v-model="baseInfoForm.goodsName"></el-input> -->
+              <el-select v-model="selectVal" placeholder="请选择" @change="goodsChange">
+                <el-option v-for="item in goodnameList" :key="item.constValue" :label="item.constValue"
+                  :value="item.constValue">
+                </el-option>
+              </el-select>
             </el-form-item>
           </div>
           <div class="grid-content">
@@ -104,7 +109,6 @@
             </div>
           </div>
         </div>
-
         <el-button class="submit" @click="submit">提交</el-button>
       </el-row>
     </el-main>
@@ -124,11 +128,13 @@
           </el-table-column>
           <el-table-column prop="price3" label="三等单价">
           </el-table-column>
-          <el-table-column prop="price4" label="等外单价">
+          <el-table-column prop="priceOther" label="等外单价">
           </el-table-column>
         </el-table>
       </div>
       <el-button class="submit" @click="closeCount">关闭</el-button>
+      <el-button class="submit" @click="print">打印</el-button>
+
     </el-main>
   </el-container>
 </template>
@@ -136,6 +142,9 @@
   import {
     purchasePriceAdd
   } from '@/model/houseSelfCollect/index'
+  import {
+    packList,
+  } from '@/model/contarct/index'
   export default {
 
     components: {
@@ -146,34 +155,36 @@
     },
     data() {
       return {
+        selectVal: "",
+        goodnameList: [],
         tableData: [{
           waterMin: '10',
           waterMax: '20',
           price1: '30',
           price2: '30',
           price3: '30',
-          price4: '30',
+          priceOther: '30',
         }, {
           waterMin: '11',
           waterMax: '20',
           price1: '30',
           price2: '30',
           price3: '30',
-          price4: '30',
+          priceOther: '30',
         }, {
           waterMin: '12',
           waterMax: '20',
           price1: '30',
           price2: '30',
           price3: '30',
-          price4: '30',
+          priceOther: '30',
         }, {
           waterMin: '13',
           waterMax: '20',
           price1: '30',
           price2: '30',
           price3: '30',
-          price4: '30',
+          priceOther: '30',
         }],
         isCountShow: true,
         priceList: [{
@@ -235,17 +246,40 @@
       }
     },
     created() {
-      debugger
+      let _goodsNameList = []
       this.baseInfoForm.warehouseId = this.$route.query.warehouseId
       this.baseInfoForm.warehouseName = this.$route.query.warehouseName
       this.baseInfoForm.compId = this.$route.query.compId
       this.type = this.$route.query.type
       console.log(this.baseInfoForm)
+      _goodsNameList = this.$route.query.goodsNameList
       this.priceList[0].detailList[0].water = this.baseInfoForm.waterMin
       this.priceList[0].detailList[2].water = this.baseInfoForm.waterBase
       this.priceList[0].detailList[4].water = this.baseInfoForm.waterMax
       switch (this.$route.query.type) {
         case "新增":
+          // 货名
+          packList({
+              constId: 'CON2'
+            })
+            .toPromise()
+            .then((response) => {
+              let _list = []
+              for (let i = 0; i < response.length; i++) {
+                let _isAll = true
+                for (let j = 0; j < _goodsNameList.length; j++) {
+                  if (response[i].constValue != _goodsNameList[j]) {
+                    if (j == _goodsNameList.length - 1 && _isAll) {
+                      _list.push(response[i])
+                    }
+                  } else {
+                    _isAll = false
+                  }
+                }
+              }
+              this.goodnameList = _list
+              this.selectVal = _list[0].constValue
+            })
           break;
         case "编辑":
           break;
@@ -256,12 +290,11 @@
           break
       }
     },
-    mounted() {
-      debugger
-
-
-    },
+    mounted() {},
     methods: {
+      goodsChange(e) {
+        console.log(e)
+      },
       changeBaseWater(val) {
         console.log('val', val)
         for (let i = 0; i < this.priceList.length; i++) {
@@ -358,6 +391,28 @@
           }
         }
       },
+      // 算价格纠正精度不准
+      accMul(arg1, arg2) {
+        var m = 0,
+          s1 = arg1.toString(),
+          s2 = arg2.toString();
+        try {
+          m += s1.split(".")[1].length
+        } catch (e) {}
+        try {
+          m += s2.split(".")[1].length
+        } catch (e) {}
+        return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m)
+      },
+      keepTwoDecimal(num) {
+        var result = parseFloat(num);
+        if (isNaN(result)) {
+          console.log('传递参数错误，请检查！');
+          return false;
+        }
+        result = Math.round(result * 100) / 100;
+        return result;
+      },
       newSetPrice() {
         let _newObj = {
           unitPrice: '',
@@ -410,10 +465,9 @@
             return false
           })
       },
-      // 提交
-      submit() {
-        debugger
-        this.isCountShow = false
+
+      //构造新增价格数据
+      makePriceDataList() {
         for (let k = 0; k < this.priceList.length; k++) {
           // 新增
           let _detailsObj = {
@@ -448,13 +502,21 @@
               _detailsObj.point += ',' + this.priceList[k].detailList[i].water
             }
           }
-
-          debugger
           this.baseInfoForm.details.push(_detailsObj)
 
         }
+      },
 
+      //打印
+      print() {
+        
+      },
+      // 提交
+      submit() {
+        this.isCountShow = false
         this.makeTableList()
+        this.makePriceDataList()
+        this.baseInfoForm.goodsName = this.selectVal
         purchasePriceAdd(this.baseInfoForm).toPromise().then((response) => {
           console.log(response)
           // this.tableData = response.records
@@ -463,6 +525,9 @@
       closeCount() {
         this.isCountShow = true
         this.splitPriceList = []
+        this.$router.push({
+          name: 'acquisitionManagement',
+        })
       },
       //处理表格数据
       makeTableList() {
@@ -480,7 +545,7 @@
         let _list = []
         let _obj = {}
         let _waterMin = parseFloat(this.baseInfoForm.waterMin)
-        let _waterMax = this.baseInfoForm.waterMax
+        let _waterMax = parseFloat(this.baseInfoForm.waterMax)
         let _count = (_waterMax - _waterMin) / 0.5 + 1
         for (let i = 0; i < _count; i++) {
           if (i == 0) {
@@ -491,7 +556,7 @@
               price1: priceList[0],
               price2: priceList[1],
               price3: priceList[2],
-              price4: priceList[3],
+              priceOther: priceList[3],
             }
           } else {
             _waterMin += 0.5
@@ -502,10 +567,11 @@
               price1: priceList[0],
               price2: priceList[1],
               price3: priceList[2],
-              price4: priceList[3],
+              priceOther: priceList[3],
             }
           }
           _list.push(_obj)
+          this.baseInfoForm.detailPrints.push(_obj)
         }
         this.tableData = _list
       },
@@ -517,7 +583,7 @@
           for (let k = 0; k < _priceList[i].checkList.length; k++) {
             let _obj = {}
             _obj.level = _priceList[i].checkList[k]
-            _obj.basicUnitPrice = _priceList[i].basicUnitPrice
+            _obj.basicUnitPrice = parseFloat(_priceList[i].basicUnitPrice)
             _obj.priceList = []
             _obj.haveSplit = false
             for (let j = 0; j < _priceList[i].detailList.length; j++) {
@@ -558,12 +624,18 @@
             .waterBase) * 0.01
           for (let k = 0; k < _list.length; k++) {
             //基准左边
+            debugger
             if (_waterMin < parseFloat(this.baseInfoForm.waterBase)) {
               if (_waterMin >= _list[k].priceStart && _waterMin < _list[k].priceEnd && !this.splitPriceList[i]
                 .haveSplit) {
-                _price = basePrice + (parseFloat(this.baseInfoForm.waterBase) - _waterMin) / 0.5 *
-                  _list[k].betweenPrice
-                prcieList.push(_price)
+                console.log(basePrice)
+                console.log(this.keepTwoDecimal(basePrice))
+                console.log(this.keepTwoDecimal(((parseFloat(this.baseInfoForm.waterBase) - _waterMin) / 0.5) * _list[k]
+                  .betweenPrice))
+                _price = basePrice + (parseFloat(this.baseInfoForm.waterBase) - _waterMin) / 0.5 * _list[k]
+                .betweenPrice;
+                console.log(_price)
+                prcieList.push(this.keepTwoDecimal(_price))
               } else if (_waterMin >= _list[k].priceStart && _waterMin < _list[k].priceEnd) {
                 // 当前段价格+其他段价格
                 let _otherPice = this.getOtherPrice(_list[k])
@@ -577,12 +649,30 @@
 
             }
             //基准值
-            else if (_waterMin = parseFloat(this.baseInfoForm.waterBase)) {
-
+            else if (_waterMin == parseFloat(this.baseInfoForm.waterBase)) {
+                   prcieList.push(this.keepTwoDecimal(basePrice))
             }
             // 基准右边
             else {
 
+            if (_waterMin > _list[k].priceStart && _waterMin <=_list[k].priceEnd && !this.splitPriceList[i]
+                .haveSplit) {
+                _price = basePrice - (parseFloat(this.baseInfoForm.waterBase) - _waterMin) / 0.5 * _list[k]
+                .betweenPrice;
+                console.log(_price)
+                prcieList.push(this.keepTwoDecimal(_price))
+              } else if (_waterMin >= _list[k].priceStart && _waterMin < _list[k].priceEnd) {
+                // 当前段价格+其他段价格
+                let _otherPice = this.getOtherPrice(_list[k])
+                let _price1 = (_list[k].priceEnd - _waterMin) / 0.5 * _list[k].betweenPrice + _otherPice;
+
+
+
+                // _price+=_list[k].totalPrice
+
+              }
+
+
             }
 
 

src/views/houseSelfCollect/houseSelfCollectPrint.vue

@@ -28,7 +28,8 @@ export default {
   activated() {
 
   },
-  created(){debugger
+  created(){
+    
   // this.$route.query.type
 this.name = this.$route.query.name
   },

src/views/houseSelfCollect/inspectInfo.vue

@@ -36,7 +36,6 @@
                 v-model="inspect.binNumber"
                 placeholder="请输入仓位号"
                 class="typeselect"
-                @change="selectpackingMethod"
                 :disabled="disabled"
               >
                 <ws-option
@@ -231,12 +230,14 @@ export default {
       customerList: [],
       getbinNumberList: [],
       cangid: '', //仓库id
+      warehouseName:'',
       // calculation:''
     }
   },
   activated() {
     this.types = this.$route.query.type
     this.cangid = this.$route.query.cangid
+    this.warehouseName = this.$route.warehouseName
     let id = this.$route.query.id
     if (this.types == 2) {
       this.disabled = true
@@ -274,7 +275,8 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          // return
+          this.inspect.warehouseName = this.warehouseName
+          this.inspect.compId = sessionStorage.getItem('ws-pf_compId'),
           inspectAdd(this.inspect)
             .toPromise()
             .then((response) => {
@@ -339,7 +341,13 @@ export default {
         })
     },
     //货名改变事件
-    selectpackingMethod() {},
+    selectpackingMethod(e) {
+      let customers = e.split("(").split(")")[0]
+      this.inspect.customerName = customers[0]
+      this.inspect.customerPhone = customers[1]
+     console.log()
+
+    },
     getList(ids) {
       // 货名
       getinspectLookGoods({ warehouseId: this.cangid })

src/views/houseSelfCollect/inspectionManagement.vue

@@ -7,7 +7,7 @@
       </template>
       <template slot="right">
         <ws-select
-          v-model="searchTypeText"
+          v-model="warehouseName"
           placeholder=""
           @change="selecttaskType"
           :value="searchType"
@@ -116,7 +116,7 @@ export default {
       searchKeyWord: '',
       taskTypeList: [],
       searchType: 0,
-      searchTypeText: '',
+      warehouseName: '',
       inspect: [],
       warehouseList: [],
       cangid: '', //仓库id
@@ -134,7 +134,7 @@ export default {
       console.log(row.id, 'id值')
       this.$router.push({
         path: 'inspectInfo',
-        query: { type: index, cangid: this.cangid, id: row.id },
+        query: { type: index, cangid: this.cangid, id: row.id ,warehouseName:this.warehouseName},
       })
     },
     selecttaskType(e) {
@@ -190,7 +190,7 @@ export default {
               id: response[i].id,
             })
           }
-          this.searchTypeText = response[0].warehouseName
+          this.warehouseName = response[0].warehouseName
           this.cangid = response[0].id
         })
 
@@ -199,7 +199,7 @@ export default {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchKeyWord: this.searchKeyWord,
-        searchTypeText: this.searchTypeText,
+        warehouseName: this.warehouseName,
       })
         .toPromise()
         .then((response) => {

src/views/houseSelfCollect/settlement.vue

@@ -359,7 +359,6 @@ export default {
   },
   methods: {
     print() {
-      debugger
       // this.xx = true;
       // let newstr = document.getElementById('print').innerHTML
       // let oldstr = document.body.innerHTML

src/views/houseSelfCollect/weightCheck.vue

@@ -16,7 +16,7 @@
         >
       </el-col>
     </el-row>
-    <div>
+    <div class="substance">
       <ws-form>
         <div style="width: 50%; margin: 0 auto">
           <div class="title">基本信息</div>
@@ -31,7 +31,7 @@
               />
             </ws-form-item>
             <ws-form-item label="仓位号" span="1" prop="binNumber">
-              <ws-select
+              <!-- <ws-select
                 v-model="inspect.binNumber"
                 placeholder="请输入仓位号"
                 class="typeselect"
@@ -44,10 +44,17 @@
                   :label="item.value"
                   :value="item.value"
                 />
-              </ws-select>
+              </ws-select> -->
+               <ws-input
+                v-model="inspect.binNumber"
+                placeholder="请输入仓位号"
+                maxlength="100"
+                disabled
+                size="small"
+              />
             </ws-form-item>
             <ws-form-item label="客户" span="1" prop="customerName">
-              <ws-select
+              <!-- <ws-select
                 v-model="inspect.customerName"
                 placeholder="请输入客户"
                 class="typeselect"
@@ -60,7 +67,14 @@
                   :label="item.value"
                   :value="item.value"
                 />
-              </ws-select>
+              </ws-select> -->
+               <ws-input
+                v-model="inspect.customerName"
+                placeholder="请输入客户"
+                maxlength="100"
+                disabled
+                size="small"
+              />
             </ws-form-item>
             <ws-form-item label="囤位号" span="1" prop="storageTagNo">
               <ws-input
@@ -81,7 +95,7 @@
               />
             </ws-form-item>
             <ws-form-item label="货名" span="1" prop="goodsName">
-              <ws-select
+              <!-- <ws-select
                 v-model="inspect.goodsName"
                 placeholder=""
                 class="typeselect"
@@ -94,7 +108,15 @@
                   :label="item.goodsName"
                   :value="item.goodsName"
                 />
-              </ws-select>
+              </ws-select> -->
+
+              <ws-input
+                v-model="inspect.goodsName"
+                placeholder="请输入货名"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
             </ws-form-item>
             <ws-form-item label="毛重（公斤）" span="1" prop="buckleWeightRatio">
               <ws-input
@@ -162,6 +184,7 @@ export default {
     return {
         inspect:{},
         types:1,
+        information:"头部信息",
     }
   },
   activated() {},
@@ -172,4 +195,78 @@ export default {
 .center {
   background: #f6f7fc;
 }
+.ws-info-table {
+  border: none;
+}
+.ws-info-table .el-form-item {
+  width: 50%;
+  border: none;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 30%;
+  text-align: center;
+  background: #ffffff;
+  font-size: 14px;
+  color: #8890b1;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+.title {
+  font-size: 16px;
+  font-weight: 600;
+  margin: 10px;
+}
+.titleup {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 15px;
+  background: #8890b1;
+  margin-right: 5px;
+}
+
+.substance {
+  background: #ffffff;
+  width: 100%;
+  border-radius: 4px;
+  margin: 0 auto;
+  padding-top: 20px;
+}
+/deep/.el-table .el-table__header .cell,
+.el-table .el-table__body .cell {
+  text-align: center;
+}
+/deep/.el-table--enable-row-transition .el-table__body td {
+  text-align: center;
+}
+.bg-left {
+  padding-left: 30px;
+}
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
+.bg-bottom {
+  margin: 15px 0px;
+}
+.titleup {
+  position: relative;
+}
+.titleup::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.but {
+  text-align: center;
+  margin: 20px auto;
+}
 </style> 

src/views/tranManagement/tranManagementUnShippingFeedbackLook.vue

@@ -138,10 +138,10 @@
               <span class="noservice" v-show="item.status == '未装车'">
                   未装船
                 </span>
-                <span class="service" v-show="item.status == '已装车'">
+                <span class="noservice" v-show="item.status == '已装车'">
                    未卸船
                 </span>
-                 <span class="serviced" v-show="item.status == '已送达'">
+                 <span class="service" v-show="item.status == '已送达'">
                    已卸船
                 </span>
             </div>
@@ -150,10 +150,10 @@
               <span class="noservice" v-show="item.status == '未装车'">
                   未装船
                 </span>
-                <span class="service" v-show="item.status == '已装车'">
+                <span class="noservice" v-show="item.status == '已装车'">
                    未卸船
                 </span>
-                 <span class="serviced" v-show="item.status == '已送达'">
+                 <span class="service" v-show="item.status == '已送达'">
                    已卸船
                 </span>
             </div>