Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/assets

src/components/Materialman/InventoryBosun.vue

@@ -124,13 +124,15 @@
           DetailList: []
         },
         isCheckAll:false,
-        checkList:[]
+        checkList:[],
+        isFrom:0
       };
     },
     mounted() {
       this.msg.CheckId = this.$route.query.CheckId;
       this.saveMsg.CheckId = this.$route.query.CheckId;
       this.saveMsg.WarehouseId = this.$route.query.WarehouseId;
+      this.isFrom = this.$route.query.isFrom;
       this.getList();
       this.getCheckStatus();
     },
@@ -152,8 +154,14 @@
         );
       },
       Backto() {
+        let path='';
+        if(this.isFrom==1){
+          path='/InventoryDetails'
+        }else{
+          path='/InventoryDetail'
+        }
         this.$router.push({
-          path: "/InventoryDetail",
+          path: path,
           query: {
             CheckId: this.msg.CheckId
           }

src/components/Materialman/InventoryBoyi.vue

@@ -93,13 +93,15 @@
           DetailList: []
         },
         isCheckAll:false,
-        checkList:[]
+        checkList:[],
+        isFrom:0
       };
     },
     mounted() {
       this.msg.CheckId = this.$route.query.CheckId;
       this.saveMsg.CheckId = this.$route.query.CheckId;
       this.saveMsg.WarehouseId = this.$route.query.WarehouseId;
+      this.isFrom = this.$route.query.isFrom;
       this.getList();
     },
     methods: {
@@ -108,8 +110,14 @@
         this.getList();
       },
       Backto() {
+        let path='';
+        if(this.isFrom==1){
+          path='/InventoryDetails'
+        }else{
+          path='/InventoryDetail'
+        }
         this.$router.push({
-          path: "/InventoryDetail",
+          path: path,
           query: {
             CheckId: this.msg.CheckId
           }

src/components/Materialman/consumablesInventory.vue

@@ -94,7 +94,7 @@
                       <img  v-if="row.CheckState==2" @click="SeeDetails(row,'/InventoryDetails')" style="width:24px;height:24px" src="../../assets/img/chakan.png" alt="" />
                   </el-tooltip>
                   <el-tooltip class="item" effect="dark"  content="盘点明细" placement="top" v-if="row.CheckState==1">
-                      <img v-if="row.CheckState==1" @click="SeeDetails(row,'/InventoryDetail')" style="width:24px;height:24px" src="../../assets/img/sz.png" alt="" />
+                      <img v-if="row.CheckState==1" @click="SeeDetails(row,'/InventoryDetail')" style="width:24px;height:24px" src="../../assets/img/shtg.png" alt="" />
                   </el-tooltip>
                     <el-tooltip class="item" effect="dark"  content="下载明细" placement="top" v-if="row.CheckState==1">
                       <img v-if="row.CheckState == 1" @click="" style="width:24px;height:24px" src="../../assets/img/xz.png" alt="" />
@@ -121,7 +121,7 @@
       :close-on-click-modal="false"
       :visible.sync="dialogState"
       top="0"
-      width="620px"
+      width="680px"
     >
       <el-form
         class="MyEditForm"
@@ -150,16 +150,17 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item class="dateList" label="" style="width:300px">
+            <el-form-item class="dateList" label="" style="width:360px">
               <span class="label">计划时间</span>
               <div>
-                  <el-date-picker style="width:300px"
+                  <el-date-picker style="width:360px"
                     v-model="dateList"
-                    type="daterange"
+                    type="datetimerange"
                     range-separator="至"
-                    value-format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd HH:mm:ss"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
+                    :default-time="['09:30:00', '18:00:00']"
                     >
                     </el-date-picker>
               </div>
@@ -269,7 +270,8 @@ export default {
             path: path,
             query: { 
                 CheckId:item.Id,
-                WarehouseId:item.WarehouseId
+                WarehouseId:item.WarehouseId,
+                CheckState:item.CheckState
             }
         });
         
@@ -289,7 +291,7 @@ export default {
       this.dialogdisabled = false
     },
     Edit(item) {
-        this.dialogdisabled = true
+      this.dialogdisabled = true
       this.dialogtitle = "编辑";
       this.dialogState = true;
       let itemdata =Object.assign({}, item)
@@ -297,9 +299,7 @@ export default {
       this.addMsg.WarehouseId =itemdata.WarehouseId ;
       this.addMsg.StartDate =itemdata.StartDate ;
       this.addMsg.EndDate =itemdata.EndDate ;
-      this.dateList=[];
-      this.dateList[0]=this.addMsg.StartDate;
-      this.dateList[1]=this.addMsg.EndDate;
+      this.dateList=[this.addMsg.StartDate,this.addMsg.EndDate];
     },
     Delete(item) {
       let Id = item.Id;
@@ -399,7 +399,6 @@ export default {
           if (res.data.resultCode === 1) {
             this.tableData = res.data.data.pageData;
             this.total = res.data.data.count;
-            console.log(this.tableData,'tableData');
           } else {
             this.Error(res.data.message);
           }