apply-clients 4.1.59-weinan → 4.1.61-weinan

package/src/components/product/Process/Processes/materialshoufei.vue

@@ -121,6 +121,11 @@ export default {
     // 模态框确定按钮保存数据
     async addpaydipetail() {
       let http = new HttpResetClass()
+      if(this.addItem.f_material_number==''||this.addItem.f_material_number==null){
+      //提示数量不能为空
+        this.$showMessage('请输入数量', 'warning')
+        throw  null
+      }
       this.addItem.f_process_id = this.selectdata.f_process_id
       this.addItem.f_apply_num = this.selectdata.f_apply_num
       this.addItem.f_operator = this.$login.f.name

package/src/components/product/Process/Service/ServiceControl.vue

@@ -746,6 +746,20 @@ export default {
         }
       }
       this.getPcd()
+    },
+    getPerSon(){
+      //查询是否有用户
+      let http = new HttpResetClass()
+      let data = {
+        condition: '1=1',
+        f_filialeid: this.$login.f.orgid,
+        f_process_id: this.selectdata.f_process_id,
+      }
+      let res = http.load('POST', 'rs/sql/getAddressAanUserinfo', {data:data}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
+      return res
     }
     // ========================= 武安 =================================
   },
@@ -772,8 +786,18 @@ export default {
     },
     // 获取view层button事件/
     async 'button'(model) {
-      // 修改提交数据
       model = Object.assign({}, this.selectdata, model)
+      if(this.show_data.components.length>0 && model.button.button_name === '提交') {
+        for (let i = 0; i < this.show_data.components.length; i++) {
+          if (this.show_data.components[i].name == 'apply-address-userinfo-management') {
+            let result = await this.getPerSon()
+            if (result.data.length == 0) {
+              this.$showAlert('请录入用户信息', 'warning', 3000)
+              return
+            }
+          }
+        }
+      }
       // 点击重置按钮就重置数据
       if (model.button.button_name === '重置') {
         this.$dispatch('breakControl', this.data)
@@ -787,7 +811,6 @@ export default {
         return
       }
       if (model.f_entry_name && model.defname == '报建登记'){
-        debugger
         let http = new HttpResetClass()
         let data = {
           tablename:'t_apply',

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

@@ -1,101 +1,101 @@
-<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>
-import {HttpResetClass} from "vue-client";
-
-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 = {
-        model: this.data,
-        loginUser: this.$login.f
-      }
-      let http = new HttpResetClass()
-      let res = await http.load('post', `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>
+import {HttpResetClass} from "vue-client";
+
+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 = {
+        model: this.data,
+        loginUser: this.$login.f
+      }
+      let http = new HttpResetClass()
+      let res = await http.load('post', `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>