表格显示的时间全部改为只有日期

src/views/Home/mencCofig.js

@@ -78,7 +78,7 @@ export const menuData = [
                 optionName: '转舍记录',
                 index: '1-9',
                 routerName: "shiftFieldLog"
-            },
+            }
         ]
     },
     {
@@ -106,13 +106,7 @@ export const menuData = [
                 optionName: '疾病登记',
                 index: '2-4',
                 routerName: "illnessLog"
-            },
-            // {
-            //     optionName: '羊杂登记',
-            //     index: '2-5',
-            //     routerName: "goatHasletLog"
-            // },
-            
+            }
         ]
     },
 
@@ -175,7 +169,7 @@ export const menuData = [
                 optionName: '智能提醒',
                 index: '4-2',
                 routerName: "intelligentHint"
-            },
+            }
         ]
     },
     {
@@ -203,7 +197,7 @@ export const menuData = [
                 optionName: '库存盘点',
                 index: '5-4',
                 routerName: "storeList"
-            },
+            }
         ]
     },
     {
@@ -239,7 +233,7 @@ export const menuData = [
                 optionName: '设备故障',
                 index: '7-3',
                 routerName: "deviceFault"
-            },
+            }
         ]
     },
     {

src/views/Login/Login.vue

@@ -37,7 +37,6 @@
     </div>
 </template>
 <script>
-
 import { reqLogin, reqOrgChoose, reqOrganizationId } from "@/api/login";
 
 export default {
@@ -53,19 +52,18 @@ export default {
             orgSelected: null
         };
     },
-    created() {
-    },
+    created() {},
     methods: {
         /* 登录按钮 */
         onSignIn() {
             reqLogin(this.form)
                 .then(res => {
-                    console.log(res)
                     localStorage.setItem("token", res.token);
                     this.doOrganizationChoose();
                 })
                 .catch(err => {
                     console.log("登录失败", err);
+                    this.$message.error("登录失败:" + err);
                 });
         },
         handleSet: function() {
@@ -75,38 +73,43 @@ export default {
         },
         doOrganizationChoose() {
             this.loading = true;
-            reqOrgChoose().then(res => {
-                if (res == null || res.length == 0) {
-                    this.$message.info("您没有加入任何组织!");
-                } else if (res.length > 1) {
-                    this.isShowDialog = true;
-                    this.orgList = res;
-                } else {
-                    console.log("6666")
-                    this.setOrganizationId(res[0].id);
-                }
-            }).catch(err => {
-                console.log(err)
-                this.loading = false;
-            })
+            reqOrgChoose()
+                .then(res => {
+                    if (res == null || res.length == 0) {
+                        this.$message.info("您没有加入任何组织!");
+                    } else if (res.length > 1) {
+                        this.isShowDialog = true;
+                        this.orgList = res;
+                    } else {
+                        this.setOrganizationId(res[0].id);
+                    }
+                })
+                .catch(err => {
+                    console.log(err);
+                    this.loading = false;
+                    this.$message.error("登录失败:" + err);
+                });
         },
-        setOrganizationId(id){
+        setOrganizationId(id) {
             if (!id) {
                 this.$message.error("发生了一点不愉快的错误！");
                 return;
             }
             this.loading = true;
-            reqOrganizationId({orgId: id}).then(res => {
-                this.isShowDialog = false;
+            reqOrganizationId({ orgId: id })
+                .then(res => {
+                    this.isShowDialog = false;
                     //导航到 正式页面
                     this.$router.replace("/home/firmInfo");
-            }).catch(err => {
-                if (err.errMsg) this.$message.error(err.errMsg);
+                })
+                .catch(err => {
+                    if (err.errMsg) this.$message.error(err.errMsg);
                     else this.$message.error("服务器发生异常");
-            }).finally( res => {
-                this.loading = false;
-            })
-        },
+                })
+                .finally(res => {
+                    this.loading = false;
+                });
+        }
     },
     mounted() {}
 };

src/views/antiepidemic/illnessLog.vue

@@ -49,7 +49,11 @@
                 >
                     <el-table-column prop="id" label="序号"></el-table-column>
                     <el-table-column prop="sheepId" label="羊只编码"></el-table-column>
-                    <el-table-column prop="regTime" label="登记时间" width="180"></el-table-column>
+                    <el-table-column label="登记时间" width="180">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['regTime'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="disease" label="所患疾病"></el-table-column>
                     <el-table-column prop="ifIsolation" label="是否隔离">
                         <template v-slot="scope">

src/views/antiepidemic/immuneLog.vue

@@ -39,7 +39,11 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
-                    <el-table-column prop="vaccineDate" label="免疫日期" width="180"></el-table-column>
+                    <el-table-column label="免疫日期" width="180">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['vaccineDate'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="batch" label="批次号"></el-table-column>
                     <el-table-column prop="medicineName" label="疫苗名称"></el-table-column>
                     <el-table-column prop="medicineFactory" label="生产厂家"></el-table-column>

src/views/antiepidemic/immunePlan.vue

@@ -33,7 +33,11 @@
                 >
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
                     <el-table-column prop="batchNo" label="批次号"></el-table-column>
-                    <el-table-column prop="performTime" label="执行时间"></el-table-column>
+                    <el-table-column label="执行时间">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['performTime'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="number" label="免疫数量(只)"></el-table-column>
                     <el-table-column prop="medicineName" label="使用药物名"></el-table-column>
                     <el-table-column prop="method" label="使用方法"></el-table-column>

src/views/breed/collectSeedLog.vue

@@ -30,7 +30,11 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="opeTime" label="采精时间" width="180"></el-table-column>
+                    <el-table-column label="采精时间" width="180">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['opeTime'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="yield" label="射精量(ml)"></el-table-column>
                     <el-table-column label="密度">
                         <template v-slot="scope">

src/views/breed/matingLog.vue

@@ -16,11 +16,7 @@
         </header>
         <section>
             <article class="table">
-                <el-table
-                    :data="tableData"
-                    tooltip-effect="dark"
-                    style="width: 100%"
-                >
+                <el-table :data="tableData" tooltip-effect="dark" style="width: 100%">
                     <el-table-column prop="id" label="序号"></el-table-column>
 
                     <el-table-column prop="femaleSheepId" label="种母羊编码"></el-table-column>
@@ -43,12 +39,18 @@
                         </template>
                     </el-table-column>
 
-                    <el-table-column prop="opeTime" label="配种时间"></el-table-column>
-                     
+                    <el-table-column label="配种时间">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['opeTime'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
+
                     <el-table-column label="操作人">
                         <template v-slot="scope">
                             <div v-for="item in $store.state['workerList']" :key="item.value">
-                                <span v-if="item.id == scope.row['opeUser']">{{ `${item.name}(${item.position})` }}</span>
+                                <span
+                                    v-if="item.id == scope.row['opeUser']"
+                                >{{ `${item.name}(${item.position})` }}</span>
                             </div>
                         </template>
                     </el-table-column>
@@ -161,11 +163,11 @@ export default {
             isShow: false,
             formData: {
                 femaleSheepId: "182",
-                femaleLevel: this.$store.state['seedSheedLevel'][0].value,
+                femaleLevel: this.$store.state["seedSheedLevel"][0].value,
                 maleSheepId: "121",
-                maleLevel: this.$store.state['seedSheedLevel'][0].value,
-                opeTime: this.$moment().format('YYYY-MM-DD HH:mm:ss'),
-                opeUser: this.$store.state['workerList'][0].id
+                maleLevel: this.$store.state["seedSheedLevel"][0].value,
+                opeTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
+                opeUser: this.$store.state["workerList"][0].id
             },
             rules
         };

src/views/breed/matingSuccLog.vue

@@ -33,7 +33,11 @@
                         </template>
                     </el-table-column>
 
-                    <el-table-column prop="opeTime" label="查情时间"></el-table-column>
+                    <el-table-column label="查情时间">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['opeTime'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
 
                     <el-table-column label="是否发情">
                         <template v-slot="scope">

src/views/breed/offFieldLog.vue

@@ -23,7 +23,11 @@
                 >
                     <el-table-column prop="id" label="序号"></el-table-column>
                     <el-table-column prop="sheepId" label="羊只编码"></el-table-column>
-                    <el-table-column prop="opeTime" label="离场时间"></el-table-column>
+                    <el-table-column label="离场时间">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['opeTime'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="ageOfDay" label="日龄(天)"></el-table-column>
                     <el-table-column prop="weight" label="离场体重(kg)"></el-table-column>
                     <el-table-column prop="cause" label="离场原因"></el-table-column>

src/views/breed/parturitionLog.vue

@@ -23,7 +23,11 @@
                 >
                     <el-table-column prop="id" label="序号"></el-table-column>
                     <el-table-column prop="sheepId" label="种母羊编号"></el-table-column>
-                    <el-table-column prop="opeTime" label="分娩时间" width="180"></el-table-column>
+                    <el-table-column label="分娩时间" width="180">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['opeTime'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="number" label="产羔个数"></el-table-column>
                     <el-table-column prop="averageWeight" label="羔羊均重(kg)"></el-table-column>
                     <el-table-column prop="healthyNum" label="健仔数"></el-table-column>

src/views/breed/pregnancyTestLog.vue

@@ -25,7 +25,11 @@
 
                     <el-table-column prop="sheepId" label="种母羊编号"></el-table-column>
 
-                    <el-table-column prop="opeTime" label="妊检时间"></el-table-column>
+                    <el-table-column label="妊检时间">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['opeTime'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
 
                     <el-table-column label="状态">
                         <template v-slot="scope">

src/views/breed/seedSheepFile.vue

@@ -22,7 +22,11 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="种母羊编码" width="100"></el-table-column>
-                    <el-table-column prop="entryTime" label="入场时间" width="200"></el-table-column>
+                    <el-table-column label="入场时间" width="200">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['entryTime'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="dayOfAge" label="入场日龄"></el-table-column>
                     <el-table-column label="种羊来源">
                         <template v-slot="scope">

src/views/breed/shiftFieldLog.vue

@@ -23,7 +23,11 @@
                 >
                     <el-table-column prop="id" label="序号"></el-table-column>
                     <el-table-column prop="sheepId" label="羊只编码"></el-table-column>
-                    <el-table-column prop="opeTime" label="转舍时间" width="180"></el-table-column>
+                    <el-table-column label="转舍时间" width="180">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['opeTime'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="转出栋舍">
                         <template v-slot="scope">
                             <div v-for="item in $store.state['areaList']" :key="item.value">

src/views/breed/weaningLog.vue

@@ -22,7 +22,11 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号"></el-table-column>
-                    <el-table-column prop="opeTime" label="断奶时间"></el-table-column>
+                    <el-table-column label="断奶时间">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['opeTime'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="sheepId" label="种母羊编码"></el-table-column>
                     <el-table-column prop="number" label="羔羊数量(只)"></el-table-column>
                     <el-table-column prop="weight" label="断奶均重量(kg)"></el-table-column>

src/views/fileInfo/workerInfo.vue

@@ -22,16 +22,16 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
-                    <el-table-column prop="name" label="姓名"></el-table-column>
-                    <el-table-column prop="gender" label="性别">
+                    <el-table-column prop="name" label="姓名" width="80"></el-table-column>
+                    <el-table-column prop="gender" label="性别" width="80">
                         <template v-slot="scope">
                             <span v-if="scope.row.gender==1">男</span>
                             <span v-if="scope.row.gender==2">女</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="age" label="年龄"></el-table-column>
+                    <el-table-column prop="age" label="年龄" width="100"></el-table-column>
                     <el-table-column prop="position" label="职位"></el-table-column>
-                    <el-table-column label="当前状态">
+                    <el-table-column label="当前状态" >
                         <template v-slot="scope">
                             <span v-if="scope.row['status']==1">在职</span>
                             <span v-else>离职</span>
@@ -41,7 +41,7 @@
                     <el-table-column prop="birthPlace" label="户籍地"></el-table-column>
                     <el-table-column prop="farmName" label="所属牧场"></el-table-column>
                     <el-table-column prop="duty" label="责任区域"></el-table-column>
-                    <el-table-column prop="entryTime" label="入职时间"></el-table-column>
+                    <el-table-column prop="entryTime" label="入职时间" width="180"></el-table-column>
                     <el-table-column label="操作" width="150">
                         <template v-slot="scope">
                             <el-button @click="edit(scope.row)" type="text" size="small">编辑</el-button>

src/views/harmless/harmlessConfirm.vue

@@ -22,7 +22,11 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号"></el-table-column>
-                    <el-table-column prop="reportTime" label="申报时间"></el-table-column>
+                    <el-table-column label="申报时间">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['reportTime'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="sheepId" label="羊只编号"></el-table-column>
                     <el-table-column prop="number" label="数量"></el-table-column>
                     <el-table-column prop="cause" label="原因"></el-table-column>

src/views/material/materialInStore.vue

@@ -22,7 +22,11 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号" width="60"></el-table-column>
-                    <el-table-column prop="inTime" label="入库日期"></el-table-column>
+                    <el-table-column label="入库日期">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['inTime'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="medicineName" label="药品名"></el-table-column>
                     <el-table-column prop="factory" label="生产厂家"></el-table-column>
                     <el-table-column prop="batchNumber" label="生产批号"></el-table-column>

src/views/material/materialOutStore.vue

@@ -22,7 +22,11 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号" width="60"></el-table-column>
-                    <el-table-column prop="outTime" label="出库日期"></el-table-column>
+                    <el-table-column label="出库日期">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['outTime'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="medicineName" label="药品名"></el-table-column>
                     <el-table-column prop="factory" label="生产厂家"></el-table-column>
                     <el-table-column label="数量">

src/views/material/storeList.vue

@@ -23,11 +23,19 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号"></el-table-column>
-                    <el-table-column prop="inTime" label="入库日期"></el-table-column>
+                    <el-table-column label="入库日期">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['inTime'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="medicineName" label="药品名称"></el-table-column>
                     <el-table-column prop="specifications" label="规格"></el-table-column>
                     <el-table-column prop="factory" label="生产厂家"></el-table-column>
-                    <el-table-column prop="mfd" label="生产日期"></el-table-column>
+                    <el-table-column label="生产日期">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['mfd'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="source" label="来源(经销商)"></el-table-column>
                     <el-table-column prop="number" label="库存数量"></el-table-column>
                     <el-table-column prop="periodOfValidity" label="质保期"></el-table-column>

src/views/production/batch.vue

@@ -29,7 +29,11 @@
                 <el-table :data="tableData" tooltip-effect="dark" style="width: 100%">
                     <el-table-column prop="id" label="序号"></el-table-column>
                     <el-table-column prop="batchNo" label="批次编码"></el-table-column>
-                    <el-table-column prop="created" label="生成时间"></el-table-column>
+                    <el-table-column label="生成时间">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['created'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="number" label="羊只数量"></el-table-column>
                     <el-table-column prop="avgWeight" label="平均体重(kg)"></el-table-column>
                     <el-table-column prop="avgDay" label="平均日龄"></el-table-column>
@@ -66,7 +70,11 @@
                 >
                     <el-table-column type="selection" width="55"></el-table-column>
                     <el-table-column prop="id" label="种母羊编码" width="100"></el-table-column>
-                    <el-table-column prop="entryTime" label="入场时间" width="200"></el-table-column>
+                    <el-table-column label="入场时间" width="200">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['entryTime'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="dayOfAge" label="入场日龄"></el-table-column>
                     <el-table-column label="种羊来源">
                         <template v-slot="scope">

src/views/production/dieWeedOut.vue

@@ -23,7 +23,11 @@
                 >
                     <el-table-column prop="id" label="序号"></el-table-column>
                     <el-table-column prop="sheepId" label="羊只编码"></el-table-column>
-                    <el-table-column prop="cullingTime" label="死淘时间"></el-table-column>
+                    <el-table-column label="死淘时间">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['cullingTime'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="操作人">
                         <template v-slot="scope">
                             <div v-for="item in $store.state['workerList']" :key="item.value">

src/views/production/earTag.vue

@@ -24,7 +24,11 @@
                     <el-table-column prop="id" label="序号"></el-table-column>
                     <el-table-column prop="earTag" label="耳标编码"></el-table-column>
                     <el-table-column prop="sheepId" label="羊只编码"></el-table-column>
-                    <el-table-column prop="bindTime" label="上标时间"></el-table-column>
+                    <el-table-column label="上标时间">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['bindTime'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="position" label="上标地点"></el-table-column>
                     <el-table-column label="上标人员">
                         <template v-slot="scope">

src/views/production/examiningReport.vue

@@ -30,7 +30,11 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="testTime" label="抗体检测时间"></el-table-column>
+                    <el-table-column label="抗体检测时间">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['testTime'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="number" label="抽样个数"></el-table-column>
                     <el-table-column prop="testFor" label="抗体检测项目"></el-table-column>
                     <el-table-column label="结果">

src/views/production/shiftField.vue

@@ -22,7 +22,11 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号"></el-table-column>
-                    <el-table-column prop="created" label="转舍时间"></el-table-column>
+                    <el-table-column label="转舍时间">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['created'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="batchNo" label="转舍批次"></el-table-column>
                     <el-table-column prop="fromBuilding" label="转出位置"></el-table-column>
                     <el-table-column prop="toBuilding" label="转入位置"></el-table-column>