Merge branch master

src/views/formulationPlan/dailyExecutionPlan/index.vue

@@ -823,11 +823,12 @@ export default {
   },
   methods: {
     getTMRList(){
-
-      this.table.getdataListParm.parammaps.mydate = this.table.getdataListParm.parammaps.mydate
+  console.log('11111111')
+      this.getTmrListParam.parammaps.mydate = this.table.getdataListParm.parammaps.mydate
 
         GetDataByName(this.getTmrListParam).then(response => {
         if (response.data.list !== null) {
+          console.log('11111111',response)
           this.tmrDownList = response.data.list
            
         }  

src/views/formulationPlan/pushMaterialPlan/index.vue

@@ -7,7 +7,7 @@
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" style="float: left;" @click="handleCreate2">设置允许误差时间</el-button>
 
       
-      <el-button v-if="isRoleEdit" class="success" icon="el-icon-open" style="float: left;" @click="handleTakeEffect">启用</el-button>
+     <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="success" style="float: left;" @click="handleCheck">校验</el-button>
  
@@ -93,8 +93,7 @@
       </template>
       <div class="app-add">
         <el-form ref="temp" :rules="create1.rules" :model="create1.temp" label-position="right" label-width="155px" style="width: 100%;margin:0 auto 50px">
-       
-           
+        
           <el-row>
               <el-col :span="6">
                 <el-form-item label="设置时间：" prop="useinbarid">
@@ -102,8 +101,7 @@
                     v-model="timevalue1"
                     :picker-options="{ selectableRange: '00:00:00 - 23:59:59' }"
                      value-format="HH:mm"
-                     @change="change_time1"
-    format="HH:mm"
+                     @change="change_time1" format="HH:mm"
                     placeholder="任意时间点">
                   </el-time-picker>
                 </el-form-item>
@@ -115,19 +113,64 @@
 
             </el-row>
 
-         
+        
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button class="cancelClose" @click="create1.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button class="save"  @click="handleCreate1">确认</el-button>
+        </div>
+      </div>
+    </el-dialog>
 
- 
-  
 
-       
+    <el-dialog :fullscreen="dialogFull" :visible.sync="create2.dialogFormVisible" :close-on-click-modal="false" width="50%">
+      <template slot="title">
+        <div class="avue-crud__dialog__header">
+          <span class="el-dialog__title">
+            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
+            允许误差时间
+          </span>
+          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
+            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
+            <svg-icon v-else icon-class="fullscreen" />
+          </div>
+        </div>
+      </template>
+      <div class="app-add">
+        <el-form ref="temp" :rules="create2.rules" :model="create2.temp" label-position="right" label-width="155px" style="width: 100%;margin:0 auto 50px">
+        
+          <el-row>
+              <el-col :span="6">
+              <el-form-item label="允许误差时间(分钟)：" prop="time">
+                <el-input ref="time" v-model="create2.temp.time" class="filter-item" placeholder="请输入" type="text" />
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+           
+
+        
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="create1.dialogFormVisible = false;getList()">关闭</el-button>
-          <el-button class="save"  @click="handleCreate">确认</el-button>
+          <el-button class="cancelClose" @click="create2.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button class="save"  @click="handleCreate2">确认</el-button>
         </div>
       </div>
     </el-dialog>
+
+
+   <!-- 校验 -->
+    <el-dialog title="提示" :destroy-on-close="true" :visible.sync="check.dialogFormVisible" :close-on-click-modal="false" width="30%">
+      <div class="check">
+        <p v-if="check.temp.isDistribution == '0'">当前有栏舍未分配，建议及时进行分配，未分配栏舍如下：</p>
+        <p v-else>已分配完：当前栏舍已分配完善</p>
+        {{ check.temp.bnames }}
+      </div>
+      <div slot="footer" class="dialog-footer" style="bottom: 10px;">
+        <el-button class="save" @click="check.dialogFormVisible=false;">确认</el-button>
+      </div>
+    </el-dialog>
+    
  
     
   </div>
@@ -176,9 +219,53 @@ export default {
       },
 
 
+      create1: {
+        dialogFormVisible: false,
+        dialogStatus: '',
+        temp: { pastureid: Cookies.get('pastureid'), fname: ''},
+        rules: {
+          // fname: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
+          // fclassid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
+          // feedcode: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+        }
+      },
 
-      timevalue1: new Date(2016, 9, 10, 18, 40),
-      timetags1: ['8:40','9:00','10:00'],
+      create2: {
+        dialogFormVisible: false,
+        dialogStatus: '',
+        temp: { pastureid: Cookies.get('pastureid'), time: ''},
+        rules: {
+          // fname: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
+          // fclassid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
+          // feedcode: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+        }
+      },
+
+      check: {
+        dialogFormVisible: false,
+        dialogStatus: '',
+        getCheckParm: {
+          name: 'checkRemainplan',
+          page: 1,
+          offset: 1,
+          pagecount: 10,
+          returntype: 'Map',
+          parammaps: {
+            pastureid: Cookies.get('pastureid')
+          }
+        },
+        temp: {
+          bnames: '',
+          isDistribution: ''
+        }
+      },
+
+
+
+
+
+      timevalue1: new Date(2022, 9, 10, 18, 40),
+      timetags1: [],
 
 
 
@@ -188,26 +275,15 @@ export default {
       headerList: [],
       pickerMinDate: '',
  
-      tnameList: [], // 配方名 称
-      recipeTemplateList: [], // 配方模板
-      feedingFormulaList: [], // 补料配方
-      livestockTypeList: [], // 类别
-      barList: [],
+   
       rules: {
         cowclassid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
       },
       
       selectList: [],
    
-     
-      textMap: {
-        Nutritional: '营养评估',
-        history: '历史记录'
-      },
-      focusWRow: {}, // 一班重量得到焦点暂存
-      focusWRow2: {}, // 2班重量得到焦点暂存
-      focusWRow3: {}, // 3班重量得到焦点暂存
-      focusWRow4: {}, // 4班重量得到焦点暂存
+   
+       
 
       requestParam: {},
       download: {
@@ -234,16 +310,7 @@ export default {
       oldRowList:{},
 
 
-      create1: {
-        dialogFormVisible: false,
-        dialogStatus: '',
-        temp: { pastureid: Cookies.get('pastureid'), fname: '', fclassid: '', fclass: '', feedcode: '', source: '用户自定义', printgroupid: '1', printgroup: '无', unitweight: '', uprice: '', allowratio: '', autozone: '', autosecond: '0', autosecondname: '禁用', confirmstart: '0', confirmstartname: '禁用', enable: '1', trgaddress: '', backup1: '', backup2: '', backup3: '', sort: '' },
-        rules: {
-          // fname: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          // fclassid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          // feedcode: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
-        }
-      },
+      
 
 
 
@@ -271,7 +338,7 @@ export default {
         if (response.data.list !== null) {
           this.timeList = response.data.list
         } else {
-          this.tnameList = []
+          this.timeList = []
         }
       })
     },
@@ -289,6 +356,17 @@ export default {
       this.create1.temp = { pastureid: Cookies.get('pastureid'), 'myId': (new Date()).valueOf(), 'Edit': true, 'NoEdit': false, 'isCreate': true, 'isUpdate': false, 'isUpdateSave': false, 'enable': 1, 'sort': "", 'ftid': '', 'ftname': '', 'tmrcode': '', 'tmrid': '', 'times': '', 'lppcode': '', 'lppid': '', 'rtime': '', barid: '', 'treatmethod': '', 'useinbar': '', 'useinbarid': '' }
     },
 
+    handleCreate2() {
+      console.log('点击了新增')
+      this.resetTemp2()
+      this.dialogFull = false
+      this.create2.dialogStatus = 'create'
+      this.create2.dialogFormVisible = true
+    },
+     resetTemp2() {
+      this.create2.temp = { pastureid: Cookies.get('pastureid'), 'myId': (new Date()).valueOf(), 'Edit': true, 'NoEdit': false, 'isCreate': true, 'isUpdate': false, 'isUpdateSave': false, 'enable': 1, 'sort': "", 'ftid': '', 'ftname': '', 'tmrcode': '', 'tmrid': '', 'times': '', 'lppcode': '', 'lppid': '', 'rtime': '', barid: '', 'treatmethod': '', 'useinbar': '', 'useinbarid': '' }
+    },
+
 
 
  
@@ -324,13 +402,114 @@ export default {
     },
 
 
-    change_time1(e){
-console.log(e)
+    change_time1(tag){
+      console.log("tag", tag)
+        console.log("timetags1", this.timetags1)
+  
+     this.timetags1.push(tag)
+
+    },
+
+
+
+
+    tag_close1(tag){
+        console.log("tag", tag)
+        console.log("timetags1", this.timetags1)
+        this.timetags1.splice(this.timetags1.indexOf(tag), 1);
     },
 
-    tag_close1(e){
-console.log(e)
+
+
+
+    // 校验
+    handleCheck() {
+      console.log('点击了校验')
+      this.check.dialogStatus = 'check'
+      this.check.dialogFormVisible = true
+      this.getCheckList()
+    },
+    getCheckList() {
+      GetDataByName(this.check.getCheckParm).then(response => {
+        if (response.data.list[0].bnames !== undefined) {
+          this.check.temp.isDistribution = 0
+          this.check.temp.bnames = response.data.list[0].bnames
+        } else {
+          this.check.temp = {}
+          this.check.temp.isDistribution = 1
+        }
+      })
+    },
+
+    handleTakeEffect() {
+      if (this.selectList.length == 0) {
+        this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
+      } else {
+        MessageBox.confirm('当前选中' + this.selectList.length + '条信息，是否生效?', {
+          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        }).then(() => {
+          for (let i = 0; i < this.selectList.length; i++) {
+            // this.$set(this.selectList[i], 'enable', '1')
+            this.selectList[i].enable = 1
+          }
+          console.log('生效', this.selectList)
+          this.requestParam.common = { 'returnmap': '0' }
+          this.requestParam.data = []
+          this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.selectList }}
+          this.requestParam.data[0].children = []
+          this.requestParam.data[0].children[0] = { 'name': 'updateRemainplanEnable', 'type': 'e', 'parammaps': {
+            enable: '@insertSpotList.enable',
+            id: '@insertSpotList.id',
+            pastureid: '@insertSpotList.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()
+            }
+          })
+        })
+      }
     },
+    handleDisable() {
+      if (this.selectList.length == 0) {
+        this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
+      } else {
+        MessageBox.confirm('当前选中' + this.selectList.length + '条信息，是否禁用?', {
+          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        }).then(() => {
+          for (let i = 0; i < this.selectList.length; i++) {
+            // this.$set(this.selectList[i], 'enable', '1')
+            this.selectList[i].enable = 0
+          }
+          console.log('禁用', this.selectList)
+          this.requestParam.common = { 'returnmap': '0' }
+          this.requestParam.data = []
+          this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.selectList }}
+          this.requestParam.data[0].children = []
+          this.requestParam.data[0].children[0] = { 'name': 'updateRemainplanEnable', 'type': 'e', 'parammaps': {
+            enable: '@insertSpotList.enable',
+            id: '@insertSpotList.id',
+            pastureid: '@insertSpotList.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()
+            }
+          })
+        })
+      }
+    },
+
+
+