apply-clients 3.3.10 → 3.3.14

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

@@ -200,26 +200,36 @@
         <div class="form-group col-sm-6">
           <label class="col-sm-4 control-label">安&ensp;装&ensp;人：</label>
           <div class="col-sm-8">
-            <input-select
-              class="select select_list"
-              :value.sync="item.f_install_person"
-              v-model="item.f_install_person"
-              :options="installperson"
-              :disable="mark === 1"
-              :valueSingle="true"></input-select>
+            <input class="form-control input_view" style=""
+                   v-model="item.f_install_person"
+                   :value.sync="installperson"
+                   placeholder="安装人"
+                   readonly/>
+<!--            <input-select-->
+<!--              class="select select_list"-->
+<!--              :value.sync="item.f_install_person"-->
+<!--              v-model="item.f_install_person"-->
+<!--              :options="installperson"-->
+<!--              :disable="mark === 1"-->
+<!--              :valueSingle="true"></input-select>-->
           </div>
         </div>
         <div class="form-group col-sm-6">
             <label class="col-sm-4 control-label">安装日期：</label>
             <div class="col-sm-8">
-              <datepicker
-                placeholder="安装日期"
-                :value.sync="item.f_install_date"
-                v-model="item.f_install_date"
-                format="yyyy-MM-dd HH:mm:ss"
-                :disabled="mark === 1"
-                :show-reset-button="reset">
-              </datepicker>
+              <input class="form-control input_view" style=""
+                     v-model="item.f_install_date"
+                     :value.sync="installdate(item.f_install_date)"
+                     placeholder="安装日期"
+                     readonly/>
+<!--              <datepicker-->
+<!--                placeholder="安装日期"-->
+<!--                :value.sync="item.f_install_date"-->
+<!--                v-model="item.f_install_date"-->
+<!--                format="yyyy-MM-dd HH:mm:ss"-->
+<!--                :disabled="mark === 1"-->
+<!--                :show-reset-button="reset">-->
+<!--              </datepicker>-->
             </div>
           </div>
       </div>
@@ -239,6 +249,23 @@ import Vue from 'vue'
 import {PagedList} from 'vue-client'
 import {HttpResetClass} from 'vue-client'
 import {isEmpty} from '../../../Util'
