apply-clients 3.2.50 → 3.2.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.2.50",
+  "version": "3.2.51",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -13,6 +13,7 @@
     "dev": "node build/dev-server.js",
     "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
     "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "buildandroid": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js",
     "e2e": "node test/e2e/runner.js",
     "release": "bash build/release.sh",
     "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js"
@@ -92,9 +93,9 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "system-clients": "3.1.89-6-qhgc",
-    "system-phone": "1.2.80-24",
+    "system-phone": "1.2.80-34",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.4",
+    "vue-client": "1.24.48",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/AndroidApp.vue

@@ -2,8 +2,8 @@
   <!-- <app-base> -->
   <div id="android-app">
     <article>
-<!--      <route :comp="{name: 'login-app'}"></route>-->
-      <route :comp="{name: 'app-exploration-user'}"></route>
+      <route :comp="{name: 'login-app'}"></route>
+<!--      <route :comp="{name: 'login'}"></route>-->
 <!--      <route :comp="{name: 'progress-report-list'}"></route>-->
     </article>
     <time-out></time-out>

package/src/apply.js

@@ -76,6 +76,9 @@ export default function () {
 
   Vue.component('ren-wu-dan', (resolve) => { require(['./components/product/Ledger/Supervisory/Service/RenWuDan'], resolve) })
 
+  Vue.component('prepare-contract', (resolve) => { require(['./components/product/Ledger/Supervisory/Service/PrepareContract'], resolve) })
+
+
   Vue.component('ledger-install-function', (resolve) => { require(['./components/product/Ledger/Function/InstallFunction'], resolve) })
   Vue.component('ledger-install-select', (resolve) => { require(['./components/product/Ledger/Function/InstallInfoSelect'], resolve) })
   Vue.component('ledger-function-service-control', (resolve) => { require(['./components/product/Ledger/Function/Service/FunctionServiceControl'], resolve) })
@@ -182,4 +185,8 @@ export default function () {
 
   Vue.component('import-apply', (resolve) => { require(['./components/product/Ledger/ImportApply/ImportApply'], resolve) })
 
+  //秦华材料库
+  Vue.component('picking-material-depot', (resolve) => { require(['./components/product/Ledger/QinhuaMaterial/PickingRecord/PickingMaterialDepot'], resolve) })
+  Vue.component('picking-adding-material', (resolve) => { require(['./components/product/Ledger/QinhuaMaterial/PickingRecord/PickingAddingMaterial'], resolve) })
+  Vue.component('picking-material-list', (resolve) => { require(['./components/product/Ledger/QinhuaMaterial/PickingRecord/PickingMaterialList'], resolve) })
 }

package/src/components/app_apply/Process/AppExplorationUser.vue

@@ -1,200 +1,200 @@
-<template>
-  <div style="width: 100%">
-    <criteria-paged :model="model" v-ref:cp>
-      <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
-        <div partial style="padding: 10px">
-          <div class="row app-row">
-            <div class="col-xs-4">
-              <label  class="font text-left">项目名称：</label>
-            </div>
-            <div class="col-xs-8" >
-              <input  class="search_input input-font" v-model=model.f_entry_name condition="CHARINDEX('{}',u.f_entry_name)>0 " />
-            </div>
-          </div>
-          <div class="row app-row">
-            <div class="col-xs-4">
-              <label  class="font text-left">CEA号：</label>
-            </div>
-            <div class="col-xs-8" >
-              <input  class="search_input input-font" v-model=model.f_cea_number condition="u.f_cea_number like '%{}%'" />
-            </div>
-          </div>
-          <div class="row app-row" v-if="$parent.$parent.criteriaShow">
-            <div class="col-xs-4">
-              <label  class="font text-left">工程编号：</label>
-            </div>
-            <div class="col-xs-8" >
-              <input  class="search_input input-font" v-model=model.f_project_number condition="u.f_project_number like '%{}%'" />
-            </div>
-          </div>
-          <div class="row app-row text-right" style="padding-bottom: 10px;height: auto;">
-            <button class="btn btn-primary" @click="$parent.$parent.search()">查询</button>
-            <button class="btn btn-info" @click="$parent.$parent.clear()">清空</button>
-            <button class="btn" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"></button>
-          </div>
-        </div>
-      </criteria>
-      <list :model="model" partial='list'>
-        <div partial class="auto app-text panel" style="margin: 10px">
-          <div class="panel-body panel-self">
-            <div class="col-xs-6">
-              <p class="col-xs-6 text-left font"><b>工程编号：</b></p>
-              <p class="col-xs-6 text-left input-font">{{ row.f_project_number }}</p>
-            </div>
-            <div class="col-xs-6">
-              <p class="col-xs-6 text-left font"><b>CEA&emsp;号：</b></p>
-              <p class="col-xs-6 text-left input-font">{{ row.f_cea_number }}</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_entry_name }}</p>
-            </div>
-            <div class="col-xs-6">
-              <p class="col-xs-6 text-left font"><b>项目类型：</b></p>
-              <p class="col-xs-6 text-left input-font">{{ row.f_apply_type }}</p>
-            </div>
-            <div class="col-xs-6">
-              <p class="col-xs-6 text-left font"><b>工程类型：</b></p>
-              <p class="col-xs-6 text-left input-font">{{ row.f_project_type }}</p>
-            </div>
-            <div class="col-xs-6">
-              <p class="col-xs-6 text-left font"><b>项目区域：</b></p>
-              <p class="col-xs-6 text-left input-font">{{ row.f_project_area }}</p>
-            </div>
-            <div class="col-xs-6">
-              <p class="col-xs-6 text-left font"><b>联&ensp;系&ensp;人：</b></p>
-              <p class="col-xs-6 text-left input-font">{{ row.f_contact }}</p>
-            </div>
-            <div class="col-xs-6">
-              <p class="col-xs-6 text-left font"><b>联系电话：</b></p>
-              <p class="col-xs-6 text-left input-font">{{ row.f_phone }}</p>
-            </div>
-            <div class="col-xs-6">
-              <p class="col-xs-6 text-left font"><b>办理环节：</b></p>
-              <p class="col-xs-6 text-left input-font">{{ row.defname }}</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_address }}</p>
-            </div>
-            <div class="col-xs-12 text-right">
-              <button class="btn btn-info" @click="$parent.$parent.$parent.click(row)">处理</button>
-            </div>
-          </div>
-        </div>
-      </list>
-    </criteria-paged>
-  </div>
-</template>
-<script>
-import Vue from 'vue'
-import { PagedList, HttpResetClass } from 'vue-client'
-import {isEmpty} from '../../Util'
-export default {
-  title: '报建流程',
-  data () {
-    return {
-      model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`, 20, {
-        // model: new PagedList('rs/sql/checkuser', 20, {
-        data: {
-          id: Vue.user.id,
-          orgid: Vue.user.orgid
-          // id: '266',
-          // orgid: '212'
-        }
-      }),
-      criteriaShow: false
-    }
-  },
-  ready () {
-    this.search()
-  },
-  methods: {
-    clear () {
-      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
-        this.$refs.cp.$refs.cri.model[key] = null
-      })
-    },
-    // 查询
-    search () {
-      this.$refs.cp.$refs.cri.search()
-    },
-    searchCondition (args) {
-      args.condition += `and act.defname in ${this.appDefnames}`
-      this.model.search(args.condition, args.model)
-    },
-    click (row) {
-      let _this = this
-      this.$dispatch('gotoson', {
-        _this: _this,
-        title: row.defname,
-        safe: true
-      })
-      this.$goto('app-service-control', {selectdata: row}, 'self', _this.search)
-    }
-  },
-  events: {
-  },
-  watch: {
-  },
-  computed: {
-    appDefnames () {
-      // let list = [{label: '信息录入', value: '信息录入'}, {label: '工程前期', value: '工程前期'}, {label: '拟定方案', value: '拟定方案'}]
-      let list = this.$appdata.getParam('手机节点')
-      return `(${list.map(item => `'${item.value}'`).toString()})`
-    }
-  }
-}
-</script>
-<style scoped>
-.app-row {
-  height: auto;
-  background-color: white;
-  padding: 10px 10px 0 10px;
-  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
-}
-.search_input {
-  border: 0;
-  outline: none;
-}
-.input-font{
-  font: 15px PingFang-SC-Medium;
-  color: #333333;
-}
-.app-text {
-  font-size: 12px;
-}
-.panel-self{
-  border-radius: 10px;
-  border:1px solid #499EDF;
-  background-color: #F8F8F8;
-}
-.font{
-  font: 15px PingFang-SC-Medium;
-  color: #666666;
-}
-.input-font{
-  font: 15px PingFang-SC-Medium;
-  color: #333333;
-}
-
-button:hover {
-  border: none;
-}
-
-.button_shrink_top {
-  width: 34px;
-  height: 34px;
-  border: solid 1px #6aa6e2;
-  background-size: 100%;
-  background-image: url("../../../../static/newStyle/stretch_top.png")
-}
-
-.button_shrink_bottom {
-  width: 34px;
-  height: 34px;
-  border: solid 1px #6aa6e2;
-  background-size: 100%;
-  background-image: url("../../../../static/newStyle/stretch_bottom.png")
-}
-</style>
+<template>
+  <div style="width: 100%">
+    <criteria-paged :model="model" v-ref:cp>
+      <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
+        <div partial style="padding: 10px">
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <label  class="font text-left">项目名称：</label>
+            </div>
+            <div class="col-xs-8" >
+              <input  class="search_input input-font" v-model=model.f_entry_name condition="CHARINDEX('{}',u.f_entry_name)>0 " />
+            </div>
+          </div>
+          <div class="row app-row">
+            <div class="col-xs-4">
+              <label  class="font text-left">CEA号：</label>
+            </div>
+            <div class="col-xs-8" >
+              <input  class="search_input input-font" v-model=model.f_cea_number condition="u.f_cea_number like '%{}%'" />
+            </div>
+          </div>
+          <div class="row app-row" v-if="$parent.$parent.criteriaShow">
+            <div class="col-xs-4">
+              <label  class="font text-left">工程编号：</label>
+            </div>
+            <div class="col-xs-8" >
+              <input  class="search_input input-font" v-model=model.f_project_number condition="u.f_project_number like '%{}%'" />
+            </div>
+          </div>
+          <div class="row app-row text-right" style="padding-bottom: 10px;height: auto;">
+            <button class="btn btn-primary" @click="$parent.$parent.search()">查询</button>
+            <button class="btn btn-info" @click="$parent.$parent.clear()">清空</button>
+            <button class="btn" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"></button>
+          </div>
+        </div>
+      </criteria>
+      <list :model="model" partial='list'>
+        <div partial class="auto app-text panel" style="margin: 10px">
+          <div class="panel-body panel-self">
+            <div class="col-xs-6">
+              <p class="col-xs-6 text-left font"><b>工程编号：</b></p>
+              <p class="col-xs-6 text-left input-font">{{ row.f_project_number }}</p>
+            </div>
+            <div class="col-xs-6">
+              <p class="col-xs-6 text-left font"><b>CEA&emsp;号：</b></p>
+              <p class="col-xs-6 text-left input-font">{{ row.f_cea_number }}</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_entry_name }}</p>
+            </div>
+            <div class="col-xs-6">
+              <p class="col-xs-6 text-left font"><b>项目类型：</b></p>
+              <p class="col-xs-6 text-left input-font">{{ row.f_apply_type }}</p>
+            </div>
+            <div class="col-xs-6">
+              <p class="col-xs-6 text-left font"><b>工程类型：</b></p>
+              <p class="col-xs-6 text-left input-font">{{ row.f_project_type }}</p>
+            </div>
+            <div class="col-xs-6">
+              <p class="col-xs-6 text-left font"><b>项目区域：</b></p>
+              <p class="col-xs-6 text-left input-font">{{ row.f_project_area }}</p>
+            </div>
+            <div class="col-xs-6">
+              <p class="col-xs-6 text-left font"><b>联&ensp;系&ensp;人：</b></p>
+              <p class="col-xs-6 text-left input-font">{{ row.f_contact }}</p>
+            </div>
+            <div class="col-xs-6">
+              <p class="col-xs-6 text-left font"><b>联系电话：</b></p>
+              <p class="col-xs-6 text-left input-font">{{ row.f_phone }}</p>
+            </div>
+            <div class="col-xs-6">
+              <p class="col-xs-6 text-left font"><b>办理环节：</b></p>
+              <p class="col-xs-6 text-left input-font">{{ row.defname }}</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_address }}</p>
+            </div>
+            <div class="col-xs-12 text-right">
+              <button class="btn btn-info" @click="$parent.$parent.$parent.click(row)">处理</button>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+import Vue from 'vue'
+import { PagedList, HttpResetClass } from 'vue-client'
+import {isEmpty} from '../../Util'
+export default {
+  title: '报建流程',
+  data () {
+    return {
+      model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`, 20, {
+        // model: new PagedList('rs/sql/checkuser', 20, {
+        data: {
+          id: Vue.user.id,
+          orgid: Vue.user.orgid
+          // id: '266',
+          // orgid: '212'
+        }
+      }),
+      criteriaShow: false
+    }
+  },
+  ready () {
+    this.search()
+  },
+  methods: {
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = null
+      })
+    },
+    // 查询
+    search () {
+      this.$refs.cp.$refs.cri.search()
+    },
+    searchCondition (args) {
+      args.condition += `and act.defname in ${this.appDefnames}`
+      this.model.search(args.condition, args.model)
+    },
+    click (row) {
+      let _this = this
+      this.$dispatch('gotoson', {
+        _this: _this,
+        title: row.defname,
+        safe: true
+      })
+      this.$goto('app-service-control', {selectdata: row}, 'self', _this.search)
+    }
+  },
+  events: {
+  },
+  watch: {
+  },
+  computed: {
+    appDefnames () {
+      // let list = [{label: '信息录入', value: '信息录入'}, {label: '工程前期', value: '工程前期'}, {label: '拟定方案', value: '拟定方案'}]
+      let list = this.$appdata.getParam('手机节点')
+      return `(${list.map(item => `'${item.value}'`).toString()})`
+    }
+  }
+}
+</script>
+<style scoped>
+.app-row {
+  height: auto;
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
+.search_input {
+  border: 0;
+  outline: none;
+}
+.input-font{
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+.app-text {
+  font-size: 12px;
+}
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.font{
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+.input-font{
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+
+button:hover {
+  border: none;
+}
+
+.button_shrink_top {
+  width: 34px;
+  height: 34px;
+  border: solid 1px #6aa6e2;
+  background-size: 100%;
+  background-image: url("../../../../static/newStyle/stretch_top.png")
+}
+
+.button_shrink_bottom {
+  width: 34px;
+  height: 34px;
+  border: solid 1px #6aa6e2;
+  background-size: 100%;
+  background-image: url("../../../../static/newStyle/stretch_bottom.png")
+}
+</style>

package/src/components/app_apply/Supervisory/AppProcessSupervisory.vue

@@ -8,7 +8,7 @@
               <label  class="font text-left">项目名称：</label>
             </div>
             <div class="col-xs-8" >
-              <input  class="search_input input-font" v-model=model.f_entry_name condition="u.f_entry_name like '%{}%'" />
+              <input  class="search_input input-font" v-model=model.f_entry_name condition="CHARINDEX('{}',u.f_entry_name)>0 " />
             </div>
           </div>
           <div class="row app-row">