Merge branch 'master' of gitlab.gavelinfo.com:lisu/sgaqgl-vue

babel.config.js

 const clearArrow = require('./tools/babel-clearArrow.js');
-const proPlugins = ['dynamic-import-node', [clearArrow]];
+const tryCatchAuto = require('common/src/babelPlugin/tryCatchAuto.js');
+const proPlugins = ['dynamic-import-node', [tryCatchAuto]];
 if (process.env.NODE_ENV === 'production') {
     proPlugins.push('transform-remove-console');
      proPlugins.push('transform-remove-debugger');

src/api/daily/maintenanceDuty.js

@@ -31,7 +31,17 @@ export function doDelete(query) {
   })
 }
 
-
+/**
+ * 生成履职任务
+ * in:id
+ */
+export function doAutoGen(query) {
+  return request({
+    url: '/aqgl/rcgl/lzbz/genLzrw',
+    method: 'post',
+    data: query||{}
+  })
+}
 
 
 

src/api/daily/maintenanceStandards.js

@@ -43,6 +43,18 @@ export function doQueryZyfl(query) {
   })
 }
 
+/**
+ * 生成危险作业
+ * in:id
+ */
+export function doAutoGen(query) {
+  return request({
+    url: '/aqgl/rcgl/wxzybz/genWxzy',
+    method: 'post',
+    data: query||{}
+  })
+}
+
 
 
 

src/api/daily/performanceReport.js

