Signed-off-by: 段小段 <1729609802@qq.com>

src/views/formulationPlan/dailyExecutionPlan/index.vue

@@ -566,7 +566,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <p v-if="newGeneration.temp.tips == true" style="font-weight: 700;color: red;text-align: center;">注：撒料计划中存在未分配完栏舍，如下所示；建议及时进行分配</p>
+          <p v-if="newGeneration.temp.tips == true || newGeneration.dialogStatus == 'copy'" style="font-weight: 700;color: red;text-align: center;">注：撒料计划中存在未分配完栏舍，如下所示；建议及时进行分配</p>
           <div style="height: 200px;overflow: auto;">
             <div v-if="myMaxTimes == 1">
               <div>第一班：</div>

src/views/statisticalAnalysis/inventoryManagement/pasture/index.vue

@@ -768,25 +768,22 @@ export default {
               headerArr.push(exportTitle1[i])
             }
           }
-        } else {
-          for (let i = 0; i < exportTitle1.length; i++) {
-            if (i > 0) {
-              headerArr.push(exportTitle1[i], '')
-            } else {
-              headerArr.push(exportTitle1[i])
-            }
+        } else {
+          if(this.tab2.table.getdataListParm.parammaps.typea == ''){
+            for (let i = 0; i < exportTitle1.length; i++) {
+              if (i > 0) {
+                headerArr.push(exportTitle1[i], '')
+              } else {
+                headerArr.push(exportTitle1[i])
+              }
+            }
+          }else{
+            headerArr = exportTitle1
           }
         }
-        console.log('一级表头处理后', headerArr)
-        // var valueArr = [] // 对应字段
-        // for (let i = 0; i < exportTitle2.length; i++) {
-        //   if (i == 0) {
-        //     valueArr.push('A')
-        //   } else {
-        //     valueArr.push('a' + [i - 1])
-        //   }
-        // }
-        // console.log('对应字段valueArr', valueArr)
+        console.log('headerArr', headerArr)
+        console.log('exportTitle2', exportTitle2)
+        console.log('filterValArr', filterValArr)
         if (headerArr.length > 0) {
           import('@/vendor/Export3Excel').then((excel) => {
             const multiHeader = [
@@ -800,6 +797,20 @@ export default {
             const merges = ['A1:A1']
             excel.export_json_to_excel({ multiHeader, multiHeader2, header: tHeader, data, filename: '用料分析', merges })
           })
+        }else{
+          import('@/vendor/Export3Excel').then((excel) => {
+            const multiHeader = [
+              headerArr
+            ]
+            const multiHeader2 = []
+            const tHeader = exportTitle2
+            const filterVal = filterValArr
+            const data = this.tab2.table.list.map(v => filterVal.map(j => v[j]))
+            // const data = []
+            // const merges = ['A1:A1']
+            const merges = []
+            excel.export_json_to_excel({ multiHeader, multiHeader2, header: tHeader, data, filename: '用料分析', merges })
+          })
         }
       } else if (item == 'tab3') {
         console.log('价格分析导出')

src/views/systemManagement/dataSynchronization/index.vue

@@ -26,6 +26,7 @@
         <el-divider></el-divider>
         <el-form-item label="手动同步：">
           <el-button class="successBorder" :disabled="form.cmo == ''" @click="handleSyncNow">立刻同步</el-button>
+           <el-date-picker v-model="form.date" :clearable="false"  :disabled="form.cmo == ''" style="margin-left: 10px;" type="date" placeholder="选择日期"> </el-date-picker>
         </el-form-item>
         <el-form-item label="同步内容：">
           下载数据
@@ -43,6 +44,7 @@
 </template>
 
 <script>
+  import { parseTime } from '@/utils/index.js'
 import { postJson,checkButtons } from '@/api/common'
 import Cookies from 'js-cookie'
 import Pagination from '@/components/Pagination'
@@ -102,7 +104,8 @@ export default {
           type3: [],
           type4: [],
           resource: '',
-          desc: ''
+          desc: '',
+          date:parseTime(new Date(), '{y}-{m}-{d}')
         },
 
 
@@ -308,6 +311,7 @@ export default {
       const url = 'authdata/synchronizeNow'
       const data = {}
       data.company = this.form.cmo
+      data.date = parseTime(this.form.date, '{y}-{m}-{d}')
       postJson(url, data).then(response => {
         if (response.msg == 'ok') {
           this.$notify({ title: '成功', message: '保存成功', type: 'success',  duration: 2000 })

src/views/systemManagement/reminderSettings/index.vue

@@ -850,7 +850,7 @@
           data.pastureid = this.setUp.temp.pastureid
           // data.service_id = this.setUp.temp.service_id
           data.type_name = this.temp.messageName
-          data.template_id = 'BtkN1rWKOJtKP0C64lGxIrPzLRFsYFas-4gupX2-pFo'
+          data.template_id = 'RLPlaCnqQZt_6s4HZuaFJYbQ9gmTfIYipTYDoKJInY8'
           data.id = this.setUp.temp.id
           data.user = this.selectList2
           data.remind_type = parseInt(this.temp.sendingMethod)  //发送方式123
@@ -869,7 +869,7 @@
           data.user = this.selectList2
           data.sys_name = 'tmrWatch'
           data.type_name = this.temp.messageName
-          data.template_id = 'BtkN1rWKOJtKP0C64lGxIrPzLRFsYFas-4gupX2-pFo'
+          data.template_id = 'RLPlaCnqQZt_6s4HZuaFJYbQ9gmTfIYipTYDoKJInY8'
           data.pastureid = Cookies.get('pastureid')
           data.remind_type = parseInt(this.temp.sendingMethod)  //发送方式123
           data.delay_time = delayedTime //延时
@@ -889,7 +889,7 @@
           data.user = this.selectList2
           data.sys_name = 'tmrWatch'
           data.type_name = this.temp.messageName
-          data.template_id = 'BtkN1rWKOJtKP0C64lGxIrPzLRFsYFas-4gupX2-pFo'
+          data.template_id = 'RLPlaCnqQZt_6s4HZuaFJYbQ9gmTfIYipTYDoKJInY8'
           data.pastureid = Cookies.get('pastureid')
           data.remind_type = parseInt(this.temp.sendingMethod)  //发送方式123
           data.cycle_type = '4'//发送机制