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

src/components/Materialman/consumablesInventory.vue

@@ -176,6 +176,49 @@
         </div>
       </el-form>
     </el-dialog>
+    <el-dialog
+      title="复盘时间"
+      :close-on-click-modal="false"
+      :visible.sync="dialogState2"
+      top="0"
+      width="680px"
+    >
+      <el-form
+        class="MyEditForm"
+        :model="addMsg"
+        :rules="rules"
+        ref="addMsg"
+        label-width="0px"
+      >
+        <div class="basefix">
+          <div class="baseform">
+          
+            <el-form-item class="dateList" label="" style="width:450px">
+              <span class="label">计划时间</span>
+              <div>
+                  <el-date-picker style="width:450px"
+                    v-model="dateList2"
+                    type="datetimerange"
+                    range-separator="至"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    :default-time="['09:30:00', '18:00:00']"
+                    >
+                    </el-date-picker>
+              </div>
+              
+            </el-form-item>
+          </div>
+        </div>
+        <div class="btnformItem">
+          <span v-loading="queryLoad2" class="submitBtn" type="primary" @click="analyseForm()"
+            >确定</span
+          >
+          <span class="exitBtn" @click="dialogState2 = false">取消</span>
+        </div>
+      </el-form>
+    </el-dialog>
 
   </div>
 </template>
@@ -192,6 +235,7 @@ export default {
     return {
       valueConsistsOf: 'ALL',
       queryLoad:false,
+      queryLoad2:false,
       addMsg: {
         Id: 0,
         WarehouseId:'',
@@ -200,6 +244,7 @@ export default {
       },
       morequery: false,
       dateList: [],
+      dateList2:[],
       currentPage: 1,
       tableData: [],
       loading: false,
@@ -212,13 +257,16 @@ export default {
         CheckState:0,
       },
         repeatMsg:{
-          
+          CheckId:0,
+          StartTime:'',
+          EndTime:''
         },
 
         getWareHouseList:[],
         getCheckStatusList:[],
         dialogtitle: "新增",
         dialogState: false,
+        dialogState2: false,
         rules: {
             Name: [{ required: true, message: "请输入名称", trigger: "blur" }],
             WarehouseId: [
@@ -230,6 +278,7 @@ export default {
  
     
       dialogdisabled:false,
+   
     };
   },
   mounted() {
@@ -334,19 +383,30 @@ export default {
         });
     },
     analyse(item){
-          let Id = item.Id;
-      this.$confirm("确认复盘？", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          this.apiJavaPost(
-            "/api/supplies/RepeatSuppliesCheck",
-            { CheckId: Id },
+          this.repeatMsg.CheckId = item.Id;
+          this.repeatMsg.StartTime = '';
+          this.repeatMsg.EndTime = '';
+          this.dialogState2 = true;
+          this.dateList2 = [];
+
+    },
+    analyseForm(){
+        if(this.dateList2 && this.dateList2.length>0){
+                this.repeatMsg.StartTime=this.dateList2[0];
+                this.repeatMsg.EndTime=this.dateList2[1];
+          }
+          if( this.repeatMsg.StartTime=='' &&  this.repeatMsg.EndTime==''){
+             this.Error('请选择时间！')
+            return
+          }
+          this.queryLoad2 = true
+           this.apiJavaPost(
+            "/api/supplies/RepeatSuppliesCheck", this.repeatMsg,
             res => {
+               this.queryLoad2 = false
               if (res.data.resultCode === 1) {
                 this.getList();
+                 this.dialogState2 = false;
                 this.Success(res.data.message);
               } else {
                 this.Error(res.data.message);
@@ -354,10 +414,7 @@ export default {
             },
             null
           );
-        })
-        .catch(() => {
-          this.$message.info("已取消复盘！");
-        });
+
     },
     submitForm(formName) {
       this.$refs[formName].validate(valid => {