apply-clients 3.3.32 → 3.3.36

package/src/components/product/Stop/StopApply.vue

@@ -1,103 +1,101 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <div style="height: 95%">
-        <stop-apply-list v-ref:query></stop-apply-list>
-      </div>
-    </div>
-
-    <modal v-if="showModal" :show.sync="showModal" backdrop="false" large>
-      <header slot="modal-header" class="modal-header">
-        <button type="button" class="close" @click="closeModal()"><span>&times;</span></button>
-        <span class="modal-title"><font size="3">撤销</font></span>
-      </header>
-      <article slot="modal-body" class="modal-body clearfix">
-        <div :class="data.f_cancel_reason ? '' : 'has-error'" class="form-group">
-          <label class="control-label-justify control-label col-sm-1">撤销原因</label>
-          <div class="col-sm-9">
-            <textarea
-              class="form-control input_view" style="width: 100%" rows="5"
-              v-model="data.f_cancel_reason" :value="data.f_cancel_reason"
-            ></textarea>
-          </div>
-        </div>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button :class="!data.f_cancel_reason ? 'btn btn-default':'btn btn-primary'"
-                :disabled="!data.f_cancel_reason" type="button" @click="confirmModal()">
-          确认
-        </button>
-      </footer>
-    </modal>
-  </div>
-</template>
-
-<script>
-export default {
-  title: '终止报建',
-  data () {
-    return {
-      showModal: false,
-      data: null
-    }
-  },
-  ready () {
-  },
-  methods: {
-    closeModal () {
-      this.showModal = false
-      this.data = null
-
-      this.$refs.query.$refs.cp.$refs.cri.search()
-    },
-    async confirmModal () {
-      let data = {
-        data: this.data,
-        user: this.$login.f
-      }
-
-      let res = await this.$resetpost(
-        `rs/logic/cancelStopApply`,
-        {data: data},
-        {resolveMsg: null, rejectMsg: '撤销失败！！！'}
-      )
-
-      this.closeModal()
-    }
-  },
-  events: {
-    'search' () {
-      this.$refs.query.$refs.cp.$refs.cri.search()
-    },
-    'cancelStopApply' (row) {
-      this.data = row
-
-      this.showModal = true
-    }
-  }
-}
-</script>
-
-<style scoped>
-  .control-label-justify {
-    display: inline-block;
-    vertical-align: top;
-    width: 110px;
-    text-align: justify;
-    font-family: PingFang-SC-Bold;
-  }
-
-  .control-label-justify::after {
-    content: "";
-    display: inline-block;
-    width: 100%;
-    overflow: hidden;
-    height: 0;
-  }
-  .clearfix:after,.clearfix:before{
-    display: table;
-  }
-  .clearfix:after{
-    clear: both;
-  }
-</style>
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <stop-apply-list v-ref:query></stop-apply-list>
+    </div>
+
+    <modal v-if="showModal" :show.sync="showModal" backdrop="false" large>
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeModal()"><span>&times;</span></button>
+        <span class="modal-title"><font size="3">撤销</font></span>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <div :class="data.f_cancel_reason ? '' : 'has-error'" class="form-group">
+          <label class="control-label-justify control-label col-sm-1">撤销原因</label>
+          <div class="col-sm-9">
+            <textarea
+              class="form-control input_view" style="width: 100%" rows="5"
+              v-model="data.f_cancel_reason" :value="data.f_cancel_reason"
+            ></textarea>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button :class="!data.f_cancel_reason ? 'btn btn-default':'btn btn-primary'"
+                :disabled="!data.f_cancel_reason" type="button" @click="confirmModal()">
+          确认
+        </button>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '终止报建',
+  data () {
+    return {
+      showModal: false,
+      data: null
+    }
+  },
+  ready () {
+  },
+  methods: {
+    closeModal () {
+      this.showModal = false
+      this.data = null
+
+      this.$refs.query.$refs.cp.$refs.cri.search()
+    },
+    async confirmModal () {
+      let data = {
+        data: this.data,
+        user: this.$login.f
+      }
+
+      let res = await this.$resetpost(
+        `rs/logic/cancelStopApply`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '撤销失败！！！'}
+      )
+
+      this.closeModal()
+    }
+  },
+  events: {
+    'search' () {
+      this.$refs.query.$refs.cp.$refs.cri.search()
+    },
+    'cancelStopApply' (row) {
+      this.data = row
+
+      this.showModal = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .control-label-justify {
+    display: inline-block;
+    vertical-align: top;
+    width: 110px;
+    text-align: justify;
+    font-family: PingFang-SC-Bold;
+  }
+
+  .control-label-justify::after {
+    content: "";
+    display: inline-block;
+    width: 100%;
+    overflow: hidden;
+    height: 0;
+  }
+  .clearfix:after,.clearfix:before{
+    display: table;
+  }
+  .clearfix:after{
+    clear: both;
+  }
+</style>

package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue

@@ -149,7 +149,7 @@
         if (this.selectdata.components) {
           this.selectdata.components.forEach(item => {
             item.mark = 1
-            if (item.supervisory) {
+            if (item.supervisory && this[item.supervisory]()) {
               item.mark = 0
             }
           })
@@ -212,7 +212,7 @@
 
             // 隐藏所有操作
             item.hiddenOperate = true
-            if (item.supervisory) {
+            if (item.supervisory && this[item.supervisory]()) {
               item.hiddenOperate = false
             }
           }
@@ -490,6 +490,12 @@
             value: item
           }
         })
+      },
+      materialSupervisory () {
+        if (this.selectdata.userid === this.$login.f.id) {
+          return true
+        }
+        return false
       }
     },
     events:{
@@ -737,7 +743,7 @@
           f_process_id : this.show_data.f_process_id,
           f_operator_id: this.$login.f.id,
           f_operator: this.$login.f.name,
-          f_operation_date: new Date(),
+          f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
           f_orgid: this.$login.f.orgid,
           f_orgname: this.$login.f.orgs
         }