更新5-24

src/views/formulationPlan/dailyExecutionPlan/index.vue

@@ -711,7 +711,7 @@
     <el-dialog :title="textMap[deleteRecord.dialogStatus]" :destroy-on-close="true" :visible.sync="deleteRecord.dialogFormVisible" :close-on-click-modal="false" width="90%">
       <div class="deleteRecord">
         <div class="search">
-          <el-date-picker v-model="deleteRecord.mydate" type="date" placeholder="选择日期" style="width: 150px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :clearable="false" @change="changeDate" />
+          <el-date-picker v-model="deleteRecord.mydate" type="date" placeholder="选择日期" style="width: 150px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :clearable="false" @change="changeDeleteRecordDate" />
         </div>
         <div class="table">
           <el-table
@@ -744,7 +744,7 @@
             <el-table-column label="理论量" min-width="80px" align="center" prop="lweight" />
             <el-table-column label="启用" min-width="70px" align="center">
               <template slot-scope="scope">
-                <el-switch v-if="dataDisabled == false" v-model="scope.row.enable" :disabled="scope.row.havebutton == 1" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" @change="handleEnableChange(scope.row)" />
+                <el-switch v-if="dataDisabled == false" disabled v-model="scope.row.enable" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" @change="handleEnableChange(scope.row)" />
                 <el-switch v-else v-model="scope.row.enable" disabled active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" @change="handleEnableChange(scope.row)" />
               </template>
             </el-table-column>
@@ -2253,6 +2253,31 @@ export default {
     handleDeleteRecord(){
       this.deleteRecord.dialogStatus = 'deleteRecord'
       this.deleteRecord.dialogFormVisible = true
+      this.deleteRecord.mydate = this.table.getdataListParm.parammaps.mydate
+      this.getDeleteRecordList()
+    },
+    changeDeleteRecordDate(){
+      this.getDeleteRecordList()
+    },
+    getDeleteRecordList(){
+      const url = 'authdata/GetDataByName'
+      const data = {}
+      data.name = 'getDownloadedplanDeleteList'
+      data.page = 1
+      data.offset = 1
+      data.pagecount = ""
+      data.returntype = "Map"
+      data.parammaps = {}
+      data.parammaps.pastureid = Cookies.get('pastureid')
+      data.parammaps.mydate = this.deleteRecord.mydate
+      postJson(url, data).then(response => {
+        if(response.data !== null){
+          this.deleteRecord.list = response.data.list
+        }else{
+          this.deleteRecord.list = []
+        }
+        this.deleteRecord.total = response.data.total
+      })
     }
   }
 }

src/views/formulationPlan/dailyExecutionPlan/typePage/materialIssuancePlan.vue

@@ -3,32 +3,16 @@
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" style="float:left;" @click="handleCreate">新增车次
       </el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" style="float:left;" @click="handleReduceTrains">
-        减少车次</el-button>
-      <el-button
-        v-if="isOrder && isRoleEdit"
-        icon="el-icon-sort"
-        style="float: left;"
-        class="success"
-        @click="handleChangeOrder"
-      >更改顺序</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" style="float:left;" @click="handleReduceTrains">减少车次</el-button>
+      <el-button v-if="isOrder && isRoleEdit" icon="el-icon-sort" style="float: left;" class="success" @click="handleChangeOrder" >更改顺序</el-button>
       <div v-else style="float: left;margin-left: 10px;">
-        <el-button v-if="isRoleEdit" icon="el-icon-folder-checked" class="success" @click="saveChangeOrder">保存
-        </el-button>
+        <el-button v-if="isRoleEdit" icon="el-icon-folder-checked" class="success" @click="saveChangeOrder">保存 </el-button>
         <el-button v-if="isRoleEdit" icon="el-icon-close" class="sortCancel" @click="cancelChangeOrder">取消</el-button>
       </div>
