Merge branch 'master' of http://101.36.160.140:21044/csc/csc-szls-vue

shanXiPlatform/src/views/basicInformation/personnelStructure.vue

@@ -38,8 +38,8 @@
                     :index="indexMethod"
                   >
                   </el-table-column>
-                  <!--  <el-table-column prop="uname" label="姓名" align="center">
-                  </el-table-column> -->
+                   <el-table-column prop="uname" label="姓名" align="center">
+                  </el-table-column>
                   <el-table-column
                     prop="usex"
                     label="性别"
@@ -593,7 +593,6 @@ export default {
           // data: ["初级", "中级", "高级", "技师", "高级技师"],
           // data: this.xAxisdata,
           max: "10",
-          min: ["初级", "中级", "高级", "技师", "高级技师"],
           axisTick: {
             alignWithLabel: true
           },
@@ -603,9 +602,7 @@ export default {
         },
         yAxis: {
           type: "value",
-
           max: "10",
-          min: "2"
         },
         series: [
           {

shanXiPlatform/src/views/facilitiesEquipment/facilitiesManagement/allFacilities/index.vue

@@ -241,10 +241,10 @@ export default {
         .then(res => {
           // console.log(res, "1111")
           this.allData = res.data.records
-          this.allData.forEach(element => {
+          /* this.allData.forEach(element => {
             element.time = element.checkTime.substring(0,this.allData[1].checkTime.length-3)
             console.log( element.time,' element.time')
-          });
+          }); */
           this.listLoading = false
           this.listQuery.limit = res.data.size
           this.total = res.data.total
@@ -272,10 +272,10 @@ export default {
           if (res.code == 200) {
             console.log(res, "全部列表返回数据..........")
             this.allData = res.data.records
-            this.allData.forEach(element => {
+            /* this.allData.forEach(element => {
               element.time = element.checkTime.substring(0,this.allData[1].checkTime.length-3)
               // console.log( element.time,' element.time')
-          });
+          }); */
             this.listLoading = false
             this.listQuery.limit = res.data.size
             this.total = res.data.total

shanXiPlatform/src/views/facilitiesEquipment/facilitiesManagement/newFacilities/addType.vue

@@ -23,7 +23,11 @@
             label="序号"
             width="50px"
           />
-          <el-table-column label="记录时间" prop="createDate" align="center" />
+          <el-table-column label="记录时间" prop="createDate" align="center">
+            <!-- <template slot-scope="scope">
+              <span>{{ scope.row.createDate.slice(0, 16) }}</span>
+            </template> -->
+          </el-table-column>
           <!-- <el-table-column label="记录时间" prop="time" align="center" /> -->
 
           <el-table-column label="检查项" prop="enumId" align="center">
@@ -57,11 +61,11 @@
             label="序号"
             width="50px"
           />
-          <el-table-column
-            label="记录时间"
-            prop="operationTime"
-            align="center"
-          />
+          <el-table-column label="记录时间" prop="operationTime" align="center">
+            <!-- <template slot-scope="scope">
+              <span>{{ scope.row.operationTime.slice(0, 16) }}</span>
+            </template> -->
+          </el-table-column>
 
           <el-table-column label="检查项" prop="enumId" align="center">
             <template slot-scope="scope">
@@ -133,7 +137,7 @@ export default {
       facilityId: "", //设施种类id
       id: "", // 列表每行id
       kind: "",
-      checkResult:'',
+      checkResult: "",
       // 头部下拉选的值
       // type: "cfss",
       type: "", // 1：新增 2：查看 3：修改
@@ -146,7 +150,7 @@ export default {
       // 新增modal
       data1: {
         equipFacilities: {
-          id:'',
+          id: "",
           checkResult: "", //检查结果(0:绿,1:黄) 1:全部都是是,0:存在否，也就是检查项存在不完好
           checkState: "", //1:已完成,0:进行中
           checkTime: "",
@@ -610,37 +614,30 @@ export default {
       if (this.type == 1) {
         //新增时
         row.createDate = getDateTimeNow()
-        console.log(row.createDate, "createDate")
+
         // console.log(this.checkItems, "是否被选中")
         var num = 0
-
-        if (row.isCheck == 0) {
+        for (let i = 0; i < this.checkItems.length; i++) {
+          // console.log(this.checkItems[i].enumId, "this.checkItems[i].enumId")
+          // var num =0;
+          this.checkItems[i].checkEnumId = this.checkItems[i].enumId
+          this.checkItems[i].operationTime = this.checkItems[i].createDate
+          if (this.checkItems[i].isCheck === 0) {
             // 有一项点击否，结果就是1（黄）
             this.data1.equipFacilities.checkResult = 1
-            this.checkResult = 1
-          } /* else{
-            // 有一项点击是，结果就是0（绿）
+          } else {
+            // 有一项点击否，结果就是0（绿）
             this.data1.equipFacilities.checkResult = 0
-            this.checkResult = 0
-          } */
-        this.checkItems.forEach((item, index) => {
-          Object.assign(
-            item,
-            { operationTime: item.createDate },
-            { checkEnumId: item.enumId }
-          )
-
+          }
 
-          if (item.isCheck == 1 || item.isCheck == 0) {
+          if (
+            this.checkItems[i].isCheck === 1 ||
+            this.checkItems[i].isCheck === 0
+          ) {
             num += 1
             // console.log(this.checkItems[i], num, "该项被选中了")
           }
 
-          console.log(this.checkItems, "this.checkItems111")
-          console.log(
-            this.data1.equipFacilities.checkResult,
-            "this.data1.equipFacilities.checkResult"
-          )
           if (num == this.checkItems.length) {
             this.data1.equipFacilities.checkState = 1
             this.flag = true
@@ -649,105 +646,70 @@ export default {
             this.data1.equipFacilities.checkState = 0
             // console.log("此时暂存还是暂存，切状态改为 进行中")
           }
-        })
-        /* for (let i = 0; i < this.checkItems.length; i++) {
-        // console.log(this.checkItems[i].enumId, "this.checkItems[i].enumId")
-        // var num =0;
-        this.checkItems[i].checkEnumId = this.checkItems[i].enumId
-        this.checkItems[i].operationTime = this.checkItems[i].createDate
-        if (this.checkItems[i].isCheck === 0) {
-          // 有一项点击否，结果就是1（黄）
-          this.data1.equipFacilities.checkResult = 1
-        } else {
-          // 有一项点击否，结果就是0（绿）
-          this.data1.equipFacilities.checkResult = 0
-        }
-
-        if (
-          this.checkItems[i].isCheck === 1 ||
-          this.checkItems[i].isCheck === 0
-        ) {
-          num += 1
-          // console.log(this.checkItems[i], num, "该项被选中了")
-        }
-
-        if (num == this.checkItems.length) {
-          this.data1.equipFacilities.checkState = 1
-          this.flag = true
-          // console.log("此时暂存变保存，切状态改为已完成")
-        } else {
-          this.data1.equipFacilities.checkState = 0
-          // console.log("此时暂存还是暂存，切状态改为 进行中")
         }
-      } */
       } else if (this.type == 3) {
         //修改时
-        // row.operationTime = getNowFormatDateone()
         row.operationTime = getDateTimeNow()
-        // row.operationTime = getNowFormatDateone()
         var num = 0
 
-        if (row.isCheck == 0) {
+        for (var i = 0; i < this.checkItems.length; i++) {
+          // console.log(this.checkItems[i].enumId, "this.checkItems[i].enumId")
+          // var num =0;
+          Object.assign(this.checkItems[i], {
+            checkEnumId: this.checkItems[i].enumId
+          })
+          if (this.checkItems[i].isCheck === 0) {
             // 有一项点击否，结果就是1（黄）
             this.data1.equipFacilities.checkResult = 1
-            this.checkResult = 1
-          } else{
-            // 有一项点击是，结果就是0（绿）
+            console.log(
+              this.data1.equipFacilities.checkResult,
+              "this.data1.equipFacilities.checkResult"
+            )
+          } else {
+            // 有一项点击否，结果就是0（绿）
             this.data1.equipFacilities.checkResult = 0
-            this.checkResult = 0
+            console.log(
+              this.data1.equipFacilities.checkResult,
+              "this.data1.equipFacilities.checkResult"
+            )
           }
-        this.checkItems.forEach((item, index) => {
-          Object.assign(item, { checkEnumId: item.enumId })
-          if (item.isCheck == 1 || item.isCheck == 0) {
+
+          if (
+            this.checkItems[i].isCheck === 1 ||
+            this.checkItems[i].isCheck === 0
+          ) {
             num += 1
-            // console.log(this.checkItems[i], num, "该项被选中了")
+            console.log(this.checkItems[i], num, "该项被选中了")
           }
-          console.log(this.checkItems, "this.checkItems111")
-          console.log(this.checkItems.length, "this.checkItems222")
+
           if (num == this.checkItems.length) {
             this.data1.equipFacilities.checkState = 1
             this.flag = true
-            // console.log("此时暂存变保存，切状态改为已完成")
+            console.log("此时暂存变保存，切状态改为已完成")
           } else {
             this.data1.equipFacilities.checkState = 0
-            // console.log("此时暂存还是暂存，切状态改为 进行中")
+            console.log("此时暂存还是暂存，切状态改为 进行中")
           }
-        })
-        /* for (let i = 0; i < this.checkItems.length; i++) {
-        // console.log(this.checkItems[i].enumId, "this.checkItems[i].enumId")
-        // var num =0;
-        this.checkItems[i].checkEnumId = this.checkItems[i].enumId
-        this.checkItems[i].operationTime = this.checkItems[i].createDate
-        if (this.checkItems[i].isCheck === 0) {
-          // 有一项点击否，结果就是1（黄）
-          this.data1.equipFacilities.checkResult = 1
-        } else {
-          // 有一项点击否，结果就是0（绿）
-          this.data1.equipFacilities.checkResult = 0
-        }
-
-        if (
-          this.checkItems[i].isCheck === 1 ||
-          this.checkItems[i].isCheck === 0
-        ) {
-          num += 1
-          // console.log(this.checkItems[i], num, "该项被选中了")
         }
-
-        if (num == this.checkItems.length) {
-          this.data1.equipFacilities.checkState = 1
-          this.flag = true
-          // console.log("此时暂存变保存，切状态改为已完成")
-        } else {
-          this.data1.equipFacilities.checkState = 0
-          // console.log("此时暂存还是暂存，切状态改为 进行中")
-        }
-      } */
       }
     },
     // 保存
     btnSave() {
       this.loading = true
+      for (var i = 0; i < this.checkItems.length; i++) {
+        if (this.checkItems[i].isCheck === 0) {
+          // 有一项点击否，结果就是1（黄）
+          this.data1.equipFacilities.checkResult = 1
+          console.log(
+            this.data1.equipFacilities.checkResult,
+            "this.data1.equipFacilities.checkResult"
+          )
+        } /* else if(this.checkItems[i].isCheck === 1){
+          // 有一项点击否，结果就是0（绿）
+          this.data1.equipFacilities.checkResult = 0
+          console.log(this.data1.equipFacilities.checkResult,'this.data1.equipFacilities.checkResult')
+        } */
+      }
       this.data1.equipFacilities.hname = this.houseDic[
         this.data1.equipFacilities.hid
       ]
@@ -784,11 +746,12 @@ export default {
       } else if (this.type == 3) {
         console.log("这是修改")
         this.data1.equipFacilities.id = this.id
-        console.log(this.data1,'this.data1')
-        editFacilitiy(this.data1).then(res =>{
-          console.log(res,'res....')
-          if(res.code == 200){
-            this.loading = false
+        console.log(this.data1, "this.data1")
+        editFacilitiy(this.data1)
+          .then(res => {
+            console.log(res, "res....")
+            if (res.code == 200) {
+              this.loading = false
               this.$message({
                 message: "修改成功！",
                 type: "success"
@@ -796,11 +759,12 @@ export default {
               this.$router.push({
                 path: "/facilitiesEquipment/facilitiesManagement/allFacilities"
               })
-          }
-        }).catch(err =>{
-          this.loading = false
-          console.log(err)
-        })
+            }
+          })
+          .catch(err => {
+            this.loading = false
+            console.log(err)
+          })
       }
       // console.log(this.data1, "data1...........")
     },

shanXiPlatform/src/views/facilitiesEquipment/facilitiesManagement/newFacilities/index.vue

@@ -15,7 +15,10 @@
           <span v-if='scope.row.kind==45'>45</span> -->
         </template>
       </el-table-column>
-      <el-table-column prop="time" label="最近记录时间" align="center">
+      <el-table-column prop="checkTime" label="最近记录时间" align="center">
+        <template slot-scope="scope">
+         <span>{{ scope.row.checkTime.slice(0,16) }}</span>
+        </template>
       </el-table-column>
       <el-table-column prop="checkState" label="状态" align="center">
         <template slot-scope="scope">
@@ -174,11 +177,11 @@ export default {
             console.log(res.data, "最新设施data") */
             // 把拿到的设施检查记录保存到data()中，并设为table数据源
             this.tableData = res.data
-            this.tableData.forEach(element => {
+           /*  this.tableData.forEach(element => {
               element.time = element.checkTime.substring(0,element.checkTime.length-3)
-              /* console.log( element.time,' element.time')
-              console.log( element.checkTime,' element.time') */
-          });
+              console.log( element.time,' element.time')
+              console.log( element.checkTime,' element.time')
+          }); */
           }
         })
         .catch(err => {

shanXiPlatform/src/views/home/branchOffice.vue

@@ -7,21 +7,21 @@
                     <div class="one">
                         <p class="lsp">
                             <img src="../../assets/images/rightarrow.png" alt /> 储存状态
-                            <span v-if="crumbs.length>1" class="echartSpan" @click="leftboxsMore(1)">更多>></span>
+                            <!-- <span v-if="crumbs.length>1" class="echartSpan" @click="leftboxsMore(1)">更多>></span> -->
                         </p>
                         <div id="myCharttwo" class="oneo"></div>
                     </div>
                     <div class="two">
                         <p class="lsp">
                             <img src="../../assets/images/rightarrow.png" alt /> 粮食种类
-                            <span v-if="crumbs.length>1" class="echartSpan" @click="leftboxsMore(2)">更多>></span>
+                            <!-- <span v-if="crumbs.length>1" class="echartSpan" @click="leftboxsMore(2)">更多>></span> -->
                         </p>
                         <div id="myChartone" class="twot"></div>
                     </div>
                     <div class="thi">
                         <p class="lsp">
                             <img src="../../assets/images/rightarrow.png" alt /> 仓房状态
-                            <span v-if="crumbs.length>1" class="echartSpan" @click="leftboxsMore(3)">更多>></span>
+                            <!-- <span v-if="crumbs.length>1" class="echartSpan" @click="leftboxsMore(3)">更多>></span> -->
                         </p>
                         <div id="myChartthi" class="thit"></div>
                     </div>

shanXiPlatform/src/views/home/staff.vue

@@ -15,7 +15,7 @@
               style="float: left"
               v-for="item in workbenchData"
               :key="item.name"
-              @click="messageWorkFn(item.name)"
+              @click="messageWorkFn(item.path)"
             >
               <i :class="item.class"></i>
               <span style="font-size: 18px">{{ item.name }}</span>
@@ -402,18 +402,18 @@ export default {
   data() {
     return {
       workbenchData: [
-        {
-          name: "修改仓房信息",
-          class: "el-icon-edit",
-        },
-        {
-          name: "新增保管员每周检查记录",
-          class: "el-icon-plus",
-        },
-        {
-          name: "新增机械通风记录",
-          class: "el-icon-plus",
-        },
+        // {
+        //   name: "修改仓房信息",
+        //   class: "el-icon-edit",
+        // },
+        // {
+        //   name: "新增保管员每周检查记录",
+        //   class: "el-icon-plus",
+        // },
+        // {
+        //   name: "新增机械通风记录",
+        //   class: "el-icon-plus",
+        // },
       ],
       messageNoticeData: [],
       messageNoticeNum: 0,
@@ -445,6 +445,7 @@ export default {
     this.objone.depotId = JSON.parse(getUser()).depotId
     this.objtwo.depotId = JSON.parse(getUser()).depotId
     this.objthi.depotId = JSON.parse(getUser()).depotId
+    this.workbenchDataFn()
     this.getNoticeList()
     this.bannerList()
     this.initChartA("echartTwo")
@@ -790,14 +791,8 @@ export default {
         }
       })
     },
-    messageWorkFn(name) {
-      if (name == "修改仓房信息") {
-        this.$router.push({ path: "/countQuality/warehouseInformation" })
-      } else if (name == "新增保管员每周检查记录") {
-        this.$router.push({ path: "/reservesManagement/grainCheck/newGrain" })
-      } else if (name == "新增机械通风记录") {
-        this.$router.push({ path: "/reservesManagement/mechanicalVentilation" })
-      }
+    messageWorkFn(pathurl) {
+      this.$router.push({ path: pathurl })
     },
     housestatusshowFn(data) {
       if (data == 1) {
@@ -806,6 +801,98 @@ export default {
         this.housestatusshow = false
       }
     },
+    workbenchDataFn() {
+      let roleIds = JSON.parse(getUser()).roleIds
+      if(roleIds == '30'){   //保管员
+        this.workbenchData = [
+          {
+            name: "修改仓房信息",
+            class: "el-icon-edit",
+            path: "/countQuality/warehouseInformation"
+          },
+          {
+            name: "新增保管员每周检查记录",
+            class: "el-icon-plus",
+            path: "/reservesManagement/grainCheck/newGrain"
+          },
+          {
+            name: "新增机械通风记录",
+            class: "el-icon-plus",
+            path: "/reservesManagement/mechanicalVentilation"
+          },
+          {
+            name: "新增设施检查记录",
+            class: "el-icon-plus",
+            path: "/facilitiesEquipment/facilitiesManagement/newFacilities"
+          },
+        ]
+      }else if(roleIds == '60'){   //检化验人员
+        this.workbenchData = [
+          {
+            name: "新增库存质量记录",
+            class: "el-icon-plus",
+            path: "/countQuality/inventory/inventoryQuality"
+          },
+          {
+            name: "新增出库质量记录",
+            class: "el-icon-plus",
+            path: "/countQuality/delivery/deliveryQuality"
+          },
+        ]
+      }else if(roleIds == '58'){   //库外人员（委托）
+        this.workbenchData = [
+          {
+            name: "新增粮情检查记录",
+            class: "el-icon-plus",
+            path: "/outsideHouse/Emanage/gInspection"
+          },
+          {
+            name: "新增安全巡查记录",
+            class: "el-icon-plus",
+            path: "/outsideHouse/Emanage/sInspection"
+          },
+        ]
+      }else if(roleIds == '59'){   //库外人员（租仓）
+        this.workbenchData = [
+          {
+            name: "新增粮情检查记录",
+            class: "el-icon-plus",
+            path: "/outsideHouse/rentWarehouse/gRenthouse"
+          },
+          {
+            name: "新增安全巡查记录",
+            class: "el-icon-plus",
+            path: "/outsideHouse/rentWarehouse/sRenthouse"
+          },
+        ]
+      }else if(roleIds == '53'){   //药品机械保管员
+        this.workbenchData = [
+          {
+            name: "新增药剂采购记录",
+            class: "el-icon-plus",
+            path: "/medicamentManagement/medicamentProcurement"
+          },
+          {
+            name: "新增药剂保管记录",
+            class: "el-icon-plus",
+            path: "/medicamentManagement/medicamentStorage"
+          },
+          {
+            name: "新增药剂领用记录",
+            class: "el-icon-plus",
+            path: "/medicamentManagement/medicamentApplication"
+          },
+        ]
+      }else if(roleIds == '52'){   //安全员
+        this.workbenchData = [
+          {
+            name: "新增安全巡查记录",
+            class: "el-icon-plus",
+            path: "/safeProduction/safeTabs/newSafe"
+          },
+        ]
+      }
+    }
   },
 }
 </script>

shanXiPlatform/src/views/reservesManagement/grainCheck/allGrain/index.vue

@@ -17,7 +17,7 @@
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 :default-time="['00:00:00', '12:00:00']"
-                value-format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd HH:mm:ss"
               >
               </el-date-picker> -->
               <el-date-picker
@@ -26,7 +26,8 @@
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
-                value-format="yyyy-MM-dd HH:mm"
+                :default-time="['00:00:00', '23:59:59']"
+                value-format="yyyy-MM-dd HH:mm:ss"
               >
               </el-date-picker>
             </div>
@@ -324,6 +325,7 @@ export default {
 
         condition: JSON.stringify(condition)
       }
+      console.log(data3,'data3')
       queryGrainInfo(data3)
         .then(res => {
           this.data2 = res.data.records

shanXiPlatform/src/views/reservesManagement/grainCheck/newGrain/index.vue

@@ -260,7 +260,7 @@ export default {
       // console.log(userinfo.depotId)
       // console.log('121111........')
       let condition = {
-        houseId: this.houseId,
+        houseId: /* (this.houseId ==null || this.houseId ==undefined)?  */ this.houseId ,
         depotId: this.depotId
       }
       // console.log(JSON.stringify(condition),'1111')

shanXiPlatform/src/views/safeProduction/allSafe/index.vue

@@ -48,9 +48,9 @@
         </el-table-column>
         <el-table-column prop="status" label="状态" align="center" width='100px'>
           <template slot-scope="scope">
-            <div  disable-transitions  v-if="scope.row.status == '' || scope.row.status == null"></div>
-            <div class="yellow" disable-transitions v-if="scope.row.status == '0'">进行中</div>
-            <div class="green" disable-transitions v-if="scope.row.status == '1'">已完成</div>
+            <span v-if="scope.row.status == '' || scope.row.status == null"></span>
+            <span v-if="scope.row.status == '0'">进行中</span>
+            <span v-if="scope.row.status == '1'">已完成</span>
           </template>
         </el-table-column>
         <el-table-column  prop="operation"  label="操作"  align="center"  width="250px">

shanXiPlatform/src/views/safeProduction/newSafe/detail.vue

@@ -23,9 +23,10 @@
         </el-table-column>
       </el-table>
       <div class="btns" style="text-align:right;">
-        <el-button v-if="status !== 'detail'" type="success" plain @click="release('formData')">保存</el-button>
-        <!-- <el-button v-if="status !== 'detail'" style="border:1px solid #13ce66;" @click="release('formData','0')">暂存</el-button> -->
         <el-button type="cancel" @click="goback">返回</el-button>
+        <el-button v-if="status !== 'detail'" type="success" plain @click="release('formData')">{{buttonTitle}}</el-button>
+        <!-- <el-button v-if="status !== 'detail'" style="border:1px solid #13ce66;" @click="release('formData','0')">暂存</el-button> -->
+        
       </div>
     </div>
   </div>
@@ -90,7 +91,8 @@ export default {
         ],
       },
       isdisabled: false,
-      status: 'add'
+      status: 'add',
+      buttonTitle: '暂存'
     }
   },
   created() {
@@ -167,6 +169,12 @@ export default {
     flagChange(index) {
       // this.formData.detailsList[index].createTime = getDateTimeNow()
       this.formData.detailsList[index].detailTime = getDateTimeNow()
+      if(this.formData.detailsList[0].detailTime && this.formData.detailsList[1].detailTime
+       && this.formData.detailsList[2].detailTime && this.formData.detailsList[3].detailTime
+        && this.formData.detailsList[4].detailTime && this.formData.detailsList[5].detailTime
+         && this.formData.detailsList[6].detailTime && this.formData.detailsList[7].detailTime){
+           this.buttonTitle = '保存'
+       }
     },
     addList() {
       addFun(this.formData).then(res => {
@@ -261,6 +269,11 @@ export default {
       detailFun(this.$route.query.id).then(res => {
         if (res.code == 200) {
           this.formData = res.data
+          if(this.formData.status == '0'){
+            this.buttonTitle = '暂存'
+          }else{
+            this.buttonTitle = '保存'
+          }
         }
       }).catch((err) => {
         console.log(err)

shanXiPlatform/src/views/safeProduction/newSafe/index.vue

@@ -18,9 +18,9 @@
         </el-table-column>
         <el-table-column prop="status" label="状态" align="center" width='100px'>
           <template slot-scope="scope">
-            <div  disable-transitions  v-if="scope.row.status == '' || scope.row.status == null"></div>
-            <div class="yellow" disable-transitions v-if="scope.row.status == '0'">进行中</div>
-            <div class="green" disable-transitions v-if="scope.row.status == '1'">已完成</div>
+            <span v-if="scope.row.status == '' || scope.row.status == null"></span>
+            <span v-if="scope.row.status == '0'">进行中</span>
+            <span v-if="scope.row.status == '1'">已完成</span>
           </template>
         </el-table-column>
         <el-table-column  prop="operation"  label="操作"  align="center"  width="200px">

shanXiPlatform/src/views/supervisionInspection/entrustedRepository/newEntrustedRepository/detail.vue

@@ -20,9 +20,9 @@
         </el-table-column>
       </el-table>
       <div class="btns" style="text-align:right;">
-        <el-button v-if="status !== 'detail'" type="success" plain @click="release('formData')">保存</el-button>
         <!-- <el-button v-if="status !== 'detail'" style="border:1px solid #13ce66;" @click="release('formData','0')">暂存</el-button> -->
         <el-button type="cancel" @click="goback">返回</el-button>
+        <el-button v-if="status !== 'detail'" type="success" plain @click="release('formData')">{{buttonTitle}}</el-button>
       </div>
     </div>
   </div>
@@ -77,7 +77,8 @@ export default {
         ],
       },
       isdisabled: false,
-      status: 'add'
+      status: 'add',
+      buttonTitle: '暂存'
     }
   },
   created() {
@@ -143,6 +144,11 @@ export default {
     flagChange(index) {
       // this.formData.detailsList[index].createTime = getDateTimeNow()
       this.formData.detailsList[index].detailTime = getDateTimeNow()
+      if(this.formData.detailsList[0].detailTime && this.formData.detailsList[1].detailTime
+       && this.formData.detailsList[2].detailTime && this.formData.detailsList[3].detailTime
+        && this.formData.detailsList[4].detailTime && this.formData.detailsList[5].detailTime){
+           this.buttonTitle = '保存'
+       }
     },
     addList() {
       addFun(this.formData).then(res => {
@@ -192,6 +198,11 @@ export default {
       detailFun(this.$route.query.id).then(res => {
         if (res.code == 200) {
           this.formData = res.data
+          if(this.formData.status == '0'){
+            this.buttonTitle = '暂存'
+          }else{
+            this.buttonTitle = '保存'
+          }
         }
       }).catch((err) => {
         console.log(err)

shanXiPlatform/src/views/supervisionInspection/entrustedRepository/newEntrustedRepository/index.vue

@@ -39,10 +39,10 @@
             </el-table-column>
             <el-table-column prop="status" label="状态" align="center" width='100px'>
               <template slot-scope="scope">
-                <div  disable-transitions  v-if="scope.row.status == '' || scope.row.status == null"></div>
-                <div class="yellow" disable-transitions v-if="scope.row.status == '0'">进行中</div>
-                <div class="green" disable-transitions v-if="scope.row.status == '1'">已完成</div>
-              </template>
+            <span v-if="scope.row.status == '' || scope.row.status == null"></span>
+            <span v-if="scope.row.status == '0'">进行中</span>
+            <span v-if="scope.row.status == '1'">已完成</span>
+          </template>
             </el-table-column>
             <el-table-column  prop="operation"  label="操作"  align="center"  width="250px">
               <template slot-scope="scope">

shanXiPlatform/src/views/supervisionInspection/library/allLibrary/index.vue

@@ -47,9 +47,9 @@
         </el-table-column>
         <el-table-column prop="status" label="状态" align="center" width='100px'>
           <template slot-scope="scope">
-            <div  disable-transitions  v-if="scope.row.status == '' || scope.row.status == null"></div>
-            <div class="yellow" disable-transitions v-if="scope.row.status == '0'">进行中</div>
-            <div class="green" disable-transitions v-if="scope.row.status == '1'">已完成</div>
+            <span v-if="scope.row.status == '' || scope.row.status == null"></span>
+            <span v-if="scope.row.status == '0'">进行中</span>
+            <span v-if="scope.row.status == '1'">已完成</span>
           </template>
         </el-table-column>
         <el-table-column  prop="operation"  label="操作"  align="center"  width="250px">

shanXiPlatform/src/views/supervisionInspection/library/newLibrary/detail.vue

@@ -22,9 +22,9 @@
         </el-table-column>
       </el-table>
       <div class="btns" style="text-align:right;">
-        <el-button v-if="status !== 'detail'" type="success" plain @click="release('formData')">保存</el-button>
         <!-- <el-button v-if="status !== 'detail'" style="border:1px solid #13ce66;" @click="release('formData','0')">暂存</el-button> -->
         <el-button type="cancel" @click="goback">返回</el-button>
+        <el-button v-if="status !== 'detail'" type="success" plain @click="release('formData')">{{buttonTitle}}</el-button>
       </div>
     </div>
   </div>
@@ -79,7 +79,8 @@ export default {
         ],
       },
       isdisabled: false,
-      status: 'add'
+      status: 'add',
+      buttonTitle: '暂存'
     }
   },
   created() {
@@ -145,6 +146,11 @@ export default {
     flagChange(index) {
       // this.formData.detailsList[index].createTime = getDateTimeNow()
       this.formData.detailsList[index].detailTime = getDateTimeNow()
+      if(this.formData.detailsList[0].detailTime && this.formData.detailsList[1].detailTime
+       && this.formData.detailsList[2].detailTime && this.formData.detailsList[3].detailTime
+        && this.formData.detailsList[4].detailTime && this.formData.detailsList[5].detailTime){
+           this.buttonTitle = '保存'
+       }
     },
     addList() {
       addFun(this.formData).then(res => {
@@ -254,6 +260,11 @@ export default {
       detailFun(this.$route.query.id).then(res => {
         if (res.code == 200) {
           this.formData = res.data
+          if(this.formData.status == '0'){
+            this.buttonTitle = '暂存'
+          }else{
+            this.buttonTitle = '保存'
+          }
         }
       }).catch((err) => {
         console.log(err)

shanXiPlatform/src/views/supervisionInspection/library/newLibrary/index.vue

@@ -17,9 +17,9 @@
         </el-table-column>
         <el-table-column prop="status" label="状态" align="center" width='100px'>
           <template slot-scope="scope">
-            <div  disable-transitions  v-if="scope.row.status == '' || scope.row.status == null"></div>
-            <div class="yellow" disable-transitions v-if="scope.row.status == '0'">进行中</div>
-            <div class="green" disable-transitions v-if="scope.row.status == '1'">已完成</div>
+            <span v-if="scope.row.status == '' || scope.row.status == null"></span>
+            <span v-if="scope.row.status == '0'">进行中</span>
+            <span v-if="scope.row.status == '1'">已完成</span>
           </template>
         </el-table-column>
         <el-table-column  prop="operation"  label="操作"  align="center"  width="200px">

shanXiPlatform/src/views/supervisionInspection/subTreasury/newSubTreasury/detail.vue

@@ -17,9 +17,9 @@
         </el-table-column>
       </el-table>
       <div class="btns" style="text-align:right;">
-        <el-button v-if="status !== 'detail'" type="success" plain @click="release('formData')">保存</el-button>
         <!-- <el-button v-if="status !== 'detail'" style="border:1px solid #13ce66;" @click="release('formData','0')">暂存</el-button> -->
         <el-button type="cancel" @click="goback">返回</el-button>
+        <el-button v-if="status !== 'detail'" type="success" plain @click="release('formData')">{{buttonTitle}}</el-button>
       </div>
     </div>
   </div>
@@ -74,7 +74,8 @@ export default {
         ],
       },
       isdisabled: false,
-      status: 'add'
+      status: 'add',
+      buttonTitle: '暂存'
     }
   },
   created() {
@@ -139,6 +140,11 @@ export default {
     flagChange(index) {
       // this.formData.detailsList[index].createTime = getDateTimeNow()
       this.formData.detailsList[index].detailTime = getDateTimeNow()
+      if(this.formData.detailsList[0].detailTime && this.formData.detailsList[1].detailTime
+       && this.formData.detailsList[2].detailTime && this.formData.detailsList[3].detailTime
+        && this.formData.detailsList[4].detailTime && this.formData.detailsList[5].detailTime){
+           this.buttonTitle = '保存'
+       }
     },
     addList() {
       addFun(this.formData).then(res => {
@@ -188,6 +194,11 @@ export default {
       detailFun(this.$route.query.id).then(res => {
         if (res.code == 200) {
           this.formData = res.data
+          this.formData.detailsList.forEach(item => {
+            if(item.flag === null || item.flag === 'null'){
+              this.formData.status = 0
+            }
+          })
         }
       }).catch((err) => {
         console.log(err)

shanXiPlatform/src/views/supervisionInspection/subTreasury/newSubTreasury/index.vue

@@ -39,10 +39,10 @@
             </el-table-column>
             <el-table-column prop="status" label="状态" align="center" width='100px'>
               <template slot-scope="scope">
-                <div  disable-transitions  v-if="scope.row.status == '' || scope.row.status == null"></div>
-                <div class="yellow" disable-transitions v-if="scope.row.status == '0'">进行中</div>
-                <div class="green" disable-transitions v-if="scope.row.status == '1'">已完成</div>
-              </template>
+            <span v-if="scope.row.status == '' || scope.row.status == null"></span>
+            <span v-if="scope.row.status == '0'">进行中</span>
+            <span v-if="scope.row.status == '1'">已完成</span>
+          </template>
             </el-table-column>
             <el-table-column  prop="operation"  label="操作"  align="center"  width="250px">
               <template slot-scope="scope">

shanXiPlatform/src/views/systemManagement/earlyWarningManagement/addEarlyWarningManagement.vue

@@ -99,68 +99,63 @@ export default {
           label:'保管员每周粮情检查'
         },
         {
+          value:'code13',
+          label:'科长每2周粮情检查'
+        },
+        {
+          value:'code5',
+          label:'分管副总每月粮情检查'
+        },
+        {
+          value:'code8',
+          label:'总经理每季检查粮情'
+        },
+        {
           value:'code1',
           label:'安全员每天安全检查'
         },
         {
           value:'code2',
-          label:'仓储科长每2周本库检查'
+          label:'科长每2周本库检查'
         },
         {
-          value:'code3',
-          label:'业务科长每2周分库检查'
+          value:'code7',
+          label:'分管副总每月本库检查'
         },
         {
           value:'code4',
           label:'监管科长每2周租仓、委托点检查'
         },
         {
-          value:'code5',
-          label:'分管副总每月粮情检查'
-        },
-        {
-          value:'code6',
-          label:'分管副总每月质量检查'
-        },
-        {
-          value:'code7',
-          label:'分管副总每月分库检查'
+          value:'code3',
+          label:'分库经理每2周分库检查'
         },
         {
-          value:'code8',
-          label:'总经理每季检查粮情'
+          value:'code12',
+          label:'保管员每周检查粮情(租仓管理)'
         },
         {
-          value:'code9',
-          label:'安全员每天巡检/委托管理'
+          value:'code11',
+          label:'保管员每周检查粮情(委托管理)'
         },
         {
           value:'code10',
-          label:'安全员每天巡检/租仓管理'
-        },
-          {
-          value:'code11',
-          label:'保管员每周检查粮情/委托管理'
+          label:'安全员每天安全巡检(租仓管理)'
         },
         {
-          value:'code12',
-          label:'保管员每周检查粮情/租仓管理'
+          value:'code9',
+          label:'安全员每天安全巡检(委托管理)'
         },
-
       ],
       checkDateList:[
         {
-          value:'10_minute',
-          label:'每10分钟'
-        },
-        {
           value:'1_weekday',
           label:'每工作日'
         },
-        {
-          value:'1_day',
-          label:'日'
-        },
+        // {
+        //   value:'1_day',
+        //   label:'日'
+        // },
         {
           value:'1_week',
           label:'周'
@@ -177,23 +172,35 @@ export default {
           value:'1_season',
           label:'季'
         },
+        {
+          value:'10_minute',
+          label:'每10分钟'
+        },
       ],
       timeList:[
         {
-          value:'3_day',
-          label:'到期前3天'
+          value:'160_hour',
+          label:'到期前6天16个小时'
+        },
+        {
+          value:'88_hour',
+          label:'到期前3天16个小时'
         },
         {
-          value:'2_day',
-          label:'到期前2天'
+          value:'64_hour',
+          label:'到期前2天16个小时'
         },
         {
-          value:'1_day',
-          label:'到期前1天'
+          value:'16_hour',
+          label:'到期前16个小时'
         },
         {
           value:'10_hour',
-          label:'到期前10小时'
+          label:'到期前10个小时'
+        },
+        {
+          value:'8_hour',
+          label:'到期前8个小时'
         },
         {
           value:'1_minute',

shanXiPlatform/src/views/systemManagement/earlyWarningManagement/index.vue

@@ -197,9 +197,9 @@ export default {
     },
     getInspectCycle(row) {
       switch (row.inspectCycle) {
-          case '1_day':
-              return '日';
-              break;
+          // case '1_day':
+          //     return '日';
+          //     break;
           case '1_week':
               return '周';
               break;

shanXiPlatform/src/views/systemManagement/notice/newNotice/addnotice.vue

@@ -67,10 +67,10 @@
 
       </el-form>
       <div class="btns" style="text-align:right;">
-        <el-button v-if="status !== 'detail'" :loading='loading' type="success" plain @click="release('formData','1')">发布</el-button>
+        <el-button type="cancel" @click="goback">返回</el-button>
         <el-button v-if="status !== 'detail'" :loading='loading' style="border:1px solid #13ce66;" @click="release('formData','2')">保存至草稿箱</el-button>
         <!-- <el-button class="cancelBtn" @click="goback">返回</el-button> -->
-        <el-button type="cancel" @click="goback">返回</el-button>
+        <el-button v-if="status !== 'detail'" :loading='loading' type="success" plain @click="release('formData','1')">发布</el-button>
       </div>
     </div>
   </div>