8.26 2

src/views/cms.vue

@@ -52,9 +52,9 @@
         </b-nav-item>
       </b-nav>
     </div>
-    <Modal width="60" :closable="false" v-model="is_show" footer-hide>
+    <Modal  :closable="false" v-model="is_show" footer-hide>
       <div style="text-align: center">
-        <Button type="primary" style="margin-right: 1rem; height: 4rem" @click="handleGO">{{ !qrState ? "扫码枪扫描" : "停止扫描"
+        <Button type="primary" style="height: 4rem;width: 8rem" @click="handleGO">{{ !qrState ? "扫码枪扫描" : "停止扫描"
         }}</Button>
         <!--        <Button type="primary" style="height: 4rem" @click="handleGoQr"-->
         <!--          >二维码扫描</Button-->
@@ -119,11 +119,7 @@ export default {
 
 .bc {
   height: 100%;
-  //background-image: url("../assets/images/bc.png");
-  //background-repeat: no-repeat ;
-  //background-size: cover;
 }
-
 .tabBar {
   width: 100%;
   color: #a8a2a2;
@@ -156,16 +152,12 @@ export default {
 .choose {
   color: #03FCD3;
 }
-
-
-
 .circle {
   width: 3rem;
   height: 3rem;
   margin: 0 auto;
   position: absolute;
 }
-
 .choose_1 {
   border-radius: 50%;
   background: #03FCD3;
@@ -187,6 +179,19 @@ export default {
 }
 
 /deep/.ivu-modal {
-  top: 35%;
+  top: 42%;
+  width: 8rem !important;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  margin: 0;
+}
+/deep/.ivu-modal-content{
+  background-color:rgba(0, 0, 0, 0.6) !important;
+}
+/deep/.ivu-modal-body{
+  padding: 0;
+}
+/deep/.ivu-btn-primary{
+  background-color: #0f4680;
 }
 </style>

src/views/page/Dispatch/detail.vue

@@ -37,11 +37,11 @@ color: #ABDFFF;">展开</div>
         </div>
 
         <div class="send_work" v-if="tableData.length > 0" v-for="(item, index) in tableData" :key="index">
-          <div class="check_box">
-            <div @click="handleChoose(item, index)" :class="item.is_choose ? 'check_box_c_active' : 'check_box_c'">
-            </div>
-          </div>
-          <div class="secd_flex">
+<!--          <div class="check_box">-->
+<!--            <div @click="handleChoose(item, index)" :class="item.is_choose ? 'check_box_c_active' : 'check_box_c'">-->
+<!--            </div>-->
+<!--          </div>-->
+          <div class="secd_flex" style="margin-top: .8rem">
             <div class="secd_title">
               <span>销售单号：</span><span> {{ item.bus_no }}</span>
             </div>
@@ -160,7 +160,7 @@ export default {
       saveData: 0,
       transport_total: 0,
       scan_data: [],
-      is_box_data: [],
+      is_box_data: []
     }
   },
   mounted() {
@@ -207,17 +207,12 @@ export default {
         }
         const dataBox = {
           url: 'http://121.36.142.167:7774/jbl/api/module-data/box_orders/box_orders/diy/defective_order_no_list',
-<<<<<<< HEAD
           post: { "defective_order_no_list":text}
-=======
-          post: { "defective_order_no_list": ["BZ00025"] }
->>>>>>> 2baf6b15e6a037b9f129e53ff9b04b009505652e
         }
         this.initDataBox(dataBox)
       })
     },
     // 扫描数据获取
-<<<<<<< HEAD
     initDataBox (row) {
       this.$Message.warning(row.post["defective_order_no_list"].toString())
       this.axios.post('/api/testdwy', { ...row }).then(res => {
@@ -236,15 +231,6 @@ export default {
           })
           this.deelTableData();
         }
-=======
-    initDataBox(row) {
-      this.axios.post('/api/testdwy', { ...row }).then(res => {
-        res.data.data.forEach((element, index) => {
-          let object = { "order_item_id": element.order_item_id, "order_no": element.order_no, "box_num": element.box_num, "product_no": element.product_no, "box_no": element.box_orders.defective_order_no, "box_id": element.box_orders.id };
-          this.scan_data.push(object)
-        })
-        this.deelTableData();
->>>>>>> 2baf6b15e6a037b9f129e53ff9b04b009505652e
       })
     },
     deelUniqueKey(element) {
@@ -273,13 +259,7 @@ export default {
       })
       this.tableData = new_table_data;
     },
-<<<<<<< HEAD
     handelGoSure () {
-
-=======
-    handelGoSure() {
-      console.log(this.tableData)
->>>>>>> 2baf6b15e6a037b9f129e53ff9b04b009505652e
       this.tableData.forEach((element, index) => {
         element.item_num = (index + 1)
       })

src/views/page/Finish/detail.vue

@@ -111,7 +111,6 @@ export default {
       spinShow: false
     }
   },
-<<<<<<< HEAD
   created () {
   },
   mounted () {
@@ -124,12 +123,6 @@ export default {
         text.push(this.func.hexToString(v))
       })
     }
-=======
-  mounted() {
-    // if (localStorage.getItem('fyy_target')) {
-    //   data.target = JSON.parse(localStorage.getItem('fyy_target'))
-    // }
->>>>>>> 2baf6b15e6a037b9f129e53ff9b04b009505652e
     this.tableData = []
     // const fyyTarget = ('PG2023081000025,PG2023081000024').split(',')
     text.forEach(v => {

src/views/page/Finish/detailed.vue

@@ -85,7 +85,7 @@
 </template>
 <script>
 export default {
-  data() {
+  data () {
     return {
       list: [],
       name: '',
@@ -97,11 +97,23 @@ export default {
       breakList: []
     }
   },
-  created() {
+  created () {
     // 获取不良品原因
     const data2 = {
       url: 'http://121.36.142.167:7774/jbl/api/module-data/defective_list/page',
-      post: { "direction": "DESC", "property": "id", "fromClientType": "pc", "number": 0, "sorts": [], "rules": [], "size": 15, "specialConditions": [], "dynamicFormCode": "defective", "developmentSystemId": null, "debugFlag": true }
+      post: {
+        "direction": "DESC",
+        "property": "id",
+        "fromClientType": "pc",
+        "number": 0,
+        "sorts": [],
+        "rules": [],
+        "size": 15,
+        "specialConditions": [],
+        "dynamicFormCode": "defective",
+        "developmentSystemId": null,
+        "debugFlag": true
+      }
     }
     this.axios.post('/api/testdwy', { ...data2 }).then(res => {
       this.breakList = res.data.content.filter(v => v.status)
@@ -113,7 +125,19 @@ export default {
     // 获取设备
     const data1 = {
       url: 'http://121.36.142.167:7774/jbl/api/module-data/device_list/page',
-      post: { "direction": "DESC", "property": "id", "fromClientType": "pc", "number": 0, "sorts": [], "rules": [], "size": 15, "specialConditions": [], "dynamicFormCode": "device", "developmentSystemId": null, "debugFlag": true }
+      post: {
+        "direction": "DESC",
+        "property": "id",
+        "fromClientType": "pc",
+        "number": 0,
+        "sorts": [],
+        "rules": [],
+        "size": 15,
+        "specialConditions": [],
+        "dynamicFormCode": "device",
+        "developmentSystemId": null,
+        "debugFlag": true
+      }
     }
     this.axios.post('/api/testdwy', { ...data1 }).then(res => {
       this.equipmentList = res.data.content.filter(v => v.status)
@@ -125,7 +149,19 @@ export default {
     // 获取班组
     const data = {
       url: 'http://121.36.142.167:7774/jbl/api/module-data/team_list/page',
-      post: { "direction": "DESC", "property": "id", "fromClientType": "pc", "number": 0, "sorts": [], "rules": [], "size": 15, "specialConditions": [], "dynamicFormCode": "team", "developmentSystemId": null, "debugFlag": true }
+      post: {
+        "direction": "DESC",
+        "property": "id",
+        "fromClientType": "pc",
+        "number": 0,
+        "sorts": [],
+        "rules": [],
+        "size": 15,
+        "specialConditions": [],
+        "dynamicFormCode": "team",
+        "developmentSystemId": null,
+        "debugFlag": true
+      }
     }
     this.axios.post('/api/testdwy', { ...data }).then(res => {
       this.teamList = res.data.content.filter(v => v.status)
@@ -137,7 +173,22 @@ export default {
     // 获取人员
     const data3 = {
       url: 'http://121.36.142.167:7774/jbl/api/module-data/team_code_btn/page',
-      post: { "direction": "DESC", "property": "id", "fromClientType": "pc", "number": 0, "sorts": [], "rules": [], "size": 15, "specialConditions": [], "workflowSearchBean": {}, "dynamicFormCode": "person", "dynamicFormTable": null, "ignoreField": true, "developmentSystemId": null, "debugFlag": true }
+      post: {
+        "direction": "DESC",
+        "property": "id",
+        "fromClientType": "pc",
+        "number": 0,
+        "sorts": [],
+        "rules": [],
+        "size": 15,
+        "specialConditions": [],
+        "workflowSearchBean": {},
+        "dynamicFormCode": "person",
+        "dynamicFormTable": null,
+        "ignoreField": true,
+        "developmentSystemId": null,
+        "debugFlag": true
+      }
     }
     this.axios.post('/api/testdwy', { ...data3 }).then(res => {
       this.employeeList = res.data.content
@@ -147,11 +198,11 @@ export default {
       })
     })
   },
-  beforeRouteLeave(to, from, next) {
+  beforeRouteLeave (to, from, next) {
     localStorage.removeItem(this.$route.query.id + '')
     next()
   },
-  beforeRouteEnter(to, from, next) {
+  beforeRouteEnter (to, from, next) {
     if (localStorage.getItem(to.query.id)) {
       next()
     } else {
@@ -161,25 +212,25 @@ export default {
       })
     }
   },
-  mounted() {
+  mounted () {
     const id = this.$route.query.id
     this.initData(id)
   },
   methods: {
-    handleChangeNumber(e, index) {
+    handleChangeNumber (e, index) {
       this.list[index].not_finished_num = this.list[index].dispatch_num - (e.target.value * 1)
     },
-    handleChangeEmployee(e, index) {
+    handleChangeEmployee (e, index) {
       this.list[index].employee_id_show = this.employeeList.filter(v => e.indexOf(v.no) !== -1).map(v => v.name).toString().replace(/,/g, '/$/$/$').replace(/\//g, '')
       console.log(this.list[index])
     },
-    handleChangeTeam(e, index) {
+    handleChangeTeam (e, index) {
       this.list[index].team_id_show = this.teamList.find(v => v.team_code === e).title
     },
-    handleChangeEquipment(e, index) {
+    handleChangeEquipment (e, index) {
       this.list[index].equipment_id_show = this.equipmentList.find(v => v.device_code === e).title
     },
-    initData(id) {
+    initData (id) {
       this.list = JSON.parse(localStorage.getItem(id + ''))
       this.list.forEach(v => {
         v.team_finish_id = v.dispatch_orders.team_id
@@ -192,26 +243,32 @@ export default {
         v.employee_id = v.dispatch_orders.employee_id.split(',')
         v.employee_id_show = v.dispatch_orders.employee_id_show
         v.break = [
-          { break_id: '', break_num: 0 }
+          {
+            break_id: '',
+            break_num: 0
+          }
         ]
       })
     },
-    handleBreakAdd(_index, item, index) {
+    handleBreakAdd (_index, item, index) {
       item.break.splice(_index + 1, 0, {
         break_id: '',
         break_num: 0
       })
       this.list.splice(index, 1, item)
     },
-    handleBreakCancel(_index, item, index) {
+    handleBreakCancel (_index, item, index) {
       if (_index === 0) {
-        item.break = [{ break_id: '', break_num: 0 }]
+        item.break = [{
+          break_id: '',
+          break_num: 0
+        }]
       } else {
         item.break.splice(_index, 1)
       }
       this.list.splice(index, 1, item)
     },
-    handleReturn() {
+    handleReturn () {
       localStorage.removeItem(this.$route.query.id + '')
       this.$router.go(-1)
     },
@@ -235,9 +292,9 @@ export default {
     //     this.formData.employee_id = []
     //   }
     // },
-    handleSure() {
+    handleSure () {
       // console.log(this.list);return false;
-      this.list.forEach((v,index) => {
+      this.list.forEach((v, index) => {
         const data3 = {
           url: 'http://121.36.142.167:7774/jbl/api/module-data/completion_orders/completion_orders',
           post: {
@@ -268,31 +325,14 @@ export default {
             }
           }
         }
-<<<<<<< HEAD
         const data4Dtil = []
         v.break.forEach(vv => {
           if (vv.break_id && vv.break_num) {
             v.defective_num = vv.break_num
             v.defective_remark = vv.break_id
             data4Dtil.push(v)
-=======
-        // this.axios.post('/api/testdwy', { ...data3 }).then(res => {
-        // if (res.code == 200) {
-        // this.$Message.success(res.msg)
-        // // this.$router.push('/cms/home')
-        // }
-        // })
-
-        const data4Dtil = [];
-        v.break.forEach(vv => {
-          if (vv.break_id && vv.break_num) {
-            v.defective_num = vv.break_num;
-            v.defective_remark = vv.break_id;
-            data4Dtil.push(v);
->>>>>>> 2baf6b15e6a037b9f129e53ff9b04b009505652e
           }
         })
-<<<<<<< HEAD
         this.axios.post('/api/testdwy', { ...data3 }).then(res => {
           if (res.code === 200) {
             if (data4Dtil.length > 0) {
@@ -328,66 +368,22 @@ export default {
               }
               this.axios.post('/api/testdwy', { ...data4 }).then(req => {
                 if (req.code == 200) {
-                  if (index == this.list.length-1) {
+                  if (index == this.list.length - 1) {
                     this.$Message.success(req.msg)
                     this.$router.push('/cms/home')
                   }
                 }
               })
             } else {
-              if(index==this.list.length-1){
+              if (index == this.list.length - 1) {
                 this.$Message.success(res.msg)
                 this.$router.push('/cms/home')
-=======
-        if (data4Dtil.length > 0) {
-          const data4 = {
-            url: 'http://121.36.142.167:7774/jbl/api/module-data/defective_orders/defective_orders',
-            post: {
-              bizId: -1,
-              bizTypeEk: 'LOWCODE',
-              dynamicFormId: "474139280406949888",
-              showModelId: "474140935059877888",
-              data: {
-                defective_orders: {
-                  defective_order_no: null,
-                  defection_time: new Date(),
-                  created_by: null,
-                  created_date: null,
-                  employee_id: v.employee_id.toString(),
-                  employee_id_show: v.employee_id_show,
-                  equipment_id: v.equipment_id,
-                  equipment_id_show: v.equipment_id_show,
-                  last_modified_by: null,
-                  last_modified_date: null,
-                  process_id: v.dispatch_orders.process_id,
-                  process_id_show: v.dispatch_orders.process_id_show,
-                  site: null,
-                  team_id: v.team_finish_id,
-                  team_id_show: v.team_id_show,
-                },
-                defective_orders_dtl: data4Dtil
->>>>>>> 2baf6b15e6a037b9f129e53ff9b04b009505652e
               }
             }
           }
-<<<<<<< HEAD
         })
-    })
-
-=======
-          console.log(JSON.stringify(data4)); return false;
-          //   this.axios.post('/api/testdwy', { ...data3 }).then(res => {
-          //     if (res.code == 200) {
-          //     // this.$Message.success(res.msg)
-          //
-          //
-          //   }
-          // })
-        }
-
       })
     }
->>>>>>> 2baf6b15e6a037b9f129e53ff9b04b009505652e
   }
 }
 </script>

src/views/page/Finish/index.vue

@@ -1,71 +1,16 @@
 <template>
   <div>
-    <div class="header">
-      <div class="header_top">
-        <Button
-          type="primary"
-          class="header_btn"
-          ghost
-          @click="handleShow"
-          :icon="is_show ? 'ios-arrow-dropup' : 'ios-arrow-dropdown'"
-        >
-          <div style="margin-right: 0.6rem">
-            {{ is_show ? "收起" : "展开" }}
-          </div></Button
-        >
-        <div style="margin-right: 1rem; color: #66a9f0">王小伟</div>
-      </div>
-      <div class="header_middle">
-        <b-dropdown size="sm" text="Large" class="m-2" :disabled="is_use">
-          <b-dropdown-item-button>Action</b-dropdown-item-button>
-          <b-dropdown-item-button>Another action</b-dropdown-item-button>
-          <b-dropdown-item-button>Something else here</b-dropdown-item-button>
-        </b-dropdown>
-        <b-dropdown size="sm" text="Large" class="m-2" :disabled="is_use">
-          <b-dropdown-item-button>Action</b-dropdown-item-button>
-          <b-dropdown-item-button>Another action</b-dropdown-item-button>
-          <b-dropdown-item-button>Something else here</b-dropdown-item-button>
-        </b-dropdown>
-        <b-dropdown size="sm" text="Large" class="m-2" :disabled="is_use">
-          <b-dropdown-item-button>Action</b-dropdown-item-button>
-          <b-dropdown-item-button>Another action</b-dropdown-item-button>
-          <b-dropdown-item-button>Something else here</b-dropdown-item-button>
-        </b-dropdown>
-      </div>
-      <div class="header_middle1 ot">
-        <div class="ft">58 &nbsp;</div>
-        <div class="ft">12 &nbsp;</div>
-        <div class="ft">12 &nbsp;</div>
-      </div>
-      <div class="header_footer">
-        <div style="margin-left: 1rem">已完成56/10</div>
-        <div style="margin-right: 1.4rem">已完成10%</div>
-      </div>
-    </div>
     <div class="bdy">
-      <div style="font-size: 1.3rem; font-weight: bold">发货单号</div>
-      <div>
-        <Select
-          v-model="selected"
-          style="
-            margin-top: 1rem;
-            height: 3.4rem;
-            width: 100%;
-            font-size: 1.5rem;
-            border-radius: 0.6rem;
-            background: #fff;
-            border: 0.1rem solid;
-          "
-          filterable
-          clearable
-          placeholder="请选择"
-        >
-         <Option v-for="(item,index) in options" :key="index" :label="item.text" :value="item.value"/>
-        </Select>
+
+      <div style="font-size: 1.3rem; font-weight: bold ; color: #fff;margin-bottom:1rem">发货单号</div>
+      <div class="secd_input_r">
+        <b-form-select id="input-3" :options="options" v-model="selected" class="inp select_list" style="height: 3rem"
+                       required placeholder="请选择站点"></b-form-select>
       </div>
       <div class="bdy_btn">
         <Button
-          type="primary"
+          type="warning"
+          ghost
           class="header_btn"
           style="margin-right: 3rem; height: 2.6rem"
           @click="handleReturn"
@@ -73,8 +18,9 @@
           返回</Button
         >
         <Button
-          type="primary"
+
           class="header_btn"
+          ghost
           style="margin-left: 3rem; height: 2.6rem"
           @click="handelGoSure"
         >
@@ -100,7 +46,7 @@ export default {
       post:{"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[],"size":15,"specialConditions":[],"dynamicFormCode":"send_goods_out","developmentSystemId":null,"debugFlag":true}
     }
     this.axios.post('/api/testdwy', { ...data }).then(res => {
-      this.options = res.data.content.filter(v => v.status === "NOT_APPROVED")
+      this.options = res.data.content
       this.options.forEach(v => {
         v.value = v.dynamic_form_value_id
         v.text = v.send_goods_out_no
@@ -149,7 +95,7 @@ export default {
   background: #fff;
 }
 .header_btn {
-  border-radius: 1rem;
+  border-radius: .5rem;
   padding: 0.1rem;
   width: 5rem;
   display: flex;
@@ -203,30 +149,47 @@ export default {
   }
 }
 .bdy {
-  padding: 1rem;
-  position: relative;
-  width: 94%;
-
-  top: 3rem;
-  height: 14rem;
-  border-radius: 1rem;
-  left: 3%;
-  box-shadow: 0.16rem 0.1rem 0.1rem 0.1rem #9d9b9b;
-  background: #fff;
-}
+   height: 14.09rem;
+   background-image: url('../../../assets/home/packUpback.png');
+   background-size: 100% 100%;
+   padding: 1.78rem 2.03rem;
+   box-sizing: border-box;
+   position: absolute;
+   width: 94%;
+   transform: translate(-50%,-50%);
+   top: 40%;
+   border-radius: 1rem;
+   left: 50%;
+ }
 .bdy_btn {
-  margin-top: 3rem;
+  margin-top: 2rem;
 
   display: flex;
   justify-content: center;
   align-items: center;
 }
-/deep/ .ivu-select-selection{
+.select_list {
+  border-radius: 0.38rem;
+  border: 0.03rem solid #76CFFF;
+  background-color: #00000000;
+  outline: none;
+  padding: 0 .625rem;
+  box-sizing: border-box;
+  color: #fff;
+  width: 100%;
   height: 100%;
-  border:none;
+  font-weight: 500;
+  letter-spacing: 0.1rem;
+}
+/deep/.inp {
+  background: #032a64 !important;
+  // opacity: 0.4;
+  //border: none;
+  color: #fff;
 }
-/deep/.ivu-select-input{
-  height: 3.4rem;
-  font-size:1.5rem
+
+::-webkit-input-placeholder {
+  color: #ffffff84;
+  /* 设置占位符文字的颜色 */
 }
 </style>

src/views/page/Home.vue

@@ -8,8 +8,7 @@
           <img @click="handleShow" src="../../assets/home/collect.png" alt="">
         </div>
         <div v-if="!is_show" :class="!is_show ? 'pack_up_d' : ''" class="pack_up" style="display: flex;gap: .3125rem;">
-          <div style="font-size: 0.88rem;
-color: #ABDFFF;">展开</div>
+          <div style="font-size: 0.88rem;color: #ABDFFF;">展开</div>
           <img @click="handleShow" style="width: 0.41rem;height: 0.69rem;" src="../../assets/home/zk.png" alt="">
         </div>
         <div v-if="is_show" class="pack_up_con">
@@ -35,7 +34,7 @@ color: #ABDFFF;">展开</div>
         </div>
       </div>
       <div>
-        <div :class="!is_show ? 'com_top' : ''">
+        <div :class="!is_show ? 'com_top' : 'com_down'">
           <div class="completion_con" @click="handleFinish">
             <div style="display: flex;align-items: center;gap: .84rem;">
               <img style="width: 3.19rem;height: 3.19rem" src="../../assets/home/bzhome.png" alt="">
@@ -66,132 +65,18 @@ color: #ABDFFF;">展开</div>
 
             </div>
           </div>
-        </div>
-      </div>
-      <!-- <div class="header">
-        <div class="header_top">
-          <Button type="primary" class="header_btn" ghost @click="handleShow"
-            :icon="is_show ? 'ios-arrow-dropup' : 'ios-arrow-dropdown'">
-            <div style="margin-right: 0.6rem">
-              {{ is_show ? "收起" : "展开" }}
+          <div class="completion_con" @click="handleInventory">
+            <div style="display: flex;align-items: center;gap: .84rem;">
+              <img style="width: 3.19rem;height: 3.19rem" src="../../assets/home/bzhomebz.png" alt="">
+              <p style="margin-bottom: 0;font-size: 1.13rem;color: #FFFFFF;">盘点</p>
             </div>
-          </Button>
-          <div style="margin-right: 1rem; color: #66a9f0">王小伟</div>
-        </div>
-        <div class="header_middle">
-          <b-dropdown size="sm" text="Large" class="m-2" :disabled="is_use">
-            <b-dropdown-item-button>Action</b-dropdown-item-button>
-            <b-dropdown-item-button>Another action</b-dropdown-item-button>
-            <b-dropdown-item-button>Something else here</b-dropdown-item-button>
-          </b-dropdown>
-          <b-dropdown size="sm" text="Large" class="m-2" :disabled="is_use">
-            <b-dropdown-item-button>Action</b-dropdown-item-button>
-            <b-dropdown-item-button>Another action</b-dropdown-item-button>
-            <b-dropdown-item-button>Something else here</b-dropdown-item-button>
-          </b-dropdown>
-          <b-dropdown size="sm" text="Large" class="m-2" :disabled="is_use">
-            <b-dropdown-item-button>Action</b-dropdown-item-button>
-            <b-dropdown-item-button>Another action</b-dropdown-item-button>
-            <b-dropdown-item-button>Something else here</b-dropdown-item-button>
-          </b-dropdown>
-        </div>
-        <div class="header_middle1 ot">
-          <div class="ft">58 &nbsp;</div>
-          <div class="ft">12 &nbsp;</div>
-          <div class="ft">12 &nbsp;</div>
-        </div>
-        <div class="header_footer">
-          <div style="margin-left: 1rem">已完成56/10</div>
-          <div style="margin-right: 1.4rem">已完成10%</div>
+            <div style="display: flex;align-items: center;">
+              <img style="width: 3.16rem; height: 2rem;" src="../../assets/home/bzhomer.png" alt="">
+
+            </div>
+          </div>
         </div>
       </div>
-<<<<<<< HEAD
-       <div class="item" @click="handleInventory">
-        <svg
-          t="1688030140909"
-          class="icon"
-          viewBox="0 0 1024 1024"
-          version="1.1"
-          xmlns="http://www.w3.org/2000/svg"
-          p-id="12365"
-          width="130"
-          height="130"
-        >
-          <path
-            d="M908.31 487.83l-363.3-371.72c-24.92-25.5-65.43-25.5-90.35 0l-3.51 3.6c-21.42 21.91-24.42 55.58-9.03 80.8L337.49 307.58c-7.84 8.02-7.84 21.08 0 29.1 3.92 4.02 9.04 6.06 14.17 6.06 5.13 0 10.25-1.95 14.27-5.96l103.46-105.95 189.89 194.48v176.55c0 28.04 19.63 51.5 45.54 56.85l-191.16 195.6c-19.9 20.36-46.33 31.57-74.47 31.57s-54.57-11.21-74.47-31.57l-177.88-182c-41.1-41.95-41.1-110.33 0-152.4l11.86-12.13c7.83-8.03 7.83-21.08 0-29.1a19.816 19.816 0 0 0-28.44 0l-11.86 12.13c-56.78 58.1-56.78 152.49 0 210.59l177.88 182.01c27.53 28.08 64.01 43.6 102.91 43.6s75.37-15.42 102.91-43.6l189.34-193.73v4.01c0 16.86 6.33 32.6 17.99 44.52 11.56 11.82 27.04 18.41 43.52 18.41 16.49 0 31.86-6.59 43.52-18.41 11.55-11.93 17.99-27.76 17.99-44.52V602.9c18.19 1.43 36.68-5.04 50.35-19.03l3.52-3.6c24.9-25.5 24.9-66.93-0.02-92.44z m-28.54 63.34l-3.52 3.6c-8.14 8.33-20.91 9.46-30.35 2.67-6.13-4.42-14.17-4.93-20.8-1.43a20.816 20.816 0 0 0-10.86 18.3v119.38c0 5.87-2.21 11.31-6.23 15.43-4.02 4.11-9.35 6.38-15.08 6.38s-11.05-2.26-15.08-6.48c-4.02-4.11-6.23-9.57-6.23-15.42V641c0.03-0.69 0.03-1.37 0-2.06v-27.81c0-10.28-7.54-19.03-17.59-20.36-10.05-1.33-19.49 5.24-22.01 15.22-0.7 2.88-2.2 5.56-4.32 7.71-3.11 3.19-7.24 4.94-11.66 4.94-9.04 0-16.48-7.51-16.48-16.86v-185.1c0-5.45-2.11-10.59-5.93-14.49L484.62 188.3c-0.32-0.38-0.65-0.77-1-1.13-0.35-0.36-0.73-0.69-1.1-1.02l-2.92-2.99c-9.24-9.46-9.24-24.88 0-34.34l3.52-3.6a23.402 23.402 0 0 1 33.57 0l363.09 371.62c9.23 9.45 9.23 24.88-0.01 34.33z m-380.38-120.4c11.15 0 20.1-9.25 20.1-20.56 0-11.31-9.04-20.57-20.1-20.57H117.11c-11.06 0-20.11 9.25-20.11 20.57 0 11.31 9.05 20.56 20.11 20.56h382.28z"
-            fill="#a8a343"
-            p-id="12366"
-          ></path>
-        </svg>
-        <div class="ft_by">盘点</div>
-      </div>
-      <div class="item" @click="handlePackage">
-        <svg
-          t="1688182715452"
-          class="icon"
-          viewBox="0 0 1024 1024"
-          version="1.1"
-          xmlns="http://www.w3.org/2000/svg"
-          p-id="2523"
-          id="mx_n_1688182715453"
-          width="130"
-          height="130"
-        >
-          <path
-            d="M913.28 231.296L549.28 14.208a72.544 72.544 0 0 0-74.56-0.032L110.72 231.296a73.024 73.024 0 0 0-35.488 62.432v436.544a73.056 73.056 0 0 0 35.488 62.464l364.032 217.12a72.704 72.704 0 0 0 74.496 0l364.032-217.12a73.024 73.024 0 0 0 35.488-62.464V293.728a73.056 73.056 0 0 0-35.488-62.432zM507.52 69.12a8.736 8.736 0 0 1 8.96 0l343.36 204.8-143.04 82.592-344.096-206.944z m1.92 407.104L161.696 275.424l148.672-88.672 343.104 206.336zM143.52 737.76a8.768 8.768 0 0 1-4.256-7.488V336.384l340.48 196.576v405.344z m737.024 0L543.68 938.624V530.368L884.8 333.44v396.832a8.736 8.736 0 0 1-4.256 7.488z"
-            fill="#58b125"
-            p-id="2524"
-          ></path>
-          <path
-            d="M767.072 483.04l-95.744 55.296a32 32 0 0 0 32 55.424l95.744-55.296a32 32 0 1 0-32-55.424z"
-            fill="#58b125"
-            p-id="2525"
-          ></path>
-        </svg>
-        <div class="ft_by">包装</div>
-      </div>
-=======
-      <div class="bdy">
-        <div class="item" @click="handleFinish">
-          <svg t="1688029854983" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
-            p-id="9681" width="130" height="130">
-            <path
-              d="M713.728 415.936l-47.722667-42.794667 85.482667-85.482666-45.248-45.248-87.957333 87.936-47.701334-42.794667 90.389334-90.389333a64 64 0 0 1 90.517333 0l45.248 45.226666a64 64 0 0 1 0 90.538667l-83.008 82.986667zM505.6 624.064L283.861333 845.802667a64 64 0 0 1-90.517333 0l-45.248-45.248a64 64 0 0 1 0-90.517334l235.456-235.456-58.282667-71.424a64 64 0 0 1 4.266667-85.76l99.136-99.114666c23.253333-23.253333 64.832-20.608 90.282667 0.213333l338.133333 265.28c30.4 30.4 21.909333 110.826667-61.866667 194.581333-83.477333 83.498667-164.181333 92.245333-194.581333 61.866667-0.597333-0.597333-32.277333-39.317333-95.04-116.16z m-81.365333-99.669333L193.344 755.306667l45.248 45.226666 226.325333-226.304-40.682666-49.834666z m55.210666-255.530667l-1.024-0.832a12.629333 12.629333 0 0 0-6.826666-2.176l-96.789334 96.789333c105.088 128.746667 249.088 305.002667 268.821334 329.472 4.288 0.426667 10.624-0.085333 18.496-2.133333 25.429333-6.506667 56.405333-25.408 87.850666-56.874667 31.573333-31.573333 50.496-62.528 56.981334-87.893333 1.92-7.466667 2.474667-13.504 2.133333-17.749333L479.445333 268.864z"
-              fill="#5499fe" p-id="9682"></path>
-          </svg>
-          <div class="ft_by">完工</div>
-        </div>
-        <div class="item" @click="handleDispatch">
-          <svg t="1688030012912" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
-            p-id="10881" width="130" height="130">
-            <path
-              d="M968.9 351.8l-57.5-52.2c-31-28.1-71.1-43.6-112.9-43.6L640 256l0-80.5c0-62-50.5-112.5-112.5-112.5l-415 0c-62 0-112.5 50.5-112.5 112.5l0 720.5 128 0c0 70.6 57.4 128 128 128s128-57.4 128-128l192 0 64 0c0 70.6 57.4 128 128 128s128-57.4 128-128l128 0L1024 476.2C1024 428.9 1003.9 383.6 968.9 351.8zM925.9 399.2c21.7 19.7 34.1 47.7 34.1 77l0 99.8-128 0L832 325.5c13.3 4.5 25.7 11.8 36.4 21.5L925.9 399.2zM256 960c-35.3 0-64-28.7-64-64s28.7-64 64-64 64 28.7 64 64S291.3 960 256 960zM576 832 366.8 832c-22.2-38.2-63.5-64-110.8-64s-88.7 25.8-110.8 64L64 832l0-656.5c0-26.7 21.8-48.5 48.5-48.5l415 0c26.7 0 48.5 21.8 48.5 48.5l0 80.5L576 832zM768 960c-35.3 0-64-28.7-64-64s28.7-64 64-64 64 28.7 64 64S803.3 960 768 960zM878.8 832c-22.2-38.2-63.5-64-110.8-64s-88.7 25.8-110.8 64L640 832l0-512 128 0 0 320 192 0 0 192L878.8 832z"
-              p-id="10882" fill="#d57952"></path>
-          </svg>
-          <div class="ft_by">发货</div>
-        </div>
-        <div class="item">
-          <svg t="1688030140909" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
-            p-id="12365" width="130" height="130">
-            <path
-              d="M908.31 487.83l-363.3-371.72c-24.92-25.5-65.43-25.5-90.35 0l-3.51 3.6c-21.42 21.91-24.42 55.58-9.03 80.8L337.49 307.58c-7.84 8.02-7.84 21.08 0 29.1 3.92 4.02 9.04 6.06 14.17 6.06 5.13 0 10.25-1.95 14.27-5.96l103.46-105.95 189.89 194.48v176.55c0 28.04 19.63 51.5 45.54 56.85l-191.16 195.6c-19.9 20.36-46.33 31.57-74.47 31.57s-54.57-11.21-74.47-31.57l-177.88-182c-41.1-41.95-41.1-110.33 0-152.4l11.86-12.13c7.83-8.03 7.83-21.08 0-29.1a19.816 19.816 0 0 0-28.44 0l-11.86 12.13c-56.78 58.1-56.78 152.49 0 210.59l177.88 182.01c27.53 28.08 64.01 43.6 102.91 43.6s75.37-15.42 102.91-43.6l189.34-193.73v4.01c0 16.86 6.33 32.6 17.99 44.52 11.56 11.82 27.04 18.41 43.52 18.41 16.49 0 31.86-6.59 43.52-18.41 11.55-11.93 17.99-27.76 17.99-44.52V602.9c18.19 1.43 36.68-5.04 50.35-19.03l3.52-3.6c24.9-25.5 24.9-66.93-0.02-92.44z m-28.54 63.34l-3.52 3.6c-8.14 8.33-20.91 9.46-30.35 2.67-6.13-4.42-14.17-4.93-20.8-1.43a20.816 20.816 0 0 0-10.86 18.3v119.38c0 5.87-2.21 11.31-6.23 15.43-4.02 4.11-9.35 6.38-15.08 6.38s-11.05-2.26-15.08-6.48c-4.02-4.11-6.23-9.57-6.23-15.42V641c0.03-0.69 0.03-1.37 0-2.06v-27.81c0-10.28-7.54-19.03-17.59-20.36-10.05-1.33-19.49 5.24-22.01 15.22-0.7 2.88-2.2 5.56-4.32 7.71-3.11 3.19-7.24 4.94-11.66 4.94-9.04 0-16.48-7.51-16.48-16.86v-185.1c0-5.45-2.11-10.59-5.93-14.49L484.62 188.3c-0.32-0.38-0.65-0.77-1-1.13-0.35-0.36-0.73-0.69-1.1-1.02l-2.92-2.99c-9.24-9.46-9.24-24.88 0-34.34l3.52-3.6a23.402 23.402 0 0 1 33.57 0l363.09 371.62c9.23 9.45 9.23 24.88-0.01 34.33z m-380.38-120.4c11.15 0 20.1-9.25 20.1-20.56 0-11.31-9.04-20.57-20.1-20.57H117.11c-11.06 0-20.11 9.25-20.11 20.57 0 11.31 9.05 20.56 20.11 20.56h382.28z"
-              fill="#a8a343" p-id="12366"></path>
-          </svg>
-          <div class="ft_by">返工</div>
-        </div>
-        <div class="item" @click="handlePackage">
-          <svg t="1688182715452" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
-            p-id="2523" id="mx_n_1688182715453" width="130" height="130">
-            <path
-              d="M913.28 231.296L549.28 14.208a72.544 72.544 0 0 0-74.56-0.032L110.72 231.296a73.024 73.024 0 0 0-35.488 62.432v436.544a73.056 73.056 0 0 0 35.488 62.464l364.032 217.12a72.704 72.704 0 0 0 74.496 0l364.032-217.12a73.024 73.024 0 0 0 35.488-62.464V293.728a73.056 73.056 0 0 0-35.488-62.432zM507.52 69.12a8.736 8.736 0 0 1 8.96 0l343.36 204.8-143.04 82.592-344.096-206.944z m1.92 407.104L161.696 275.424l148.672-88.672 343.104 206.336zM143.52 737.76a8.768 8.768 0 0 1-4.256-7.488V336.384l340.48 196.576v405.344z m737.024 0L543.68 938.624V530.368L884.8 333.44v396.832a8.736 8.736 0 0 1-4.256 7.488z"
-              fill="#58b125" p-id="2524"></path>
-            <path d="M767.072 483.04l-95.744 55.296a32 32 0 0 0 32 55.424l95.744-55.296a32 32 0 1 0-32-55.424z"
-              fill="#58b125" p-id="2525"></path>
-          </svg>
-          <div class="ft_by">包装</div>
-        </div>
-      </div> -->
->>>>>>> 2baf6b15e6a037b9f129e53ff9b04b009505652e
     </div>
   </div>
 </template>
@@ -200,15 +85,12 @@ color: #ABDFFF;">展开</div>
 export default {
   data() {
     return {
-      is_show: true,
-      is_use: false
+      is_show: true
     }
   },
   mounted() {
-    console.log(123)
   },
   methods: {
-<<<<<<< HEAD
     handleInventory () {
       this.$router.push('/cms/inventory/index')
     },
@@ -217,30 +99,12 @@ export default {
     },
     handlePackage () {
       this.$router.push('/cms/Package/index')
-=======
-    handleFinish() {
-      this.$router.push('/cms/finish/detail')
-    },
-    handlePackage() {
-      this.$router.push('/cms/Package/detail')
->>>>>>> 2baf6b15e6a037b9f129e53ff9b04b009505652e
     },
-    handleDispatch() {
+    handleDispatch () {
       this.$router.push('/cms/finish')
     },
-    handleShow() {
+    handleShow () {
       this.is_show = !this.is_show
-      console.log(document.getElementsByClassName('header'))
-      if (this.is_show) {
-        document.getElementsByClassName('header')[0].style = 'height:7rem;overflow:hidden;transition:all .4s;'
-        setTimeout(() => {
-          document.getElementsByClassName('header')[0].style = 'overflow:none;'
-          this.is_use = false;
-        }, 400)
-      } else {
-        this.is_use = true;
-        document.getElementsByClassName('header')[0].style = 'height:2.7rem;overflow:hidden;transition:all .4s;'
-      }
     }
   }
 }
@@ -249,7 +113,10 @@ export default {
 .com_top {
   margin-top: 1.72rem !important;
 }
-
+.com_down{
+  height: 20rem;
+  overflow: auto;
+}
 .completion_con {
   height: 5.19rem;
   background-image: url('../../assets/home/completion.png');

src/views/page/Inventory/detail.vue

@@ -1,89 +1,200 @@
 <template>
-  <div>
-    <div class="header">
-      <div class="header_top">
-        <Button
-                type="primary"
-                class="header_btn"
-                ghost
-                @click="handleShow"
-                :icon="is_show ? 'ios-arrow-dropup' : 'ios-arrow-dropdown'"
-        >
-          <div style="margin-right: 0.6rem">
-            {{ is_show ? "收起" : "展开" }}
-          </div></Button
-        >
-        <div style="margin-right: 1rem; color: #66a9f0">王小伟</div>
-      </div>
-      <div class="header_middle">
-        <b-dropdown size="sm" text="盘点单号" class="m-2" :disabled="is_use">
-          <b-dropdown-item-button>Action</b-dropdown-item-button>
-          <b-dropdown-item-button>Another action</b-dropdown-item-button>
-          <b-dropdown-item-button>Something else here</b-dropdown-item-button>
-        </b-dropdown>
-        <b-dropdown size="sm" text="盘点日期" class="m-2" :disabled="is_use">
-          <b-dropdown-item-button>Action</b-dropdown-item-button>
-          <b-dropdown-item-button>Another action</b-dropdown-item-button>
-          <b-dropdown-item-button>Something else here</b-dropdown-item-button>
-        </b-dropdown>
-        <b-dropdown size="sm" text="盘点人员" class="m-2" :disabled="is_use">
-          <b-dropdown-item-button>Action</b-dropdown-item-button>
-          <b-dropdown-item-button>Another action</b-dropdown-item-button>
-          <b-dropdown-item-button>Something else here</b-dropdown-item-button>
-        </b-dropdown>
-      </div>
-      <div class="header_middle1 ot">
-        <div class="ft">{{intentory_no}} &nbsp;</div>
-        <div class="ft">{{intentory_date}} &nbsp;</div>
-        <div class="ft">{{intentory_name}} &nbsp;</div>
-      </div>
-      <div class="header_footer">
-        <!--<div style="margin-left: 1rem">已发货{{transport_total}}</div>-->
-        <!--<div style="margin-right: 1.4rem">已完成10%</div>-->
+<!--  <div>-->
+<!--    <div class="header">-->
+<!--      <div class="header_top">-->
+<!--        <Button-->
+<!--                type="primary"-->
+<!--                class="header_btn"-->
+<!--                ghost-->
+<!--                @click="handleShow"-->
+<!--                :icon="is_show ? 'ios-arrow-dropup' : 'ios-arrow-dropdown'"-->
+<!--        >-->
+<!--          <div style="margin-right: 0.6rem">-->
+<!--            {{ is_show ? "收起" : "展开" }}-->
+<!--          </div></Button-->
+<!--        >-->
+<!--        <div style="margin-right: 1rem; color: #66a9f0">王小伟</div>-->
+<!--      </div>-->
+<!--      <div class="header_middle">-->
+<!--        <b-dropdown size="sm" text="盘点单号" class="m-2" :disabled="is_use">-->
+<!--          <b-dropdown-item-button>Action</b-dropdown-item-button>-->
+<!--          <b-dropdown-item-button>Another action</b-dropdown-item-button>-->
+<!--          <b-dropdown-item-button>Something else here</b-dropdown-item-button>-->
+<!--        </b-dropdown>-->
+<!--        <b-dropdown size="sm" text="盘点日期" class="m-2" :disabled="is_use">-->
+<!--          <b-dropdown-item-button>Action</b-dropdown-item-button>-->
+<!--          <b-dropdown-item-button>Another action</b-dropdown-item-button>-->
+<!--          <b-dropdown-item-button>Something else here</b-dropdown-item-button>-->
+<!--        </b-dropdown>-->
+<!--        <b-dropdown size="sm" text="盘点人员" class="m-2" :disabled="is_use">-->
+<!--          <b-dropdown-item-button>Action</b-dropdown-item-button>-->
+<!--          <b-dropdown-item-button>Another action</b-dropdown-item-button>-->
+<!--          <b-dropdown-item-button>Something else here</b-dropdown-item-button>-->
+<!--        </b-dropdown>-->
+<!--      </div>-->
+<!--      <div class="header_middle1 ot">-->
+<!--        <div class="ft">{{intentory_no}} &nbsp;</div>-->
+<!--        <div class="ft">{{intentory_date}} &nbsp;</div>-->
+<!--        <div class="ft">{{intentory_name}} &nbsp;</div>-->
+<!--      </div>-->
+<!--      <div class="header_footer">-->
+<!--        &lt;!&ndash;<div style="margin-left: 1rem">已发货{{transport_total}}</div>&ndash;&gt;-->
+<!--        &lt;!&ndash;<div style="margin-right: 1.4rem">已完成10%</div>&ndash;&gt;-->
+<!--      </div>-->
+<!--    </div>-->
+<!--&lt;!&ndash;    <div class="bdy">&ndash;&gt;-->
+<!--&lt;!&ndash;      <table>&ndash;&gt;-->
+<!--&lt;!&ndash;        <tr style="height: 2rem">&ndash;&gt;-->
+<!--&lt;!&ndash;          <th style="width: 4rem">产品名称</th>&ndash;&gt;-->
+<!--&lt;!&ndash;          <th style="width: 3rem">规格型号</th>&ndash;&gt;-->
+<!--&lt;!&ndash;          <th style="width: 3rem">花色</th>&ndash;&gt;-->
+<!--&lt;!&ndash;          <th style="width: 3rem">账面数量</th>&ndash;&gt;-->
+<!--&lt;!&ndash;          <th style="width: 3rem">盘点数量</th>&ndash;&gt;-->
+<!--&lt;!&ndash;        </tr>&ndash;&gt;-->
+<!--&lt;!&ndash;        <tr&ndash;&gt;-->
+<!--&lt;!&ndash;                v-for="(item, index) in tableData"&ndash;&gt;-->
+<!--&lt;!&ndash;                :key="index"&ndash;&gt;-->
+<!--&lt;!&ndash;                @click="handleChoose(item, index)"&ndash;&gt;-->
+<!--&lt;!&ndash;        >&ndash;&gt;-->
+<!--&lt;!&ndash;          <td>&ndash;&gt;-->
+<!--&lt;!&ndash;            {{ item.product_title }}&ndash;&gt;-->
+<!--&lt;!&ndash;          </td>&ndash;&gt;-->
+<!--&lt;!&ndash;          <td>{{ item.product_size }}</td>&ndash;&gt;-->
+<!--&lt;!&ndash;          <td>{{item.color}}</td>&ndash;&gt;-->
+<!--&lt;!&ndash;          <td>{{ item.balance_num }}</td>&ndash;&gt;-->
+<!--&lt;!&ndash;          <td>{{ item.check_num }}</td>&ndash;&gt;-->
+<!--&lt;!&ndash;        </tr>&ndash;&gt;-->
+<!--&lt;!&ndash;      </table>&ndash;&gt;-->
+<!--&lt;!&ndash;    </div>&ndash;&gt;-->
+<!--    <div class="send_work" v-if="tableData.length > 0" v-for="(item, index) in tableData" :key="index">-->
+<!--      <div class="check_box">-->
+<!--        <div @click="handleChoose(item, index)" :class="item.is_choose ? 'check_box_c_active' : 'check_box_c'">-->
+<!--        </div>-->
+<!--      </div>-->
+<!--      <div class="secd_flex">-->
+<!--        <div class="secd_title">-->
+<!--          <span>产品名称：</span><span> {{ item.bus_no }}</span>-->
+<!--        </div>-->
+<!--        <span class="secd_title_d">{{ item.product_title }}</span>-->
+<!--        <div class="secd_g"><span>规格型号：</span><span>{{ item.product_size }}</span></div>-->
+<!--        <div class="secd_flex_w">-->
+<!--          <div class="secd_flex_s">-->
+<!--            <span>花色：</span>-->
+<!--            <span>{{ item.out_qty }}件</span>-->
+<!--          </div>-->
+<!--          <div class="secd_flex_s">-->
+<!--            <span>已包装数量：</span>-->
+<!--            <span>{{ item.this_delivery_qty - item.out_qty }}件</span>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--      </div>-->
+
+<!--    </div>-->
+<!--    <div v-if="tableData.length == 0"-->
+<!--         style="display: flex;width: 100%;height: 10rem;justify-content: center;align-items: center;">-->
+
+<!--      <Spin size="small" />-->
+<!--      <Spin />-->
+<!--      <Spin size="small" />-->
+
+<!--    </div>-->
+<!--    <div class="footer">-->
+<!--      <Button-->
+<!--              type="primary"-->
+<!--              class="header_btn"-->
+<!--              style="margin-right: 3rem; height: 2.6rem"-->
+<!--              @click="handleReturn"-->
+<!--      >-->
+<!--        返回</Button-->
+<!--      >-->
+<!--      <Button-->
+<!--              type="primary"-->
+<!--              class="header_btn"-->
+<!--              style="margin-left: 3rem; height: 2.6rem"-->
+<!--              @click="handelGoSure"-->
+<!--      >-->
+<!--        确认</Button-->
+<!--      >-->
+<!--    </div>-->
+<!--  </div>-->
+  <div style="overflow-y: scroll;padding-bottom: 9rem;box-sizing: border-box;">
+    <div style="background-image: url('../../../assets/images/bc.png');background-size: 100% 100%;">
+      <div class="home_header">盘点</div>
+      <div class="home_header_line"></div>
+      <div class="home_con_body">
+        <div class="home_con_s">
+          <div v-if="is_show" class="pack_up">
+            <img @click="handleShow" src="../../../assets/home/collect.png" alt="">
+          </div>
+          <div v-if="!is_show" :class="!is_show ? 'pack_up_d' : ''" class="pack_up" style="display: flex;gap: .3125rem;">
+            <div style="font-size: 0.88rem;color: #ABDFFF;">展开</div>
+            <img @click="handleShow" style="width: 0.41rem;height: 0.69rem;" src="../../../assets/home/zk.png" alt="">
+          </div>
+          <div v-if="is_show" class="pack_up_con">
+            <p class="pack_up_name">王晓伟</p>
+            <div class="pack_up_grid">
+              <div>
+                <p>账面数量</p>
+                <div><span>{{ total_num }}</span><span>件</span></div>
+              </div>
+              <div>
+                <p>盘点总数</p>
+                <div><span>{{ scan_num }}</span><span>件</span></div>
+              </div>
+              <div>
+                <p>未盘点总数</p>
+                <div><span>{{ total_num - scan_num }}</span><span>件</span></div>
+              </div>
+              <!-- <div>
+                <p>包装件数</p>
+                <div><span>1245</span><span>件</span></div>
+              </div> -->
+            </div>
+          </div>
+        </div>
+
+        <div class="send_work" v-if="tableData.length > 0" v-for="(item, index) in tableData" :key="index">
+<!--          <div class="check_box">-->
+<!--            <div @click="handleChoose(item, index)" :class="item.is_choose ? 'check_box_c_active' : 'check_box_c'">-->
+<!--            </div>-->
+<!--          </div>-->
+          <div class="secd_flex">
+<!--            <div class="secd_title">-->
+<!--              <span>销售单号：</span><span> {{ item.bus_no }}</span>-->
+<!--            </div>-->
+            <span class="secd_title_d">{{ item.product_title }}</span>
+            <div class="secd_g"><span>规格型号：</span><span>{{ item.product_size }}</span></div>
+            <div class="secd_g"><span>花色/工艺：</span><span>{{ item.color }}{{item.color_two}}{{item.process_title}}{{item.process_title_two}}</span></div>
+            <div class="secd_flex_w">
+              <div class="secd_flex_s">
+                <span>账面数量：</span>
+                <span>{{ item.balance_num }}件</span>
+              </div>
+              <div class="secd_flex_s">
+                <span>盘点数量：</span>
+                <span>{{ item.check_num }}件</span>
+              </div>
+            </div>
+          </div>
+
+        </div>
+        <div v-if="tableData.length == 0"
+             style="display: flex;width: 100%;height: 10rem;justify-content: center;align-items: center;">
+
+          <Spin size="small" />
+          <Spin />
+          <Spin size="small" />
+
+        </div>
+        <div class="footer">
+
+          <div class="return_btn" @click="handleReturn">返回</div>
+          <div class="confirm_btn" @click="handelGoSure">确认</div>
+        </div>
       </div>
     </div>
-    <div class="bdy">
-      <table>
-        <tr style="height: 2rem">
-          <th style="width: 4rem">产品名称</th>
-          <th style="width: 3rem">规格型号</th>
-          <th style="width: 3rem">花色</th>
-          <th style="width: 3rem">账面数量</th>
-          <th style="width: 3rem">盘点数量</th>
-        </tr>
-        <tr
-                v-for="(item, index) in tableData"
-                :key="index"
-                @click="handleChoose(item, index)"
-        >
-          <td>
-            {{ item.product_title }}
-          </td>
-          <td>{{ item.product_size }}</td>
-          <td>{{item.color}}</td>
-          <td>{{ item.balance_num }}</td>
-          <td>{{ item.check_num }}</td>
-        </tr>
-      </table>
-    </div>
-    <div class="footer">
-      <Button
-              type="primary"
-              class="header_btn"
-              style="margin-right: 3rem; height: 2.6rem"
-              @click="handleReturn"
-      >
-        返回</Button
-      >
-      <Button
-              type="primary"
-              class="header_btn"
-              style="margin-left: 3rem; height: 2.6rem"
-              @click="handelGoSure"
-      >
-        确认</Button
-      >
-    </div>
+
+
   </div>
 </template>
 <script>
@@ -97,9 +208,11 @@ export default {
       send_goods_out_product: {},
       is_show: true,
       is_use: false,
-      intentory_no: '',
-      intentory_date: '',
-      intentory_name: '',
+      total_num:0,
+      scan_num:0,
+      // intentory_no: '',
+      // intentory_date: '',
+      // intentory_name: '',
       saveData: 0,
       scan_data: []
     }
@@ -123,11 +236,15 @@ export default {
     // 原始数据获取
     initData (row) {
       this.axios.post('/api/testdwyget', { ...row }).then(res => {
-        this.intentory_no = res.data.data.goods_check.goods_check_no;
-        this.intentory_date = res.data.data.createdDate;
-        this.intentory_name = res.data.data.goods_check.check_employee_id_show;
+        // this.intentory_no = res.data.data.goods_check.goods_check_no;
+        // this.intentory_date = res.data.data.createdDate;
+        // this.intentory_name = res.data.data.goods_check.check_employee_id_show;
         this.data = res.data
         this.tableData.push(...res.data.data.goods_check_product);
+        this.total_num = 0;
+        this.tableData.forEach(v => {
+          this.total_num += v.balance_num * 1
+        })
         let text = []
         if (localStorage.getItem('fyy_target')) {
           // console.log(JSON.parse(localStorage.getItem('fyy_target')))
@@ -175,6 +292,7 @@ export default {
         if(Object.keys(this.key_tableData).indexOf(this.deelUniqueKey(element)) !== -1){
           element.check_num = this.key_tableData[this.deelUniqueKey(element)];
         }
+        this.scan_num += element.check_num * 1;
       })
     },
     handelGoSure () {
@@ -217,116 +335,363 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .header {
-    width: 94%;
-    height: 7rem;
-    // overflow: hidden;
-    // transition: all 0.4s;
-    position: relative;
-    top: 0.5rem;
-    left: 3%;
-    box-shadow: 0.16rem 0.1rem 0.1rem 0.1rem #9d9b9b;
-    border-radius: 1rem;
-    padding: 0.4rem 0.7rem 0 1rem;
-    background: #fff;
-  }
-  .header_btn {
-    border-radius: 1rem;
-    padding: 0.1rem;
-    width: 5rem;
-    display: flex;
-    justify-content: space-around;
-    align-items: center;
+.return_btn {
+  background-image: url('../../../assets/home/return.png');
+  background-size: 100% 100%;
+}
+
+.confirm_btn {
+  background-image: url('../../../assets/home/confirm.png');
+  background-size: 100% 100%;
+}
+
+.return_btn,
+.confirm_btn {
+  width: 10.97rem;
+  height: 3.93rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #fff;
+  font-size: 1.06rem;
+  font-weight: 500;
+  letter-spacing: 1px;
+}
+
+.secd_flex_s>span:nth-child(1) {
+  font-size: 0.94rem;
+  color: #ABDFFF;
+}
+
+.secd_flex_s>span:nth-child(2) {
+  font-size: 0.94rem;
+  color: #03FCD3;
+}
+
+.secd_g {
+  font-size: 1rem;
+  color: #ABDFFF;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.secd_title_d {
+  margin-top: .8rem;
+  font-size: 1.13rem;
+  color: #FFFFFF;
+  text-shadow: 0px 0px 0px rgba(255, 255, 255, 0.5);
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.secd_flex_w {
+  display: flex;
+  justify-content: space-between;
+  padding-right: 1.6rem;
+  box-sizing: border-box;
+}
+
+.secd_flex {
+  display: flex;
+  flex-direction: column;
+  gap: .375rem;
+
+  .secd_title {
+    font-size: 0.88rem;
+    color: #ABDFFF;
+    opacity: 0.5;
   }
-  .header_top {
+}
+
+
+.check_box_c {
+  width: 1.19rem;
+  height: 100%;
+  background-image: url('../../../assets/home/check.png');
+  background-size: 100% 100%;
+
+}
+
+.check_box_c_active {
+  width: 1.3rem;
+  height: 100%;
+  background-image: url('../../../assets/home/checked.png');
+  background-size: 100% 100%;
+}
+
+.send_work {
+  height: 9.69rem;
+  background-image: url('../../../assets/home/packUpback.png');
+  background-size: 100% 100%;
+  margin-top: 1.38rem;
+  padding: 0.44rem 0.4rem 1.34rem 1.22rem;
+  box-sizing: border-box;
+
+  .check_box {
+    height: 1.19rem;
     display: flex;
-    justify-content: space-between;
-    align-items: center;
+    justify-content: right;
   }
-  .ot {
-    position: relative;
-    top: -1.3rem;
-  }
-  .header_middle1 {
+}
+
+.com_top {
+  margin-top: 1.72rem !important;
+}
+
+.completion_con {
+  height: 5.19rem;
+  background-image: url('../../../assets/home/completion.png');
+  background-size: 100% 100%;
+  margin-top: 0.72rem;
+  padding: 1rem 1.28rem;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.home_con_s {
+  position: relative;
+
+  .pack_up {
+    position: absolute;
+    top: 0;
+    left: 50%;
+    transform: translateX(-50%);
+    width: 5.56rem;
+    background-image: url('../../../assets/home/packUp.png');
+    background-size: 100% 100%;
+    height: 1.97rem;
     display: flex;
-    justify-content: space-between;
     align-items: center;
-    .ft {
-      font-size: 1.5rem;
-      width: 5rem;
-      text-align: center;
+    justify-content: center;
+
+    img {
+      width: 2.59rem;
+      height: 0.88rem;
     }
+
+
+
   }
-  .header_middle {
-    position: relative;
-    top: -0.3rem;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
-  /deep/ .btn-group > .btn,
-  .btn-group-vertical > .btn {
-    background: #ffffff;
-    color: #2c3e50;
-    outline: none;
-    border: none;
-    margin: 0;
-    z-index: 3;
+
+  .pack_up_d {
+    top: -1.1rem;
   }
-  .header_footer {
-    position: relative;
-    top: -1.7rem;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    div {
-      font-size: 0.5rem;
-      color: rgb(244, 136, 42);
+
+  .pack_up_con {
+    height: 14.09rem;
+    background-image: url('../../../assets/home/packUpback.png');
+    background-size: 100% 100%;
+    padding: 1.78rem 2.03rem;
+    box-sizing: border-box;
+
+    .pack_up_name {
+      height: 1.25rem;
+      font-size: 1.25rem;
+      color: #fff;
+      font-weight: 600;
     }
-  }
-  .bdy {
-    width: 94%;
-    height: calc(100% - 18.7rem);
-    overflow: auto;
-    position: relative;
-    top: 1rem;
-    left: 3%;
-  }
 
-  /deep/td {
-    text-align: center;
-    vertical-align: middle;
-  }
-  table {
-    border-collapse: collapse; /* 合并边框 */
-    width: 100%; /* 表格宽度 */
-    background: #fff;
-    table-layout: fixed;
-  }
-  th {
-    font-size: 0.6rem;
-    background: #66b1f4;
-    color: #fff;
-  }
-  td {
-    font-size: 0.6rem;
-    word-break: break-all;
+    .pack_up_grid {
+      display: grid;
+      grid-template-columns: repeat(2, 1fr);
+      row-gap: .625rem;
+
+      &>div {
+        display: flex;
+        flex-direction: column;
+        row-gap: .625rem;
+
+        &>div {
+          display: flex;
+          gap: .125rem;
+
+          span:nth-child(1) {
+            font-size: 1.63rem;
+            font-family: DIN-BoldItalic, DIN;
+            font-weight: 600;
+            color: #04FFD5;
+            line-height: 1.31rem;
+            transform: skewX(-10deg);
+            text-shadow: 0px 0px 0px rgba(4, 255, 213, 0.23);
+
+          }
+
+          span:nth-child(2) {
+            font-size: 1rem;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #ABDFFF;
+          }
+        }
+
+        &>p:nth-child(1) {
+          font-size: 1rem;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #ABDFFF;
+          margin-bottom: 0px;
+        }
+      }
+    }
   }
-  td,
-  th {
-    vertical-align: middle;
+}
+
+.home_con_body {
+  width: 100%;
+  padding: 1rem;
+  box-sizing: border-box;
+}
+
+.home_header {
+  height: 3.125rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #fff;
+  font-size: 1.125rem;
+  font-weight: 600;
+}
+
+.home_header_line {
+  width: 100%;
+  height: .0625rem;
+  background-color: #fff;
+  opacity: 0.2;
+}
+
+.header {
+  width: 94%;
+  height: 7rem;
+  // overflow: hidden;
+  // transition: all 0.4s;
+  position: relative;
+  top: 0.5rem;
+  left: 3%;
+  box-shadow: 0.16rem 0.1rem 0.1rem 0.1rem #9d9b9b;
+  border-radius: 1rem;
+  padding: 0.4rem 0.7rem 0 1rem;
+  background: #fff;
+}
+
+.header_btn {
+  border-radius: 1rem;
+  padding: 0.1rem;
+  width: 5rem;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+}
+
+.header_top {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.ot {
+  position: relative;
+  top: -1.3rem;
+}
+
+.header_middle1 {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  .ft {
+    font-size: 1.5rem;
+    width: 5rem;
     text-align: center;
-    border: 0.1rem solid #dddddd; /* 单元格边框样式 */
-    padding: 0.02rem; /* 单元格内边距 */
-  }
-  .choose_item {
-    background: #c8c8c8;
   }
-  .footer {
-    display: flex;
-    justify-content: space-around;
-    width: 100%;
-    position: absolute;
-    bottom: 4.8rem;
+}
+
+.header_middle {
+  position: relative;
+  top: -0.3rem;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+/deep/ .btn-group>.btn,
+.btn-group-vertical>.btn {
+  background: #ffffff;
+  color: #2c3e50;
+  outline: none;
+  border: none;
+  margin: 0;
+  z-index: 3;
+}
+
+.header_footer {
+  position: relative;
+  top: -1.7rem;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  div {
+    font-size: 0.5rem;
+    color: rgb(244, 136, 42);
   }
+}
+
+.bdy {
+  width: 94%;
+  height: calc(100% - 18.7rem);
+  overflow: auto;
+  position: relative;
+  top: 1rem;
+  left: 3%;
+}
+
+/deep/td {
+  text-align: center;
+  vertical-align: middle;
+}
+
+table {
+  border-collapse: collapse;
+  /* 合并边框 */
+  width: 100%;
+  /* 表格宽度 */
+  background: #fff;
+  table-layout: fixed;
+}
+
+th {
+  font-size: 0.6rem;
+  background: #66b1f4;
+  color: #fff;
+}
+
+td {
+  font-size: 0.6rem;
+  word-break: break-all;
+}
+
+td,
+th {
+  vertical-align: middle;
+  text-align: center;
+  border: 0.1rem solid #dddddd;
+  /* 单元格边框样式 */
+  padding: 0.02rem;
+  /* 单元格内边距 */
+}
+
+.choose_item {
+  background: #c8c8c8;
+}
+
+.footer {
+  display: flex;
+  width: 100%;
+  position: absolute;
+  bottom: 4.8rem;
+}
 </style>

src/views/page/Inventory/index.vue

@@ -1,82 +1,29 @@
 <template>
   <div>
-    <div class="header">
-      <div class="header_top">
-        <Button
-          type="primary"
-          class="header_btn"
-          ghost
-          @click="handleShow"
-          :icon="is_show ? 'ios-arrow-dropup' : 'ios-arrow-dropdown'"
-        >
-          <div style="margin-right: 0.6rem">
-            {{ is_show ? "收起" : "展开" }}
-          </div></Button
-        >
-        <div style="margin-right: 1rem; color: #66a9f0">王小伟</div>
-      </div>
-      <div class="header_middle">
-        <b-dropdown size="sm" text="Large" class="m-2" :disabled="is_use">
-          <b-dropdown-item-button>Action</b-dropdown-item-button>
-          <b-dropdown-item-button>Another action</b-dropdown-item-button>
-          <b-dropdown-item-button>Something else here</b-dropdown-item-button>
-        </b-dropdown>
-        <b-dropdown size="sm" text="Large" class="m-2" :disabled="is_use">
-          <b-dropdown-item-button>Action</b-dropdown-item-button>
-          <b-dropdown-item-button>Another action</b-dropdown-item-button>
-          <b-dropdown-item-button>Something else here</b-dropdown-item-button>
-        </b-dropdown>
-        <b-dropdown size="sm" text="Large" class="m-2" :disabled="is_use">
-          <b-dropdown-item-button>Action</b-dropdown-item-button>
-          <b-dropdown-item-button>Another action</b-dropdown-item-button>
-          <b-dropdown-item-button>Something else here</b-dropdown-item-button>
-        </b-dropdown>
-      </div>
-      <div class="header_middle1 ot">
-        <div class="ft">58 &nbsp;</div>
-        <div class="ft">12 &nbsp;</div>
-        <div class="ft">12 &nbsp;</div>
-      </div>
-      <div class="header_footer">
-        <div style="margin-left: 1rem">已完成56/10</div>
-        <div style="margin-right: 1.4rem">已完成10%</div>
-      </div>
-    </div>
+
     <div class="bdy">
-      <div style="font-size: 1.3rem; font-weight: bold">发货单号</div>
-      <div>
-        <Select
-          v-model="selected"
-          style="
-            margin-top: 1rem;
-            height: 3.4rem;
-            width: 100%;
-            font-size: 1.5rem;
-            border-radius: 0.6rem;
-            background: #fff;
-            border: 0.1rem solid;
-          "
-          filterable
-          clearable
-          placeholder="请选择"
-        >
-         <Option v-for="(item,index) in options" :key="index" :label="item.text" :value="item.value"/>
-        </Select>
+
+      <div style="font-size: 1.3rem; font-weight: bold ; color: #fff;margin-bottom:1rem">包装单号</div>
+      <div class="secd_input_r">
+        <b-form-select id="input-3" :options="options" v-model="selected" class="inp select_list" style="height: 3rem"
+                       required placeholder="请选择站点"></b-form-select>
       </div>
       <div class="bdy_btn">
         <Button
-          type="primary"
-          class="header_btn"
-          style="margin-right: 3rem; height: 2.6rem"
-          @click="handleReturn"
+            type="warning"
+            ghost
+            class="header_btn"
+            style="margin-right: 3rem; height: 2.6rem"
+            @click="handleReturn"
         >
           返回</Button
         >
         <Button
-          type="primary"
-          class="header_btn"
-          style="margin-left: 3rem; height: 2.6rem"
-          @click="handelGoSure"
+
+            class="header_btn"
+            ghost
+            style="margin-left: 3rem; height: 2.6rem"
+            @click="handelGoSure"
         >
           确认</Button
         >
@@ -149,7 +96,7 @@ export default {
   background: #fff;
 }
 .header_btn {
-  border-radius: 1rem;
+  border-radius: .5rem;
   padding: 0.1rem;
   width: 5rem;
   display: flex;
@@ -203,30 +150,47 @@ export default {
   }
 }
 .bdy {
-  padding: 1rem;
-  position: relative;
+  height: 14.09rem;
+  background-image: url('../../../assets/home/packUpback.png');
+  background-size: 100% 100%;
+  padding: 1.78rem 2.03rem;
+  box-sizing: border-box;
+  position: absolute;
   width: 94%;
-
-  top: 3rem;
-  height: 14rem;
+  transform: translate(-50%,-50%);
+  top: 40%;
   border-radius: 1rem;
-  left: 3%;
-  box-shadow: 0.16rem 0.1rem 0.1rem 0.1rem #9d9b9b;
-  background: #fff;
+  left: 50%;
 }
 .bdy_btn {
-  margin-top: 3rem;
+  margin-top: 2rem;
 
   display: flex;
   justify-content: center;
   align-items: center;
 }
-/deep/ .ivu-select-selection{
+.select_list {
+  border-radius: 0.38rem;
+  border: 0.03rem solid #76CFFF;
+  background-color: #00000000;
+  outline: none;
+  padding: 0 .625rem;
+  box-sizing: border-box;
+  color: #fff;
+  width: 100%;
   height: 100%;
-  border:none;
+  font-weight: 500;
+  letter-spacing: 0.1rem;
 }
-/deep/.ivu-select-input{
-  height: 3.4rem;
-  font-size:1.5rem
+/deep/.inp {
+  background: #032a64 !important;
+  // opacity: 0.4;
+  //border: none;
+  color: #fff;
+}
+
+::-webkit-input-placeholder {
+  color: #ffffff84;
+  /* 设置占位符文字的颜色 */
 }
 </style>

src/views/page/Package/detail.vue

@@ -92,13 +92,13 @@ color: #ABDFFF;">展开</div>
       </div>
       <div class="header_middle">
         <b-dropdown size="sm" text="产品数" class="m-2" :disabled="is_use">
-         
+
         </b-dropdown>
         <b-dropdown size="sm" text="已包数" class="m-2" :disabled="is_use">
-         
+
         </b-dropdown>
         <b-dropdown size="sm" text="未包数" class="m-2" :disabled="is_use">
-         
+
         </b-dropdown>
       </div>
       <div class="header_middle1 ot">
@@ -107,7 +107,7 @@ color: #ABDFFF;">展开</div>
         <div class="ft">{{ this.product_total - this.box_num }} &nbsp;</div>
       </div>
       <div class="header_footer">
-        
+
       </div>
     </div>
     <div class="bdy">
@@ -160,11 +160,7 @@ export default {
 
     const data = {
       url: 'http://121.36.142.167:7774/jbl/api/module-data/sale_order/page',
-<<<<<<< HEAD
       post: {"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[{"field":"exe_sale_order_b.no","option":"LIKE_ANYWHERE","values":[this.$route.query.id]}],"size":15,"specialConditions":[],"workflowSearchBean":{},"dynamicFormCode":"sale_order","dynamicFormTable":null,"ignoreField":true,"developmentSystemId":null,"debugFlag":true}
-=======
-      post: { "direction": "DESC", "property": "id", "fromClientType": "pc", "number": 0, "sorts": [], "rules": [{ "field": "exe_sale_order_b.no", "option": "LIKE_ANYWHERE", "values": ["SO202308070001"] }], "size": 15, "specialConditions": [], "workflowSearchBean": {}, "dynamicFormCode": "sale_order", "dynamicFormTable": null, "ignoreField": true, "developmentSystemId": null, "debugFlag": true }
->>>>>>> 2baf6b15e6a037b9f129e53ff9b04b009505652e
     }
     this.initData(data)
   },

src/views/page/Package/index.vue

@@ -1,82 +1,28 @@
 <template>
   <div>
-    <div class="header">
-      <div class="header_top">
-        <Button
-          type="primary"
-          class="header_btn"
-          ghost
-          @click="handleShow"
-          :icon="is_show ? 'ios-arrow-dropup' : 'ios-arrow-dropdown'"
-        >
-          <div style="margin-right: 0.6rem">
-            {{ is_show ? "收起" : "展开" }}
-          </div></Button
-        >
-        <div style="margin-right: 1rem; color: #66a9f0">王小伟</div>
-      </div>
-      <div class="header_middle">
-        <b-dropdown size="sm" text="Large" class="m-2" :disabled="is_use">
-          <b-dropdown-item-button>Action</b-dropdown-item-button>
-          <b-dropdown-item-button>Another action</b-dropdown-item-button>
-          <b-dropdown-item-button>Something else here</b-dropdown-item-button>
-        </b-dropdown>
-        <b-dropdown size="sm" text="Large" class="m-2" :disabled="is_use">
-          <b-dropdown-item-button>Action</b-dropdown-item-button>
-          <b-dropdown-item-button>Another action</b-dropdown-item-button>
-          <b-dropdown-item-button>Something else here</b-dropdown-item-button>
-        </b-dropdown>
-        <b-dropdown size="sm" text="Large" class="m-2" :disabled="is_use">
-          <b-dropdown-item-button>Action</b-dropdown-item-button>
-          <b-dropdown-item-button>Another action</b-dropdown-item-button>
-          <b-dropdown-item-button>Something else here</b-dropdown-item-button>
-        </b-dropdown>
-      </div>
-      <div class="header_middle1 ot">
-        <div class="ft">58 &nbsp;</div>
-        <div class="ft">12 &nbsp;</div>
-        <div class="ft">12 &nbsp;</div>
-      </div>
-      <div class="header_footer">
-        <div style="margin-left: 1rem">已完成56/10</div>
-        <div style="margin-right: 1.4rem">已完成10%</div>
-      </div>
-    </div>
     <div class="bdy">
-      <div style="font-size: 1.3rem; font-weight: bold">销售单号</div>
-      <div>
-        <Select
-          v-model="selected"
-          style="
-            margin-top: 1rem;
-            height: 3.4rem;
-            width: 100%;
-            font-size: 1.5rem;
-            border-radius: 0.6rem;
-            background: #fff;
-            border: 0.1rem solid;
-          "
-          filterable
-          clearable
-          placeholder="请选择"
-        >
-         <Option v-for="(item,index) in options" :key="index" :label="item.text" :value="item.value"/>
-        </Select>
+
+      <div style="font-size: 1.3rem; font-weight: bold ; color: #fff;margin-bottom:1rem">销售单号</div>
+      <div class="secd_input_r">
+        <b-form-select id="input-3" :options="options" v-model="selected" class="inp select_list" style="height: 3rem"
+                       required placeholder="请选择站点"></b-form-select>
       </div>
       <div class="bdy_btn">
         <Button
-          type="primary"
-          class="header_btn"
-          style="margin-right: 3rem; height: 2.6rem"
-          @click="handleReturn"
+            type="warning"
+            ghost
+            class="header_btn"
+            style="margin-right: 3rem; height: 2.6rem"
+            @click="handleReturn"
         >
           返回</Button
         >
         <Button
-          type="primary"
-          class="header_btn"
-          style="margin-left: 3rem; height: 2.6rem"
-          @click="handelGoSure"
+
+            class="header_btn"
+            ghost
+            style="margin-left: 3rem; height: 2.6rem"
+            @click="handelGoSure"
         >
           确认</Button
         >
@@ -149,7 +95,7 @@ export default {
   background: #fff;
 }
 .header_btn {
-  border-radius: 1rem;
+  border-radius: .5rem;
   padding: 0.1rem;
   width: 5rem;
   display: flex;
@@ -203,30 +149,47 @@ export default {
   }
 }
 .bdy {
-  padding: 1rem;
-  position: relative;
+  height: 14.09rem;
+  background-image: url('../../../assets/home/packUpback.png');
+  background-size: 100% 100%;
+  padding: 1.78rem 2.03rem;
+  box-sizing: border-box;
+  position: absolute;
   width: 94%;
-
-  top: 3rem;
-  height: 14rem;
+  transform: translate(-50%,-50%);
+  top: 40%;
   border-radius: 1rem;
-  left: 3%;
-  box-shadow: 0.16rem 0.1rem 0.1rem 0.1rem #9d9b9b;
-  background: #fff;
+  left: 50%;
 }
 .bdy_btn {
-  margin-top: 3rem;
+  margin-top: 2rem;
 
   display: flex;
   justify-content: center;
   align-items: center;
 }
-/deep/ .ivu-select-selection{
+.select_list {
+  border-radius: 0.38rem;
+  border: 0.03rem solid #76CFFF;
+  background-color: #00000000;
+  outline: none;
+  padding: 0 .625rem;
+  box-sizing: border-box;
+  color: #fff;
+  width: 100%;
   height: 100%;
-  border:none;
+  font-weight: 500;
+  letter-spacing: 0.1rem;
 }
-/deep/.ivu-select-input{
-  height: 3.4rem;
-  font-size:1.5rem
+/deep/.inp {
+  background: #032a64 !important;
+  // opacity: 0.4;
+  //border: none;
+  color: #fff;
+}
+
+::-webkit-input-placeholder {
+  color: #ffffff84;
+  /* 设置占位符文字的颜色 */
 }
 </style>