+// Date格式化
+Date.prototype.Format = function (fmt) {
+  var o = {
+    'M+': this.getMonth() + 1, // 月份
+    'd+': this.getDate(), // 日
+    'H+': this.getHours(), // 小时
+    'm+': this.getMinutes(), // 分
+    's+': this.getSeconds(), // 秒
+    'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
+    'S': this.getMilliseconds() // 毫秒
+  }
+  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length))
+  for (var k in o) {
+    if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+  }
+  return fmt
+}
 
 export default {
   title: '安装明细',
@@ -489,12 +516,15 @@ export default {
     },
     // 安装人
     installperson() {
-      return this.$login.f.f_installman.map(item => {
-        return {
-          label: item.name,
-          value: item.name
+      return this.$login.f.name
+    },
+    installdate() {
+      return function (f_install_date) {
+        if (isEmpty(f_install_date)) {
+          return new Date().Format('yyyy-MM-dd HH:mm:ss')
         }
-      })
+        return f_install_date
+      }
     },
     // 表向
     aroundmeters() {
@@ -525,4 +555,21 @@ export default {
   .clearfix:after{
     clear: both;
   }
+  .input_view{
+    padding: 8px;
+    background-color: #ffffff;
+    border-radius: 2px;
+    border: solid 1px #c7c7c7!important;
+    color: #333333!important;
+    font-size: 15px!important;
+  }
+
+  .input_view[readonly]{
+    border: 1px solid #DDD!important;
+    color:#ACA899!important;
+  }
+  .input_view:disabled{
+    border: 1px solid #DDD!important;
+    color:#ACA899!important;
+  }
 </style>

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

@@ -85,22 +85,25 @@
             </div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备编号：</label>
+            <label class="col-sm-4 control-label">生产日期：</label>
             <div class="col-sm-8">
-              <input class="form-control input_view" style=""
-                     placeholder="设备编号"
-                     v-model="item.f_devices_no"
-                     :value="item.f_devices_no"
-                     :readonly="mark === 1"/>
+              <datepicker
+                placeholder="生产日期"
+                :value.sync="item.f_make_date"
+                v-model="item.f_make_date"
+                format="yyyy-MM-dd HH:mm:ss"
+                @change="expireDate($index)"
+                :disabled="mark === 1">
+              </datepicker>
             </div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备品牌：</label>
+            <label class="col-sm-4 control-label">设备数量：</label>
             <div class="col-sm-8">
-              <input class="form-control input_view" style=""
-                     placeholder="设备品牌"
-                     v-model="item.f_brand"
-                     :value="item.f_brand"
+              <input class="form-control input_view" style="" type="number"
+                     placeholder="设备数量"
+                     v-model="item.f_devices_num"
+                     :value="item.f_devices_num"
                      :readonly="mark === 1"/>
             </div>
           </div>
@@ -110,43 +113,56 @@
               <input class="form-control input_view" style=""
                      placeholder="安装人"
                      v-model="item.f_input_person"
-                     :value="item.f_input_person"
-                     :readonly="mark === 1"/>
+                     :value="installperson"
+                     readonly/>
             </div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备型号：</label>
+            <label class="col-sm-4 control-label">安装日期：</label>
             <div class="col-sm-8">
               <input class="form-control input_view" style=""
-                     placeholder="设备型号"
-                     v-model="item.f_devices_model"
-                     :value="item.f_devices_model"
+                     placeholder="安装日期"
+                     v-model="item.f_input_date"
+                     :value="installdate(item.f_input_date)"
+                     readonly/>
+<!--              <datepicker-->
+<!--                placeholder="安装日期"-->
+<!--                :value.sync="item.f_input_date"-->
+<!--                v-model="item.f_input_date"-->
+<!--                format="yyyy-MM-dd HH:mm:ss"-->
+<!--                :disabled="mark === 1">-->
+<!--              </datepicker>-->
+            </div>
+          </div>
+          <!--
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">设备编号：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style=""
+                     placeholder="设备编号"
+                     v-model="item.f_devices_no"
+                     :value="item.f_devices_no"
                      :readonly="mark === 1"/>
             </div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">安装日期：</label>
+            <label class="col-sm-4 control-label">设备品牌：</label>
             <div class="col-sm-8">
-              <datepicker
-                placeholder="安装日期"
-                :value.sync="item.f_input_date"
-                v-model="item.f_input_date"
-                format="yyyy-MM-dd HH:mm:ss"
-                :disabled="mark === 1">
-              </datepicker>
+              <input class="form-control input_view" style=""
+                     placeholder="设备品牌"
+                     v-model="item.f_brand"
+                     :value="item.f_brand"
+                     :readonly="mark === 1"/>
             </div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">生产日期：</label>
+            <label class="col-sm-4 control-label">设备型号：</label>
             <div class="col-sm-8">
-              <datepicker
-                placeholder="生产日期"
-                :value.sync="item.f_make_date"
-                v-model="item.f_make_date"
-                format="yyyy-MM-dd HH:mm:ss"
-                @change="expireDate($index)"
-                :disabled="mark === 1">
-              </datepicker>
+              <input class="form-control input_view" style=""
+                     placeholder="设备型号"
+                     v-model="item.f_devices_model"
+                     :value="item.f_devices_model"
+                     :readonly="mark === 1"/>
             </div>
           </div>
           <div class="form-group col-sm-6">
@@ -172,16 +188,6 @@
               </datepicker>
             </div>
           </div>
-          <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">设备数量：</label>
-            <div class="col-sm-8">
-              <input class="form-control input_view" style="" type="number"
-                     placeholder="设备数量"
-                     v-model="item.f_devices_num"
-                     :value="item.f_devices_num"
-                     :readonly="mark === 1"/>
-            </div>
-          </div>
           <div class="form-group col-sm-6">
             <label class="col-sm-4 control-label">安装日期：</label>
             <div class="col-sm-8">
@@ -265,6 +271,7 @@
               ></textarea>
             </div>
           </div>
+          -->
         </div>
 
       </article>
@@ -282,6 +289,23 @@ import {getNowDate,isEmpty} from '../../../Util'
 import {PagedList} from 'vue-client'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
+// Date格式化
+Date.prototype.Format = function (fmt) {
+  var o = {
+    'M+': this.getMonth() + 1, // 月份
+    'd+': this.getDate(), // 日
+    'H+': this.getHours(), // 小时
+    'm+': this.getMinutes(), // 分
+    's+': this.getSeconds(), // 秒
+    'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
+    'S': this.getMilliseconds() // 毫秒
+  }
+  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length))
+  for (var k in o) {
+    if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+  }
+  return fmt
+}
 
 export default {
   title: '设备管理',
@@ -378,6 +402,18 @@ export default {
   events: {
   },
   computed: {
+    // 安装人
+    installperson() {
+      return this.$login.f.name
+    },
+    installdate() {
+      return function (f_install_date) {
+        if (isEmpty(f_install_date)) {
+          return new Date().Format('yyyy-MM-dd HH:mm:ss')
+        }
+        return f_install_date
+      }
+    },
     installType() {
       return this.$appdata.getParam("安装方式")
     },
@@ -402,4 +438,21 @@ export default {
   .textNoLineBreak {
     white-space: nowrap;
   }
+  .input_view{
+    padding: 8px;
+    background-color: #ffffff;
+    border-radius: 2px;
+    border: solid 1px #c7c7c7!important;
+    color: #333333!important;
+    font-size: 15px!important;
+  }
+
+  .input_view[readonly]{
+    border: 1px solid #DDD!important;
+    color:#ACA899!important;
+  }
+  .input_view:disabled{
+    border: 1px solid #DDD!important;
+    color:#ACA899!important;
+  }
 </style>

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

@@ -39,34 +39,36 @@
     <table border="1">
       <tr>
         <td colspan="6">
-          开票日期：{{new Date().Format('yyyy年MM月dd日')}}
+          <span>开票日期：{{ new Date().Format('yyyy年MM月dd日') }}</span>
+          <span>收据编码：{{ charge.f_charge_number }}</span>
+          <span>状态：{{ charge.f_charge_status }}</span>
         </td>
       </tr>
       <tr>
         <td>用户姓名</td>
-        <td colspan="2">{{ f_user_name }}</td>
-        <td>联系电话</td>
-        <td>{{ f_user_phone }}</td>
+        <td colspan="2">{{ charge.f_user_name }}</td>
+        <td>用户编号</td>
+        <td colspan="2">{{ selectdata.f_userinfo_code }}</td>
       </tr>
       <tr>
-        <td>地&emsp;&emsp;址</td>
-        <td colspan="4">{{ f_useraddress }}</td>
+        <td>用户地址</td>
+        <td colspan="5">{{ selectdata.f_address }}</td>
       </tr>
       <tr>
-        <td>收费项目</td>
-        <td colspan="2">庭院管网建设费</td>
-        <td>收费方式</td>
-        <td>{{ charge.f_payment_method }}</td>
+        <td>收款项目</td>
+        <td colspan="2">{{ charge.f_payment_term }}</td>
+        <td>收款方式</td>
+        <td colspan="2">{{ charge.f_payment_method }}</td>
       </tr>
       <tr>
-        <td>收费金额</td>
+        <td>金额</td>
         <td>{{ charge.f_charge_money }}</td>
-        <td>大&emsp;&emsp;写</td>
-        <td colspan="2">{{ charge.f_amount_words }}</td>
+        <td>金额大写</td>
+        <td colspan="3">{{ charge.f_amount_words }}</td>
       </tr>
       <tr>
         <td>备&emsp;&emsp;注</td>
-        <td colspan="4">{{ selectdata.f_entry_name }}</td>
+        <td colspan="5">{{ selectdata.f_entry_name }}</td>
       </tr>
     </table>
     <span>
@@ -105,19 +107,8 @@ export default {
     return {}
   },
   ready () {
-    console.log('------------------打印-------------------')
-    console.log()
   },
   computed: {
-    f_user_name () {
-      return isEmpty(this.charge.f_user_name) ? this.selectdata.f_contact : this.charge.f_user_name
-    },
-    f_user_phone () {
-      return isEmpty(this.charge.f_user_phone) ? this.selectdata.f_phone : this.charge.f_user_phone
-    },
-    f_useraddress () {
-      return isEmpty(this.charge.f_useraddress) ? `武安市${this.selectdata.f_street}${this.selectdata.f_residential_area}` : `武安市${this.charge.f_useraddress}`
-    },
     orgs () {
       return this.$login.f.orgs
     }