@@ -53,3 +53,5 @@ export function doAddDtl(query) {
 
 
 
+
+

src/views/daily/duty/edit.vue

@@ -14,7 +14,7 @@
       <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="履职内容"  ref="content" prop="content">
-            <RelSelect hasValue :optionsData='optionsData' style="width: 100%;" :params="{flid:form.flid}"  src='/aqgl/rcgl/lzbz/query'  clearable :match="{value:'content',label:'content'}" v-model='form.content' ></RelSelect>
+            <RelSelect hasValue :optionsData='optionsData' style="width: 100%;" :params="{flid:form.flid}"   clearable :match="{value:'content',label:'content'}" v-model='form.content' ></RelSelect>
            <!-- <el-input :readonly="readonly"  v-model="form.content" ></el-input> -->
           </el-form-item>
         </el-col>
@@ -46,9 +46,9 @@
     watch:{
       flid(val){
         queryFlnr({flid:val}).then(res=>{
-          if(res.data&&res.data.record){
-            this.content=''
-            this.optionsData=res.data.record||[]
+          if(res.data&&res.data.records){
+            this.form.content=''
+            this.optionsData=res.data.records||[]
           }
         })
       }

src/views/daily/maintenanceDuty/index.vue

@@ -23,6 +23,7 @@
 			<FieldButton  :app='app'></FieldButton>
 			<ExcelButton :app='app'></ExcelButton>
 			<!-- 额外按钮-->
+      <el-button size='mini' @click.native="autoGen()"  type="primary">生成任务</el-button>
 			<!-- 表头设置 -->
 
 			<!-- 权限-->
@@ -44,7 +45,8 @@
 		doQuery,
 		doAdd,
 		doUpdate,
-		doDelete
+		doDelete,
+    doAutoGen
 	} from  '@/api/daily/maintenanceDuty.js';
 	/* edit页面*/
 	import Edit from './edit'
@@ -91,6 +93,17 @@
 				apiUpdate: doUpdate,
 				/* 删除操作*/
 				apiDelete: doDelete,
+        autoGen() {
+          if (this.app.selectOne || this.app.clickOne) {
+            doAutoGen(this.singleItem).then(res=>{
+              if(res.success){
+                this.$success('生成任务成功！')
+              }
+            })
+          }else{
+            this.$warning('请选中标准进行操作！');
+          }
+        },
 				/* 初始化赋值操作*/
 				init() {
 

src/views/daily/maintenanceStandards/edit.vue

@@ -5,13 +5,13 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="分类"  ref="flid" prop="flid">
-                  <RelSelect style="width: 100%;"  src='/aqgl/rcgl/wxzyfl/query'  filterable clearable :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
+                  <RelSelect style="width: 100%;"  src='/aqgl/rcgl/wxzyfl/query'   clearable :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
                   <!--  <el-input :readonly="readonly"  v-model="form.bmid" ></el-input> -->
                 </el-form-item>
               </el-col>
                 <el-col :span="12">
                     <el-form-item label="部门"  ref="bmid" prop="bmid">
-                      <RelSelect style="width: 100%;"  src='/kzzx/bm/query'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
+                      <RelSelect style="width: 100%;"  src='/kzzx/bm/query'   clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
                       <!--  <el-input :readonly="readonly"  v-model="form.bmid" ></el-input> -->
                     </el-form-item>
                 </el-col>

src/views/daily/maintenanceStandards/index.vue

@@ -23,6 +23,7 @@
 			<FieldButton  :app='app'></FieldButton>
 			<ExcelButton :app='app'></ExcelButton>
 			<!-- 额外按钮-->
+      <el-button size='mini' @click.native="autoGen()"  type="primary">生成作业</el-button>
 			<!-- 表头设置 -->
 
 			<!-- 权限-->
@@ -44,7 +45,8 @@
 		doQuery,
 		doAdd,
 		doUpdate,
-		doDelete
+		doDelete,
+    doAutoGen
 	} from  '@/api/daily/maintenanceStandards';
 	/* edit页面*/
 	import Edit from './edit'
@@ -97,6 +99,18 @@
 				apiUpdate: doUpdate,
 				/* 删除操作*/
 				apiDelete: doDelete,
+
+        autoGen() {
+          if (this.app.selectOne || this.app.clickOne) {
+          doAutoGen(this.singleItem).then(res=>{
+            if(res.success){
+              this.$success('生成作业成功！')
+            }
+          })
+          }else{
+            this.$warning('请选中标准进行操作！');
+          }
+        },
 				/* 初始化赋值操作*/
 				init() {
 

src/views/daily/workInspection/edit.vue

@@ -31,7 +31,7 @@
             <el-row :gutter="20">
                 <el-col :span="24">
                     <el-form-item label="分类"  ref="flid" prop="flid">
-                       <RelSelect style="width: 100%;"  src='/aqgl/rcgl/wxzyfl/query'  filterable clearable :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
+                       <RelSelect style="width: 100%;"  src='/aqgl/rcgl/wxzyfl/query'   clearable :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
                     </el-form-item>
                 </el-col>
                 <el-col :span="24">

src/views/daily/workInspection/index.vue

@@ -32,9 +32,9 @@
       <el-row class="tool-bar">
         <PrintButton :app='app'></PrintButton>
         <ViewButton ref="view" :app='app'></ViewButton>
-        <AddButton ref="add" :app='app'></AddButton>
-        <CopyButton ref="copy" :app='app'></CopyButton>
-        <EditButton ref="edit" :app='app'></EditButton>
+       <!-- <AddButton ref="add" :app='app'></AddButton> -->
+       <!-- <CopyButton ref="copy" :app='app'></CopyButton> -->
+       <!-- <EditButton ref="edit" :app='app'></EditButton> -->
         <AttachFileButton :app='app'></AttachFileButton>
         <FieldButton :app='app'></FieldButton>
         <ExcelButton :app='app'></ExcelButton>
@@ -109,7 +109,7 @@
          {label: "分类", prop: "flName", fieldType: "ftString",width:192},
          {label: "人员", prop: "tbrName", fieldType: "ftString",width:192},
          // {label: "备注", prop: "bz", fieldType: "ftString",width:300},
-         {label: "状态", prop: "zt", fieldType: "ftString",width:100},
+         {label: "状态", prop: "ztName", fieldType: "ftString",width:100},
          {label: "维护人", prop: "whr", fieldType: "ftString"},
          {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
          {label: "创建人", prop: "cjr", fieldType: "ftString"},