-      <el-button v-if="isRoleEdit" class="success" icon="el-icon-open" style="float: left;" @click="handleTakeEffect">
-        生效</el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-turn-off" style="float: left;" @click="handleDisable">
-        禁用</el-button>
-        <el-select
-          v-model="table.getdataListParm.parammaps.times"
-          filterable
-          placeholder="班次"
-          class="filter-item"
-          style="width: 120px;"
-          @change="changeFrequency"
-        >
+      <el-button v-if="isRoleEdit" class="success" icon="el-icon-open" style="float: left;" @click="handleTakeEffect"> 生效</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-turn-off" style="float: left;" @click="handleDisable"> 禁用</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" style="float: left;" @click="handleAllEmpty"> 清空已分配栏舍</el-button>
+        <el-select v-model="table.getdataListParm.parammaps.times" filterable placeholder="班次" class="filter-item" style="width: 120px;" @change="changeFrequency" >
           <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
     </div>
@@ -1762,6 +1746,26 @@ export default {
         }
 
       })
+    },
+    handleAllEmpty(){
+      MessageBox.confirm('执行该操作会将现有车次已分配的撒料栏舍全部清空，是否要执行该操作?', {
+        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      }).then(() => {
+        this.requestParam = {}
+        this.requestParam.common = { 'returnmap': '0' }
+        this.requestParam.data = []
+        this.requestParam.data[0] = { 'name': 'deleteLpplandtl1dateAll', 'type': 'e', 'parammaps': { pastureid:  Cookies.get('pastureid'),date:this.date }},
+        this.requestParam.data[1] = { 'name': 'deletefpdetaildateAll', 'type': 'e', 'parammaps': { pastureid:  Cookies.get('pastureid'),date:this.date }},
+        ExecDataByConfig(this.requestParam).then(response => {
+          console.log('清空已分配栏舍', this.requestParam)
+          if (response.msg === 'fail') {
+            this.$notify({ title: '清空失败', message: response.data, type: 'warning', duration: 2000 })
+          } else {
+            this.$notify({ title: '清空成功', message: '清空成功', type: 'success', duration: 2000 })
+            this.getList()
+          }
+        })
+      })
     }
   }
 }

src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -13,6 +13,7 @@
       </div>
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-open" style="float: left;" @click="handleTakeEffect"> 生效</el-button>
       <el-button v-if="isRoleEdit" class="danger" icon="el-icon-turn-off" style="float: left;" @click="handleDisable"> 禁用</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" style="float: left;" @click="handleAllEmpty"> 清空已分配栏舍</el-button>
       <el-select v-model="table.getdataListParm.parammaps.times" filterable placeholder="班次" class="filter-item" style="width: 120px;float: left;margin-left: 10px;" @change="changeFrequency">
         <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
@@ -1471,6 +1472,26 @@ export default {
           this.getCreateList1()
         }
       })
+    },
+    handleAllEmpty(){
+      MessageBox.confirm('执行该操作会将现有车次已分配的撒料栏舍全部清空，是否要执行该操作?', {
+        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      }).then(() => {
+        this.requestParam = {}
+        this.requestParam.common = { 'returnmap': '0' }
+        this.requestParam.data = []
+        this.requestParam.data[0] = { 'name': 'deleteLpplandtl1All', 'type': 'e', 'parammaps': { pastureid:  Cookies.get('pastureid') }},
+        this.requestParam.data[1] = { 'name': 'deletefpdetailAll', 'type': 'e', 'parammaps': { pastureid:  Cookies.get('pastureid') }},
+        ExecDataByConfig(this.requestParam).then(response => {
+          console.log('清空已分配栏舍', this.requestParam)
+          if (response.msg === 'fail') {
+            this.$notify({ title: '清空失败', message: response.data, type: 'warning', duration: 2000 })
+          } else {
+            this.$notify({ title: '清空成功', message: '清空成功', type: 'success', duration: 2000 })
+            this.getList()
+          }
+        })
+      })
     }
   }
 }