前端更新sdy

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>