manage-client-xy 3.1.99 → 3.2.1

package/build/dev-server.js

@@ -11,10 +11,13 @@ var compiler = webpack(config)
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-var bendi = 'http://172.16.16.162:8300/'
-  ,fuwu ='http://172.16.16.162:8300/'
+var bendi = 'http://192.168.13.135:8300/'
+  , fuwu = 'http://192.168.13.135:8300/'
 // ,fuwu = 'http://172.16.16.163:8300/'
 var proxyTable = {
+  '/resource': {
+    target: 'http://192.168.13.135:31577/'
+  },
 
   '/rs/logic/exportfile': {
     target: bendi
@@ -37,7 +40,7 @@ var proxyTable = {
   '/rs/logic/getInitData': {
     target: fuwu
   },
-  '/rs/logic/getSaleInitData':{
+  '/rs/logic/getSaleInitData': {
     target: fuwu
   },
   // 用户登录服务地址
@@ -74,11 +77,11 @@ var proxyTable = {
   '/rs/file': {
     target: fuwu
   },
-  '/rs/logic/SumSettleFileImport':{
+  '/rs/logic/SumSettleFileImport': {
     target: 'http://127.0.0.1:8087'
   },
   '/rs': {
-     target: fuwu
+    target: fuwu
   }
 }
 

package/package.json

@@ -1,101 +1,101 @@
-{
-  "name": "manage-client-xy",
-  "version": "3.1.99",
-  "description": "经营管控模块前台组件",
-  "main": "src/index.js",
-  "directories": {
-    "test": "test"
-  },
-  "dependencies": {
-    "examples": "^0.1.0",
-    "less-loader": "^2.2.3",
-    "vue": "^1.0.17"
-  },
-  "devDependencies": {
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "co": "^4.6.0",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "echarts": "^4.1.0",
-    "eslint": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "less": "^2.7.3",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "ncp": "^2.0.0",
-    "rimraf": "^2.5.0",
-    "sale-client": "3.1.0-22",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "system-clients": "3.1.85-xianyang",
-    "url-loader": "^0.5.7",
-    "vue-amap": "0.5.10",
-    "vue-client": "1.22.38-xy",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "2.1.7",
-    "webpack": "1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3"
-  },
-  "scripts": {
-    "unit": "karma start test/unit/karma.conf.js --single-run",
-    "example": "node build/example-server.js",
-    "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",
-    "e2e": "node test/e2e/runner.js",
-    "release": "bash build/release.sh"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aote/management_modules.git"
-  },
-  "keywords": [
-    "manage"
-  ],
-  "author": "liuxudong",
-  "license": "ISC"
-}
+{
+  "name": "manage-client-xy",
+  "version": "3.2.1",
+  "description": "经营管控模块前台组件",
+  "main": "src/index.js",
+  "directories": {
+    "test": "test"
+  },
+  "dependencies": {
+    "examples": "^0.1.0",
+    "less-loader": "^2.2.3",
+    "vue": "^1.0.17"
+  },
+  "devDependencies": {
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "co": "^4.6.0",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "echarts": "^4.1.0",
+    "eslint": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.8.4",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "less": "^2.7.3",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "ncp": "^2.0.0",
+    "rimraf": "^2.5.0",
+    "sale-client": "3.1.0-22",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "system-clients": "3.1.85-xianyang",
+    "url-loader": "^0.5.7",
+    "vue-amap": "0.5.10",
+    "vue-client": "1.22.38-xy",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "2.1.7",
+    "webpack": "1.12.2",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3"
+  },
+  "scripts": {
+    "unit": "karma start test/unit/karma.conf.js --single-run",
+    "example": "node build/example-server.js",
+    "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",
+    "e2e": "node test/e2e/runner.js",
+    "release": "bash build/release.sh"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aote/management_modules.git"
+  },
+  "keywords": [
+    "manage"
+  ],
+  "author": "liuxudong",
+  "license": "ISC"
+}

package/src/components/ManageHome/ImportSupplygas/UpdateSupply.vue

@@ -1,187 +1,187 @@
-<template>
-  <div class="auto select-overspread">
-    <div class="panel panel-info">
-      <div class="panel-heading">
-        <h3 class="panel-title">修改用户信息</h3>
-      </div>
-    </div>
-    <validator name="v">
-      <form class="form-horizontal">
-        <div class="col-sm-12 form-group" style="margin-top: 100px;">
-          <div class="col-sm-4" :class="[$v.f_gasmun.required ? 'has-error': '']">
-            <label class="col-sm-6 control-label">供气量:</label>
-            <div class="col-sm-4">
-              <input type="text" onkeyup="value=value.replace(/[^\.\d]/g,'')"  onblur="value=value.replace(/[^\.\d]/g,'')" onblur="this.v();" class="form-control" v-model="model.f_gasmun" v-validate:f_gasmun='{required: true }'/>
-            </div>
-          </div>
-          <div class="col-sm-4" :class="[$v.f_gasunits.required ? 'has-error': '']">
-            <label class="col-sm-6 control-label">供气单位：</label>
-            <div class="col-sm-4">
-              <input type="text" class="form-control" v-model="model.f_gasunits" v-validate:f_gasunits='{required: true }'/>
-            </div>
-          </div>
-          <!--<div class="col-sm-4"  :class="[$v.fcredentials.required ? 'has-error select-error': '']">-->
-            <!--<label class="col-sm-6 control-label">证件类型:</label>-->
-            <!--<div class="col-sm-4">-->
-              <!--<input type="text" v-show="false" v-model="$refs.fcredentials.value[0]" v-validate:fcredentials='{required: true }'>-->
-              <!--<v-select :value.sync="model.f_credentials" v-model="model.f_credentials" v-ref:fcredentials :options='credentials'-->
-                        <!--placeholder='请选择' close-on-select></v-select>-->
-            <!--</div>-->
-          <!--</div>-->
-          <!--//<div class="col-sm-4"  :class="[$v.f_gasdate.required ? 'has-error select-error': '']"></div>-->
-          <div class="col-sm-4">
-            <label for="startDate" class="col-sm-6 control-label">供气时间:</label>
-            <div class="col-sm-4" >
-              <datepicker id="startDate" placeholder="开始日期"
-                          v-model="model.f_gasdate"
-                          :value.sync="model.f_gasdate"
-                          :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
-          </div>
-
-
-        </div>
-        <div class="col-sm-12 form-group">
-
-          <div class="col-sm-4" :class="[$v.f_department.required ? 'has-error': '']">
-            <label class="col-sm-6 control-label">操作部门：</label>
-            <div class="col-sm-4">
-              <input type="text" class="form-control" v-model="model.f_department" v-validate:f_department='{required: true }'/>
-            </div>
-          </div>
-          <!--<div class="col-sm-4" :class="[$v.f_password.required ? 'has-error': '']">-->
-            <!--<label class="col-sm-6 control-label">密码:</label>-->
-            <!--<div class="col-sm-4">-->
-              <!--<input type="text" class="form-control" v-model="model.f_password" v-validate:f_password='{required: true }'/>-->
-            <!--</div>-->
-          <!--</div>-->
-        </div>
-        <div class="col-sm-12 form-group">
-
-
-        </div>
-        <div class="col-sm-12 form-group">
-          <div class="col-sm-4">
-            <label class="col-sm-6 control-label">分公司:</label>
-            <div class="col-sm-4">
-              <input type="text" class="form-control" v-model="model.f_filiale" disabled/>
-            </div>
-          </div>
-          <div class="col-sm-4">
-            <label class="col-sm-6 control-label">操作时间:</label>
-            <div class="col-sm-4">
-              <input type="text" class="form-control" v-model="model.f_date" disabled/>
-            </div>
-          </div>
-          <div class="col-sm-4">
-            <label class="col-sm-6 control-label">操作人:</label>
-            <div class="col-sm-4">
-              <input type="text" class="form-control" v-model="model.f_operator" disabled/>
-            </div>
-          </div>
-        </div>
-      </form>
-    </validator>
-    <div class="col-sm-12 form-group" style="margin-top: 40px;">
-      <center>
-        <button type="button" @click="confirm()" class="btn btn-primary" style="width:80px; margin-left:40px;" :disabled='$v.invalid'>
-          保存
-        </button>
-        <button  type="button" @click="reset()" class="btn btn-warning" style="width:80px; margin-left:40px;">
-          撤销
-        </button>
-      </center>
-    </div>
-  </div>
-</template>
-<script>
-  import * as Util from '../../../stores/Util'
-  //import AppData from '../../../../stores/AppData'
-  export default {
-    title: '添加人员信息',
-    data () {
-      return {
-        model: {
-           //f_filiale: Util. f.f_fengongsi,
-          //id: 185,
-          f_filiale: null,
-           f_date: Util.toStandardDateString(),
-          // f_operator: Util.f.name,
-          f_operator: null,
-           f_gasdate: Util.toStandardDateString(),
-          f_gasmun : null,
-          f_gasunits : null,
-          f_department : null
-        }
-      }
-    },
-    props: ['upperson'],
-    ready () {
-      this.$nextTick(() => {
-        this.$dispatch('hiddenpaged')
-        // this.upperson.f_credentials = this.upperson.f_credentials ?  this.upperson.f_credentials : this.model.f_credentials
-        // this.upperson.f_inputtor_type = this.upperson.f_inputtor_type ?  this.upperson.f_inputtor_type : this.model.f_inputtor_type
-        // this.upperson.f_parentname = this.upperson.f_parentname ?  this.upperson.f_parentname : this.model.f_parentname
-        // this.model = Object.assign({}, this.model, this.upperson)
-        // this.model.f_credentials = [this.model.f_credentials]
-        // this.model.f_inputtor_type = [this.model.f_inputtor_type]
-        // this.model.f_parentname = [this.model.f_parentname]
-        console.log("组件之间的传值 f_gasmun,f_gasunits,f_department")
-        this.model = Object.assign({}, this.model, this.upperson) //添加id，识别是否为更新操作
-        console.log(this.upperson.f_gasmun);
-        console.log(this.model.f_gasmun);
-        console.log(this.upperson.f_gasunits);
-        console.log(this.upperson.f_department)
-        //thi.model.id = this.upperson.id
-        this.model.f_gasmun = this.upperson.f_gasmun //? this.upperson.f_gasmun :this.model.f_gasmun;
-        this.model.f_gasunits = this.upperson.f_gasunits //? this.upperson.f_gasunits :this.model.f_gasunits;
-        this.model.f_department = this.upperson.f_department //? this.upperson.f_department :this.model.f_department;
-      })
-    },
-    methods: {
-      confirm() {
-        console.log(this.model),
-        this.model.f_gasdate //= this.model.startDate;//供气时间赋值
-        //姓名相同所以不需要赋值
-        this.model.f_department=this.model.f_department;//操作部门
-        this.model.f_filiale //= this.model.f_fengongsi;//分公司赋值
-        this.model.f_date //= this.model.f_operator_date;//操作日期赋值
-        this.$resetpost('rs/entity/t_supplygas', this.model).then(() => {
-          this.reset()
-        })
-      },
-      reset () {
-        this.$dispatch('close')
-      }
-    },
-    watch: {
-      'upperson' () {
-        this.$nextTick(() => {
-          this.$dispatch('hiddenpaged')
-          // this.upperson.f_credentials = this.upperson.f_credentials ?  this.upperson.f_credentials : this.model.f_credentials
-          // this.upperson.f_inputtor_type = this.upperson.f_inputtor_type ?  this.upperson.f_inputtor_type : this.model.f_inputtor_type
-          // this.upperson.f_parentname = this.upperson.f_parentname ?  this.upperson.f_parentname : this.model.f_parentname
-          // this.model = Object.assign({}, this.model, this.upperson)
-           this.model.f_gasmun = [this.model.f_gasmun]
-           this.model.f_gasunits = [this.model.f_gasunits]
-           this.model.f_date = [this.model.f_date]
-        })
-      }
-    },
-    computed: {
-      // credentials (){
-      //   return AppData.getParam("证件类型")
-      // },
-      // inputtortype () {
-      //   return AppData.getParam("角色类型")
-      // },
-      // parentname () {
-      //   return AppData.getParam("营业网点")
-      // }
-    }
-  }
-</script>
-
+<template>
+  <div class="auto select-overspread">
+    <div class="panel panel-info">
+      <div class="panel-heading">
+        <h3 class="panel-title">修改用户信息</h3>
+      </div>
+    </div>
+    <validator name="v">
+      <form class="form-horizontal">
+        <div class="col-sm-12 form-group" style="margin-top: 100px;">
+          <div class="col-sm-4" :class="[$v.f_gasmun.required ? 'has-error': '']">
+            <label class="col-sm-6 control-label">供气量:</label>
+            <div class="col-sm-4">
+              <input type="text" onkeyup="value=value.replace(/[^\.\d]/g,'')"  onblur="value=value.replace(/[^\.\d]/g,'')" onblur="this.v();" class="form-control" v-model="model.f_gasmun" v-validate:f_gasmun='{required: true }'/>
+            </div>
+          </div>
+          <div class="col-sm-4" :class="[$v.f_gasunits.required ? 'has-error': '']">
+            <label class="col-sm-6 control-label">供气单位：</label>
+            <div class="col-sm-4">
+              <input type="text" class="form-control" v-model="model.f_gasunits" v-validate:f_gasunits='{required: true }'/>
+            </div>
+          </div>
+          <!--<div class="col-sm-4"  :class="[$v.fcredentials.required ? 'has-error select-error': '']">-->
+            <!--<label class="col-sm-6 control-label">证件类型:</label>-->
+            <!--<div class="col-sm-4">-->
+              <!--<input type="text" v-show="false" v-model="$refs.fcredentials.value[0]" v-validate:fcredentials='{required: true }'>-->
+              <!--<v-select :value.sync="model.f_credentials" v-model="model.f_credentials" v-ref:fcredentials :options='credentials'-->
+                        <!--placeholder='请选择' close-on-select></v-select>-->
+            <!--</div>-->
+          <!--</div>-->
+          <!--//<div class="col-sm-4"  :class="[$v.f_gasdate.required ? 'has-error select-error': '']"></div>-->
+          <div class="col-sm-4">
+            <label for="startDate" class="col-sm-6 control-label">供气时间:</label>
+            <div class="col-sm-4" >
+              <datepicker id="startDate" placeholder="开始日期"
+                          v-model="model.f_gasdate"
+                          :value.sync="model.f_gasdate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+          </div>
+
+
+        </div>
+        <div class="col-sm-12 form-group">
+
+          <div class="col-sm-4" :class="[$v.f_department.required ? 'has-error': '']">
+            <label class="col-sm-6 control-label">操作部门：</label>
+            <div class="col-sm-4">
+              <input type="text" class="form-control" v-model="model.f_department" v-validate:f_department='{required: true }'/>
+            </div>
+          </div>
+          <!--<div class="col-sm-4" :class="[$v.f_password.required ? 'has-error': '']">-->
+            <!--<label class="col-sm-6 control-label">密码:</label>-->
+            <!--<div class="col-sm-4">-->
+              <!--<input type="text" class="form-control" v-model="model.f_password" v-validate:f_password='{required: true }'/>-->
+            <!--</div>-->
+          <!--</div>-->
+        </div>
+        <div class="col-sm-12 form-group">
+
+
+        </div>
+        <div class="col-sm-12 form-group">
+          <div class="col-sm-4">
+            <label class="col-sm-6 control-label">分公司:</label>
+            <div class="col-sm-4">
+              <input type="text" class="form-control" v-model="model.f_filiale" disabled/>
+            </div>
+          </div>
+          <div class="col-sm-4">
+            <label class="col-sm-6 control-label">操作时间:</label>
+            <div class="col-sm-4">
+              <input type="text" class="form-control" v-model="model.f_date" disabled/>
+            </div>
+          </div>
+          <div class="col-sm-4">
+            <label class="col-sm-6 control-label">操作人:</label>
+            <div class="col-sm-4">
+              <input type="text" class="form-control" v-model="model.f_operator" disabled/>
+            </div>
+          </div>
+        </div>
+      </form>
+    </validator>
+    <div class="col-sm-12 form-group" style="margin-top: 40px;">
+      <center>
+        <button type="button" @click="confirm()" class="btn btn-primary" style="width:80px; margin-left:40px;" :disabled='$v.invalid'>
+          保存
+        </button>
+        <button  type="button" @click="reset()" class="btn btn-warning" style="width:80px; margin-left:40px;">
+          撤销
+        </button>
+      </center>
+    </div>
+  </div>
+</template>
+<script>
+  import * as Util from '../../../stores/Util'
+  //import AppData from '../../../../stores/AppData'
+  export default {
+    title: '添加人员信息',
+    data () {
+      return {
+        model: {
+           //f_filiale: Util. f.f_fengongsi,
+          //id: 185,
+          f_filiale: null,
+           f_date: Util.toStandardDateString(),
+          // f_operator: Util.f.name,
+          f_operator: null,
+           f_gasdate: Util.toStandardDateString(),
+          f_gasmun : null,
+          f_gasunits : null,
+          f_department : null
+        }
+      }
+    },
+    props: ['upperson'],
+    ready () {
+      this.$nextTick(() => {
+        this.$dispatch('hiddenpaged')
+        // this.upperson.f_credentials = this.upperson.f_credentials ?  this.upperson.f_credentials : this.model.f_credentials
+        // this.upperson.f_inputtor_type = this.upperson.f_inputtor_type ?  this.upperson.f_inputtor_type : this.model.f_inputtor_type
+        // this.upperson.f_parentname = this.upperson.f_parentname ?  this.upperson.f_parentname : this.model.f_parentname
+        // this.model = Object.assign({}, this.model, this.upperson)
+        // this.model.f_credentials = [this.model.f_credentials]
+        // this.model.f_inputtor_type = [this.model.f_inputtor_type]
+        // this.model.f_parentname = [this.model.f_parentname]
+        console.log("组件之间的传值 f_gasmun,f_gasunits,f_department")
+        this.model = Object.assign({}, this.model, this.upperson) //添加id，识别是否为更新操作
+        console.log(this.upperson.f_gasmun);
+        console.log(this.model.f_gasmun);
+        console.log(this.upperson.f_gasunits);
+        console.log(this.upperson.f_department)
+        //thi.model.id = this.upperson.id
+        this.model.f_gasmun = this.upperson.f_gasmun //? this.upperson.f_gasmun :this.model.f_gasmun;
+        this.model.f_gasunits = this.upperson.f_gasunits //? this.upperson.f_gasunits :this.model.f_gasunits;
+        this.model.f_department = this.upperson.f_department //? this.upperson.f_department :this.model.f_department;
+      })
+    },
+    methods: {
+      confirm() {
+        console.log(this.model),
+        this.model.f_gasdate //= this.model.startDate;//供气时间赋值
+        //姓名相同所以不需要赋值
+        this.model.f_department=this.model.f_department;//操作部门
+        this.model.f_filiale //= this.model.f_fengongsi;//分公司赋值
+        this.model.f_date //= this.model.f_operator_date;//操作日期赋值
+        this.$resetpost('rs/entity/t_supplygas', this.model).then(() => {
+          this.reset()
+        })
+      },
+      reset () {
+        this.$dispatch('close')
+      }
+    },
+    watch: {
+      'upperson' () {
+        this.$nextTick(() => {
+          this.$dispatch('hiddenpaged')
+          // this.upperson.f_credentials = this.upperson.f_credentials ?  this.upperson.f_credentials : this.model.f_credentials
+          // this.upperson.f_inputtor_type = this.upperson.f_inputtor_type ?  this.upperson.f_inputtor_type : this.model.f_inputtor_type
+          // this.upperson.f_parentname = this.upperson.f_parentname ?  this.upperson.f_parentname : this.model.f_parentname
+          // this.model = Object.assign({}, this.model, this.upperson)
+           this.model.f_gasmun = [this.model.f_gasmun]
+           this.model.f_gasunits = [this.model.f_gasunits]
+           this.model.f_date = [this.model.f_date]
+        })
+      }
+    },
+    computed: {
+      // credentials (){
+      //   return AppData.getParam("证件类型")
+      // },
+      // inputtortype () {
+      //   return AppData.getParam("角色类型")
+      // },
+      // parentname () {
+      //   return AppData.getParam("营业网点")
+      // }
+    }
+  }
+</script>
+