apply-clients 3.3.29 → 3.3.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.3.29",
+  "version": "3.3.33",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/apply.js

@@ -61,6 +61,7 @@ export default function (filiale) {
   Vue.component('apply-charge-management', (resolve) => { require(['./components/product/Process/Processes/chargeManagement'], resolve) })
   Vue.component('apply-print-charge', (resolve) => { require(['./components/product/Process/Processes/Print/printCharge'], resolve) })
   Vue.component('apply-print-refund', (resolve) => { require(['./components/product/Process/Processes/Print/printRefund'], resolve) })
+  Vue.component('print-build-order', (resolve) => { require(['./components/product/Process/Processes/Print/printBuildOrder'], resolve) })
   // 补充协议
   Vue.component('supplemental-agreement', (resolve) => { require(['./components/product/Process/Processes/supplementalAgreement'], resolve) })
   // 选择用户信息
@@ -83,6 +84,8 @@ export default function (filiale) {
   Vue.component('monitor-old-apply', (resolve) => { require(['./components/product/OldApply/Monitor/MonitorApply'], resolve) })
   Vue.component('old-apply-message', (resolve) => { require(['./components/product/OldApply/OldApplyMessage'], resolve) })
 
+  Vue.component('apply-material-detailed', (resolve) => { require(['./components/product/Material/MaterialDetailed'], resolve) })
+
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/pc`).specialComp
     for (let key in filialeComp) {

package/src/components/android/AppOnetomany.vue

@@ -1,22 +1,36 @@
 <template>
   <div>
     <div class="col-sm-12 col-xs-12 form-group app-btn">
-      <button class="btn btn-info" @click.prevent="openAdd()" v-if="!onetomany.addHidden" :style="onetomany.addStyle">{{ onetomany.addText === 'default' || !onetomany.addText ? '添加' : onetomany.addText }}</button>
+      <button
+        :class="onetomany.add.class || 'btn btn-info'"
+        @click.prevent="openAdd()"
+        v-if="!onetomany.add.hidden"
+        :style="onetomany.add.style || ''">
+          {{ onetomany.add.text || '添加'}}
+      </button>
     </div>
     <div class="col-sm-12 col-xs-12">
       <list :model="onetomany" partial='list'>
         <div partial class="auto app-text panel">
           <div class="panel-body panel-self">
-            <div class="row" v-for="field in $parent.model.fields" v-if="!field.displayPosition || field.displayPosition === 'list'">
+            <div class="row" v-for="field in $parent.$parent.onetomany.fields" v-if="!field.displayPosition || field.displayPosition === 'list'">
               <p class="col-xs-3 text-left font label-justify"><b>{{ field.label }}</b></p>
               <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row[field.field] }}</p>
             </div>
             <div class="row text-right" v-if="!$parent.$parent.onetomany.hiddenOperate">
-              <button class="btn btn-warning" @click.prevent="$parent.$parent.openUpdate($index)" v-if="!$parent.$parent.onetomany.updateHidden">
-                <span :style="$parent.model.updateStyle">{{ $parent.model.updateText ? $parent.model.updateText : '修改' }}</span>
+              <button
+                :class="$parent.$parent.onetomany.update.style || 'btn btn-warning'"
+                @click.prevent="$parent.$parent.openUpdate($index)"
+                v-if="!$parent.$parent.onetomany.update.hidden"
+                :style="$parent.$parent.onetomany.update.style || ''">
+                {{ $parent.$parent.onetomany.update.text || '修改'}}
               </button>
-              <button class="btn btn-danger" @click.prevent="$parent.$parent.openDelete($index)" v-if="!$parent.$parent.onetomany.deleteHidden">
-                <span :style="$parent.model.deleteStyle">{{ $parent.model.deleteText ? $parent.model.deleteText : '删除' }}</span>
+              <button
+                :class="$parent.$parent.onetomany.delete.style || 'btn btn-danger'"
+                @click.prevent="$parent.$parent.openDelete($index)"
+                v-if="!$parent.$parent.onetomany.delete.hidden"
+                :style="$parent.$parent.onetomany.delete.style || ''">
+                {{ $parent.$parent.onetomany.delete.text || '删除'}}
               </button>
             </div>
           </div>
@@ -151,15 +165,15 @@ export default {
   methods: {
     confirmModal () {
       if (this.modelTitle === '新增') {
-        if (this.onetomany.addEvent) {
-          this.$dispatch(this.onetomany.addEvent, this.index)
+        if (this.onetomany.add.event) {
+          this.$dispatch(this.onetomany.add.event, this.index)
         } else {
           this.$dispatch('onetomanyadd', this.index)
         }
       }
       if (this.modelTitle === '修改') {
-        if (this.onetomany.updateEvent) {
-          this.$dispatch(this.onetomany.updateEvent, this.index, this.rowIndex)
+        if (this.onetomany.update.event) {
+          this.$dispatch(this.onetomany.update.event, this.index, this.rowIndex)
         } else {
           this.$dispatch('onetomanyupdate', this.index, this.rowIndex)
         }
@@ -192,10 +206,10 @@ export default {
       }
     },
     openDelete (rowIndex) {
-      this.$showMessage(this.onetomany.deleteMessage ? this.onetomany.deleteMessage : '您确定要删除这条记录吗？', ['confirm']).then((res) => {
+      this.$showMessage(this.onetomany.delete.message ? this.onetomany.delete.message : '您确定要删除这条记录吗？', ['confirm']).then((res) => {
         if (res === 'confirm') {
-          if (this.onetomany.deleteEvent) {
-            this.$dispatch(this.onetomany.deleteEvent, this.index, rowIndex)
+          if (this.onetomany.delete.event) {
+            this.$dispatch(this.onetomany.delete.event, this.index, rowIndex)
           } else {
             this.$dispatch('onetomanydelete', this.index, rowIndex)
           }
@@ -214,8 +228,8 @@ export default {
       this.modelTitle = '修改'
       this.rowIndex = rowIndex
 
-      if (this.onetomany.openUpdateEvent) {
-        this.$dispatch(this.onetomany.openUpdateEvent, this.index, this.rowIndex)
+      if (this.onetomany.update.openEvent) {
+        this.$dispatch(this.onetomany.update.openEvent, this.index, this.rowIndex)
       }
       this.$dispatch('openUpdateModel', this.index, this.rowIndex)
 
@@ -225,8 +239,8 @@ export default {
       this.disableModalButton()
       this.modelTitle = '新增'
 
-      if (this.onetomany.openAddEvent) {
-        this.$dispatch(this.onetomany.openAddEvent, this.index)
+      if (this.onetomany.add.openEvent) {
+        this.$dispatch(this.onetomany.add.openEvent, this.index)
       }
       this.$dispatch('openAddModel', this.index)
 

package/src/components/android/Function/AppFunctionServiceControl.vue

@@ -293,7 +293,10 @@
           null,
           {resolveMsg: null, rejectMsg: '删除失败！！！'}
         )
-
+        res = await this.$resetpost(
+          `${this.$androidUtil.getProxyUrl()}/rs/entity/t_apply`,
+          this.show_data
+        )
         this.breakControl()
       },
       async 'onetomanyupdate' (index, rowIndex) {
@@ -306,12 +309,20 @@
           `${this.$androidUtil.getProxyUrl()}/rs/entity/${this.show_data.onetomany[index].tables[0]}`,
           data
         )
-
+        res = await this.$resetpost(
+          `${this.$androidUtil.getProxyUrl()}/rs/entity/t_apply`,
+          this.show_data
+        )
         this.breakControl()
       },
       async 'onetomanyadd' (index) {
         let data = {
-          f_process_id : this.show_data.f_process_id
+          f_process_id : this.show_data.f_process_id,
+          f_operator_id: Vue.user.id,
+          f_operator: Vue.user.name,
+          f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
+          f_orgid: Vue.user.orgid,
+          f_orgname: Vue.user.orgs
         }
         this.show_data.onetomany[index].fields.forEach(item => {
           data[item.field] = item.value
@@ -320,6 +331,10 @@
           `${this.$androidUtil.getProxyUrl()}/rs/entity/${this.show_data.onetomany[index].tables[0]}`,
           data
         )
+        res = await this.$resetpost(
+          `${this.$androidUtil.getProxyUrl()}/rs/entity/t_apply`,
+          this.show_data
+        )
         this.breakControl()
       }
     },

package/src/components/android/Function/AppInstallFunction.vue

@@ -152,6 +152,10 @@
               <p class="col-xs-3 text-left font"><b>报建日期：</b></p>
               <p class="col-xs-9 text-left input-font">{{ row.f_apply_date }}</p>
             </div>
+            <div class="col-xs-12">
+              <p class="col-xs-3 text-left font"><b>施工备注：</b></p>
+              <p class="col-xs-9 text-left input-font">{{ row.f_construction_remarks }}</p>
+            </div>
 
             <div class="col-xs-12 text-center">
               <button