telephone-clients 4.0.0-1-14 → 4.0.0-1-15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telephone-clients",
-  "version": "4.0.0-1-14",
+  "version": "4.0.0-1-15",
   "description": "呼叫模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/pc/config/DefaultPrint.js

@@ -0,0 +1,7 @@
+export default{
+  //把打印需要默认选中的字段名放在config数组中
+  config: [
+    // "f_workorder_type", "f_repairtype",
+    "f_service_id","f_user_name","f_address","f_phone","f_contact_phone", "f_created_date", "f_remarks", "f_order_man"
+  ]
+}

package/src/components/shaoguan/config/DefaultPrint.js

@@ -0,0 +1,7 @@
+export default{
+  //把打印需要默认选中的字段名放在config数组中
+  config: [
+    // "f_workorder_type", "f_repairtype",
+    "f_service_id","f_user_name","f_address","f_phone","f_contact_phone", "f_created_date", "f_remarks", "f_order_man"
+  ]
+}

package/src/components/temp/SecuritycheckInfo.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="pc-finduser-page">
+  <div id="pc-finduser-page" v-show="!showinfo">
     <criteria-paged :model="model" v-ref:paged :simple="true">
 
       <data-grid :model="model" partial='list' v-ref:grid
@@ -25,20 +25,7 @@
       </data-grid>
     </criteria-paged>
   </div>
-  <modal :show.sync="infoshow" large="true" v-ref:modal backdrop="false" width="1200">
-    <header slot="modal-header" class="modal-header">
-      安检详情
-    </header>
-    <article slot="modal-body" class="modal-body">
-      <div class="from-group col-smm-12 col-md-12 col-xs-12" v-if="infoshow">
-        <new-check-paper :f_plan_id="onedata.f_check_plan_id" :item="onedata" role="view" >
-        </new-check-paper>
-      </div>
-    </article>
-    <footer slot="modal-footer" class="modal-footer">
-      <button type="button" class="btn btn-success" @click='close'>确认</button>
-    </footer>
-  </modal>
+  <new-check-paper v-if="showinfo" :f_plan_id="shouinfodata.f_check_plan_id" :item="shouinfodata" :role="'view'" v-on:showback="showback"></new-check-paper>
 </template>
 
 <script>
@@ -65,6 +52,8 @@
     title: '用户安检历史',
     data () {
       return {
+        showinfo:false,
+        shouinfodata:{},
         model: new PagedList((this.user && this.user.isphone) ? '${this.$androidUtil.getProxyUrl()}/' : '' + 'api/af-safecheck/sql/查找安检单', 5, {orderitem: '"f_onsite_time desc"',f_plan_id:'""',f_approved:'""',f_entry_status:'""',f_no_checkplan:'""',f_filialeid:'""'}),
         row: Object,
         infoshow:false,
@@ -78,12 +67,16 @@
       clearflg:0
     },
     methods: {
+      showback(){
+        this.showinfo = false
+      },
       close(){
         this.infoshow = false
       },
       change(row) {
           row.f_upload_state = '已传'
-          this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
+          this.shouinfodata = JSON.parse(JSON.stringify(row))
+          this.showinfo = true
       },
       // change(val){
       //

package/src/filiale/meihekou/android/AppInstallationMaterial.vue

@@ -13,7 +13,7 @@
     </div>
 
     <div class="y-form-item">
-      <label>材料分类</label>
+      <label>材料名称</label>
       <input-select
         class="select select_list y-form-item-input"
         :value.sync="item.f_typename"
@@ -25,7 +25,7 @@
     </div>
 
     <div class="y-form-item">
-      <label>型号</label>
+      <label>材料型号</label>
       <input-select
         class="select select_list y-form-item-input"
         :value.sync="item.f_typenumber"
@@ -164,11 +164,11 @@ export default {
       for (let index = 0; index < this.material.length; index++) {
         const item = this.material[index]
         if (!item.f_typename) {
-          this.$showMessage(`请选择材料${index + 1}的材料分类`)
+          this.$showMessage(`请选择材料${index + 1}的材料名称`)
           return;
         }
         if (!item.f_typenumber) {
-          this.$showMessage(`请选择材料${index + 1}的型号`)
+          this.$showMessage(`请选择材料${index + 1}的材料型号`)
           return;
         }
         if (!item.f_material_price) {
@@ -191,11 +191,11 @@ export default {
       for (let index = 0; index < this.material.length; index++) {
         const item = this.material[index]
         if (!item.f_typename) {
-          this.$showMessage(`请选择材料${index + 1}的材料分类`)
+          this.$showMessage(`请选择材料${index + 1}的材料名称`)
           return;
         }
         if (!item.f_typenumber) {
-          this.$showMessage(`请选择材料${index + 1}的型号`)
+          this.$showMessage(`请选择材料${index + 1}的材料型号`)
           return;
         }
         if (!item.f_material_price) {