From 3e237a1b2011da6bff9bb40914df7fff5a1a5899 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Mon, 16 Aug 2021 23:47:51 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawerDialog/index.vue | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/components/drawerDialog/index.vue b/src/components/drawerDialog/index.vue
index a83b70e..28d8287 100644
--- a/src/components/drawerDialog/index.vue
+++ b/src/components/drawerDialog/index.vue
@@ -151,10 +151,10 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="模板路径" prop="tempPath">
-                <el-input v-model="formTemplate.tempPath" type="text" style="width:400px" />
+                <el-input v-model="formTemplate.tempPath" clearable type="text" style="width:400px" />
               </el-form-item>
               <el-form-item label="检验依据" prop="jianyanyiju">
-                <el-input v-model="formTemplate.jianyanyiju" type="text" style="width:400px" />
+                <el-input v-model="formTemplate.jianyanyiju" clearable type="text" style="width:400px" />
               </el-form-item>
               <el-form-item label="对应字典" prop="withDicCode">
                 <el-select
@@ -188,12 +188,8 @@
               </el-form-item>
               <el-row :gutter="10">
                 <el-col>
-                  <el-form-item label="版本号" prop="version" required>
-                    <el-input
-                      v-model="formTemplate.version"
-                      type="text"
-                      style="width: 200px"
-                    />
+                  <el-form-item label="版本号（发布上线日期）" prop="version" required>
+                    <el-date-picker v-model="formTemplate.version" type="date" value-format="yyyy-MM-dd" />
                   </el-form-item>
                 </el-col>
               </el-row>

From cc7ff55e7fc334bd299fd9770f328f6390ebf2db Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Tue, 17 Aug 2021 23:38:55 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawerDialog/index.vue         | 29 +++++++++++++++----
 src/views/bggl/2000/jj/cyqp.vue               |  4 +--
 src/views/task/list.vue                       |  4 +--
 src/views/ysjl/1000/dj/sy/sysy.vue            | 17 +++++------
 src/views/ysjl/1000/dj/wb/gywb.vue            | 24 +++++----------
 src/views/ysjl/2000/2200/zbg/dj/edit.vue      |  6 ++--
 src/views/ysjl/2000/2200/zbg/nd/tuoche.vue    |  6 ++--
 src/views/ysjl/2000/2300/zbg/jj/cyqp.vue      |  4 +--
 src/views/ysjl/2000/2400/common/ycjl.vue      |  4 +--
 src/views/ysjl/2000/2400/zbg/jj/edit.vue      |  4 +--
 src/views/ysjl/7000/jj/edit.vue               |  2 +-
 .../ysjl/components/gascylinder_db_list.vue   |  8 -----
 .../ysjl/components/manufacture_db_list.vue   |  4 +--
 13 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/src/components/drawerDialog/index.vue b/src/components/drawerDialog/index.vue
index 28d8287..6bc3664 100644
--- a/src/components/drawerDialog/index.vue
+++ b/src/components/drawerDialog/index.vue
@@ -188,7 +188,7 @@
               </el-form-item>
               <el-row :gutter="10">
                 <el-col>
-                  <el-form-item label="版本号（发布上线日期）" prop="version" required>
+                  <el-form-item label="版本号(上线日期)" label-width="120px" prop="version">
                     <el-date-picker v-model="formTemplate.version" type="date" value-format="yyyy-MM-dd" />
                   </el-form-item>
                 </el-col>
@@ -537,7 +537,7 @@
               </el-radio>
             </el-tooltip>
             <el-tooltip class="item" effect="dark" content="达到表格限定高度，将最后一行移除，在下一页继续写入" placement="top-start">
-              <el-radio :label="1">
+              <el-radio :label="1" :disabled="form.writeMode === 2">
                 表格高度限制
               </el-radio>
             </el-tooltip>
@@ -639,7 +639,7 @@
           label-width="150px"
         >
           <el-radio-group v-model="form.affiliatedAddMode">
-            <el-radio v-for="(item, affiliatedAddModeIndex) in affiliatedAddModes" :key="affiliatedAddModeIndex" :label="affiliatedAddModeIndex">
+            <el-radio v-for="(item, affiliatedAddModeIndex) in affiliatedAddModes" :key="affiliatedAddModeIndex" :label="affiliatedAddModeIndex" :disabled="affiliatedAddModeIndex !== 0 && form.writeMode === 2">
               {{ item }}
             </el-radio>
           </el-radio-group>
@@ -761,7 +761,7 @@ export default {
         templateSettingId: '' // 配置id
       },
       form: {
-        templateId: '',
+        templateId: undefined,
         writeMode: 0,
         tableIndex: 1,
         tableMode: 0,
@@ -882,11 +882,30 @@ export default {
     getJylbList() {
       this.getNeibuList('jylb', null, null)
     },
+    initTemplateSettingForm() {
+      this.form = {
+        templateId: this.id,
+        writeMode: 0,
+        tableIndex: 1,
+        tableMode: 0,
+        tableRowFindMode: 0,
+        tableStartRow: 0,
+        tableRowCount: 0,
+        affiliatedTableStartRow: 0,
+        affiliatedTableRowCount: 0,
+        sort: 1,
+        tableType: 0,
+        isChild: false,
+        jyxmMode: 0,
+        affiliatedAddMode: 0
+      }
+    },
     addTemFn() {
+      this.initTemplateSettingForm()
       this.dialogVisible1 = true
     },
     editFnTem(row) {
-      this.form = row
+      this.form = this.common.deepCopy(row)
       this.dialogVisible1 = true
     },
     addtemFn() {
diff --git a/src/views/bggl/2000/jj/cyqp.vue b/src/views/bggl/2000/jj/cyqp.vue
index c9a2250..2fc303b 100644
--- a/src/views/bggl/2000/jj/cyqp.vue
+++ b/src/views/bggl/2000/jj/cyqp.vue
@@ -379,13 +379,13 @@ export default {
     },
     getYsjl() {
       this.api({
-        url: '/ysjl/getYsjlById',
+        url: '/ysjl',
         method: 'get',
         params: {
           ysjlId: this.$route.query.id
         }
       }).then(data => {
-        this.ysjl = data.ysjl
+        this.ysjl = data
         if (this.ysjl.jianyanrenyuan) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
         }
diff --git a/src/views/task/list.vue b/src/views/task/list.vue
index 63be94a..577a9ed 100644
--- a/src/views/task/list.vue
+++ b/src/views/task/list.vue
@@ -295,7 +295,7 @@ export default {
       currentRenwuId: 0,
       dialogEnclosureVisible: false,
       isSysUser: this.$store.getters.clientType === 'System',
-      searchNblist:[]
+      searchNblist: []
     }
   },
   computed: {
@@ -305,7 +305,7 @@ export default {
     allCategory: {
       handler(n, o) {
         console.log(n.filter(item => item.parentId))
-        this.searchNblist =  n.filter(item => item.parentId)
+        this.searchNblist = n.filter(item => item.parentId)
       },
       deep: true
     }
diff --git a/src/views/ysjl/1000/dj/sy/sysy.vue b/src/views/ysjl/1000/dj/sy/sysy.vue
index 18ff044..4badb8b 100644
--- a/src/views/ysjl/1000/dj/sy/sysy.vue
+++ b/src/views/ysjl/1000/dj/sy/sysy.vue
@@ -374,7 +374,6 @@ export default {
       })
     },
     initYsjl() {
-      const tempTime = new Date()
       this.api({
         url: '/ysjl/initYsjl',
         method: 'post',
@@ -392,7 +391,7 @@ export default {
         this.param = (data.param !== null && data.param !== undefined) ? data.param : {}
         this.ysjl.jilubianhao = this.jilubianhao
         this.ysjl.baogaobianhao = null // 避免从设备中取值导致信息错误
-        this.ysjl.bianzhiriqi = tempTime.getFullYear() + '-' + (tempTime.getMonth() + 1) + '-' + tempTime.getDate()
+        this.ysjl.bianzhiriqi = this.formatter.dateFormat('YYYY-MM-dd')
         this.ysjl.jianyanjielun = '合格'
         this.ysjl.jigouhezhunzhenghao = process.env.VUE_APP_HZZBH
         this.ysjl.beizhu = '/'
@@ -407,13 +406,13 @@ export default {
     },
     getYsjl(id) {
       this.api({
-        url: '/ysjl/getYsjlById',
+        url: '/ysjl',
         method: 'get',
         params: {
           ysjlId: id
         }
       }).then(data => {
-        this.ysjl = data.ysjl
+        this.ysjl = data
         if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
         }
@@ -518,7 +517,7 @@ export default {
       let type = ''
       this.ysjl.bglx = 1
       this.ysjl.cjState = 'ysjl'
-      this.ysjl.zfState = '0'
+      this.ysjl.zfState = 0
       this.ysjl.jianyanxiangmu = 'sysy'
       this.ysjl.jlprintState = 0
       if (operation === 'add') {
@@ -556,8 +555,10 @@ export default {
               data: {
                 ysjl: this.ysjl,
                 param: this.param,
-                jyxm: jyxm,
-                bgjyxm: jyxm,
+                cyJyxm: {
+                  jyxm: jyxm,
+                  bgjyxm: jyxm
+                },
                 flag: operation
               }
             }).then(data => {
@@ -567,8 +568,6 @@ export default {
                 this.$message({ message: '保存成功, 请前往待办记录中查看。', type: 'success' })
                 this.ysjl.id = data
                 this.param.ysjlId = data
-                // 修改16版任务状态
-                this.common.updStateByNew(this.ysjl.renwuId, '2', false)
                 // 刷新路由网址
                 this.$store.dispatch('delCurrentViews', {
                   view: this.$route,
diff --git a/src/views/ysjl/1000/dj/wb/gywb.vue b/src/views/ysjl/1000/dj/wb/gywb.vue
index b8d6955..82ba80d 100644
--- a/src/views/ysjl/1000/dj/wb/gywb.vue
+++ b/src/views/ysjl/1000/dj/wb/gywb.vue
@@ -467,13 +467,13 @@ export default {
     },
     getYsjl(id) {
       this.api({
-        url: '/ysjl/getYsjlById',
+        url: '/ysjl',
         method: 'get',
         params: {
           ysjlId: id
         }
       }).then(data => {
-        this.ysjl = data.ysjl
+        this.ysjl = data
         if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
         }
@@ -545,15 +545,7 @@ export default {
             })
           })
         } else {
-          data.forEach(row => {
-            this.sybjSData.push({
-              id: row.id,
-              jianyanxiang: row.jianyanxiang,
-              jianyanmu: row.jianyanmu,
-              jianyanneirong: row.jianyanneirong,
-              D1: row.d1
-            })
-          })
+          this.sybjSData = data
         }
         this.tableJs.getData(this.cols, this.rows, this.sybjSData)
       })
@@ -584,7 +576,7 @@ export default {
       let type = ''
       this.ysjl.bglx = 1
       this.ysjl.cjState = 'ysjl'
-      this.ysjl.zfState = '0'
+      this.ysjl.zfState = 0
       this.ysjl.jianyanxiangmu = 'gywb'
       this.ysjl.jlprintState = 0
       if (this.ysjl.jianyanjielun === '不符合要求') {
@@ -625,8 +617,10 @@ export default {
               data: {
                 ysjl: this.ysjl,
                 param: this.param,
-                jyxm: jyxm,
-                bgjyxm: jyxm,
+                cyJyxm: {
+                  jyxm: jyxm,
+                  bgjyxm: jyxm
+                },
                 flag: operation
               }
             }).then(data => {
@@ -636,8 +630,6 @@ export default {
                 this.$message({ message: '保存成功, 请前往待办记录中查看。', type: 'success' })
                 this.ysjl.id = data
                 this.param.ysjlId = data
-                // 修改16版任务状态
-                this.common.updStateByNew(this.ysjl.renwuId, '2', false)
                 // 刷新路由网址
                 this.$store.dispatch('delCurrentViews', {
                   view: this.$route,
diff --git a/src/views/ysjl/2000/2200/zbg/dj/edit.vue b/src/views/ysjl/2000/2200/zbg/dj/edit.vue
index 8d6b155..04205f8 100644
--- a/src/views/ysjl/2000/2200/zbg/dj/edit.vue
+++ b/src/views/ysjl/2000/2200/zbg/dj/edit.vue
@@ -948,13 +948,13 @@ export default {
     },
     getYsjl() {
       this.api({
-        url: '/ysjl/getYsjlById',
+        url: '/ysjl',
         method: 'get',
         params: {
           ysjlId: this.$route.query.id
         }
       }).then(data => {
-        this.ysjl = data.ysjl
+        this.ysjl = data
         if (this.ysjl.jianyanrenyuan) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
         }
@@ -1103,7 +1103,7 @@ export default {
       let type = ''
       this.ysjl.bglx = 1
       this.ysjl.cjState = 'ysjl'
-      this.ysjl.zfState = '0'
+      this.ysjl.zfState = 0
       this.ysjl.jianyanxiangmu = this.jyxm
       this.ysjl.jlprintState = 0
       this.ysjl.jigouhezhunzhenghao = process.env.VUE_APP_HZZBH
diff --git a/src/views/ysjl/2000/2200/zbg/nd/tuoche.vue b/src/views/ysjl/2000/2200/zbg/nd/tuoche.vue
index bcdef85..f08a23b 100644
--- a/src/views/ysjl/2000/2200/zbg/nd/tuoche.vue
+++ b/src/views/ysjl/2000/2200/zbg/nd/tuoche.vue
@@ -408,13 +408,13 @@ export default {
     },
     getYsjl() {
       this.api({
-        url: '/ysjl/getYsjlById',
+        url: '/ysjl',
         method: 'get',
         params: {
           ysjlId: this.$route.query.id
         }
       }).then(data => {
-        this.ysjl = data.ysjl
+        this.ysjl = data
         if (this.ysjl.jianyanrenyuan) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
         }
@@ -549,7 +549,7 @@ export default {
       let type = ''
       this.ysjl.bglx = 1
       this.ysjl.cjState = 'ysjl'
-      this.ysjl.zfState = '0'
+      this.ysjl.zfState = 0
       this.ysjl.jianyanxiangmu = this.jyxm
       this.ysjl.jlprintState = 0
       this.ysjl.jigouhezhunzhenghao = process.env.VUE_APP_HZZBH
diff --git a/src/views/ysjl/2000/2300/zbg/jj/cyqp.vue b/src/views/ysjl/2000/2300/zbg/jj/cyqp.vue
index 199d814..86d5706 100644
--- a/src/views/ysjl/2000/2300/zbg/jj/cyqp.vue
+++ b/src/views/ysjl/2000/2300/zbg/jj/cyqp.vue
@@ -344,13 +344,13 @@ export default {
     },
     getYsjl() {
       this.api({
-        url: '/ysjl/getYsjlById',
+        url: '/ysjl',
         method: 'get',
         params: {
           ysjlId: this.$route.query.id
         }
       }).then(data => {
-        this.ysjl = data.ysjl
+        this.ysjl = data
         if (this.ysjl.jianyanrenyuan) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
         }
diff --git a/src/views/ysjl/2000/2400/common/ycjl.vue b/src/views/ysjl/2000/2400/common/ycjl.vue
index df683e4..55fcd85 100644
--- a/src/views/ysjl/2000/2400/common/ycjl.vue
+++ b/src/views/ysjl/2000/2400/common/ycjl.vue
@@ -720,13 +720,13 @@ export default {
     },
     getYsjl() {
       this.api({
-        url: '/ysjl/getYsjlById',
+        url: '/ysjl',
         method: 'get',
         params: {
           ysjlId: this.$route.query.id
         }
       }).then(data => {
-        this.ysjl = data.ysjl
+        this.ysjl = data
         if (this.ysjl.jianyanrenyuan) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
         }
diff --git a/src/views/ysjl/2000/2400/zbg/jj/edit.vue b/src/views/ysjl/2000/2400/zbg/jj/edit.vue
index 15f4e05..a024a27 100644
--- a/src/views/ysjl/2000/2400/zbg/jj/edit.vue
+++ b/src/views/ysjl/2000/2400/zbg/jj/edit.vue
@@ -599,13 +599,13 @@ export default {
     },
     getYsjl() {
       this.api({
-        url: '/ysjl/getYsjlById',
+        url: '/ysjl',
         method: 'get',
         params: {
           ysjlId: this.$route.query.id
         }
       }).then(data => {
-        this.ysjl = data.ysjl
+        this.ysjl = data
         if (this.ysjl.jianyanrenyuan) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
         }
diff --git a/src/views/ysjl/7000/jj/edit.vue b/src/views/ysjl/7000/jj/edit.vue
index 826197f..0ee3d0a 100644
--- a/src/views/ysjl/7000/jj/edit.vue
+++ b/src/views/ysjl/7000/jj/edit.vue
@@ -535,7 +535,7 @@ export default {
       let type = ''
       this.ysjl.bglx = 1
       this.ysjl.cjState = 'ysjl'
-      this.ysjl.zfState = '0'
+      this.ysjl.zfState = 0
       this.ysjl.jlprintState = 0
       if (operation === 'add') {
         type = 'post'
diff --git a/src/views/ysjl/components/gascylinder_db_list.vue b/src/views/ysjl/components/gascylinder_db_list.vue
index 6d4c66e..f5069c1 100644
--- a/src/views/ysjl/components/gascylinder_db_list.vue
+++ b/src/views/ysjl/components/gascylinder_db_list.vue
@@ -248,14 +248,6 @@ export default {
           ids: ids
         }
       }).then(() => {
-        // 锅炉根据16版renwuId修改16版和18版任务状态
-        if (oldRwIds !== '') {
-          this.common.updStateByOld(oldRwIds, '0', false)
-        }
-        // 根据18版任务主键修改16版任务状态
-        if (newRwIds !== '') {
-          this.common.updStateByNew(newRwIds, '0', false)
-        }
         this.$message({
           message: '删除成功',
           type: 'success',
diff --git a/src/views/ysjl/components/manufacture_db_list.vue b/src/views/ysjl/components/manufacture_db_list.vue
index e654a17..4f38b00 100644
--- a/src/views/ysjl/components/manufacture_db_list.vue
+++ b/src/views/ysjl/components/manufacture_db_list.vue
@@ -685,13 +685,13 @@ export default {
     },
     async showDataComparison(row) {
       this.api({
-        url: '/ysjl/getYsjlById',
+        url: '/ysjl',
         method: 'get',
         params: {
           ysjlId: row.id
         }
       }).then(async data => {
-        this.selection = data.ysjl
+        this.selection = data
         await this.getParamByYsjlId(this.selection.id, this.selection.shebeizhongleidaima)
         this.api({
           url: '/renwu/get',

From e97d1a690efbdd43a51246c7e0aaf1fc627d2cf4 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Wed, 18 Aug 2021 19:43:50 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=B8=8B=E7=9A=84=E8=AE=BF=E9=97=AE=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E5=8F=8A=E5=85=B6=E4=BB=96=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.test                   |  8 ++++----
 .gitignore                  |  2 +-
 public/index.html           |  2 +-
 src/store/modules/user.js   |  2 +-
 src/views/flow/template.vue | 25 +++++++++++++++++++++----
 vue.config.js               |  2 +-
 6 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/.env.test b/.env.test
index 82c5c32..135c37a 100644
--- a/.env.test
+++ b/.env.test
@@ -1,13 +1,13 @@
 # 测试环境相关配置
 
 # 微服务IP
-VUE_APP_SERVER_ADDRESS = 'test.mingansei.com'
+VUE_APP_SERVER_ADDRESS = 'test.sdma.mingansei.com'
 
 # 省局数据后台IP
-VUE_APP_SJ_BASE_IP_ADDRESS = 'test.mingansei.com'
+VUE_APP_SJ_BASE_IP_ADDRESS = 'test.sdma.mingansei.com'
 
 # 微服务地址
-VUE_APP_SERVER_API = 'http://${VUE_APP_SERVER_ADDRESS}:9100'
+VUE_APP_SERVER_API = 'http://${VUE_APP_SERVER_ADDRESS}'
 
 # 业务后台访问地址
 VUE_APP_BASE_API = '${VUE_APP_SERVER_API}/sdma-manage/'
@@ -22,4 +22,4 @@ VUE_APP_SJ_API = 'http://${VUE_APP_SJ_BASE_IP_ADDRESS}:9092/SJSE/'
 VUE_APP_PREVIEW_API = '${VUE_APP_SERVER_API}/sdma-preview/'
 
 # websocket连接地址
-VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}:9100/sdma-websocket/websocket/'
+VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}/sdma-websocket/websocket/'
diff --git a/.gitignore b/.gitignore
index f3794e0..450ff73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 .DS_Store
 node_modules
-/jinan
+/sdmaFront
 
 # local env files
 .env.local
diff --git a/public/index.html b/public/index.html
index 7d61bc0..64e7f55 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <title>JNFront</title>
+  <title>SdmaFront</title>
 </head>
 <body>
 <div id="app"></div>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index da39107..523cae4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -22,7 +22,7 @@ const user = {
     allUser: [],
     allCategory: [],
     messageCount: [],
-    prodName: process.env.NODE_ENV === 'test' ? '/jinan' : '' // 开发环境下为空，生产环境下请设置为tomcat项目名称。(例如：/dist)
+    prodName: process.env.NODE_ENV === 'test' ? '/sdmaFront' : '' // 开发环境下为空，生产环境下请设置为tomcat项目名称。(例如：/dist)
   },
   mutations: {
     SET_USER: (state, userInfo) => {
diff --git a/src/views/flow/template.vue b/src/views/flow/template.vue
index 814c923..8d02bb9 100644
--- a/src/views/flow/template.vue
+++ b/src/views/flow/template.vue
@@ -63,6 +63,19 @@
               :value="item.value"
             />
           </el-select>
+          <el-select
+            v-model="listQuery.tempCategory"
+            placeholder="模板类型"
+            style="width: 200px"
+            clearable
+          >
+            <el-option
+              v-for="item in categoryList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
           <el-button type="primary" icon="el-icon-search" @click="handleFilter">
             查询
           </el-button>
@@ -274,14 +287,18 @@ export default {
         {
           value: 'YSJL',
           label: '原始记录'
-        },
-        {
+        }, {
           value: 'JYBG',
           label: '检验报告'
-        },
-        {
+        }, {
           value: 'OTHER',
           label: '其他'
+        }, {
+          value: 'HZD',
+          label: '回执单'
+        }, {
+          value: 'RWD',
+          label: '任务单'
         }
       ],
       formTemplate: {},
diff --git a/vue.config.js b/vue.config.js
index 1fc0e8e..0ed2f6b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -10,7 +10,7 @@ const name = pkg.name || 'sdma-front' // page title
 const port = process.env.NODE_ENV === 'development' ? 9527 : 8090
 console.log(process.env.NODE_ENV === 'development')
 module.exports = {
-  publicPath: './',
+  publicPath: process.env.NODE_ENV === 'test' ? '/sdmaFront' : './',
   outputDir: 'sdmaFront',
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV === 'development' ? 'error' : false,

From fc542b85aa1668a4ff2d76a395e36f81bd2bf4e3 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Wed, 18 Aug 2021 19:59:19 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                          | 8 ++++----
 src/views/ysjl/5000/dj/jdgy-cl/index.vue | 1 -
 src/views/ysjl/5000/dj/lygg-cl/index.vue | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.env.production b/.env.production
index 6ea4a3a..1953fee 100644
--- a/.env.production
+++ b/.env.production
@@ -1,13 +1,13 @@
 # 生产环境相关配置
 
 # 微服务IP
-VUE_APP_SERVER_ADDRESS = '192.168.1.130'
+VUE_APP_SERVER_ADDRESS = 'test.sdma.mingansei.com'
 
 # 省局数据后台IP
-VUE_APP_SJ_BASE_IP_ADDRESS = '192.168.1.130'
+VUE_APP_SJ_BASE_IP_ADDRESS = 'test.sdma.mingansei.com'
 
 # 微服务地址
-VUE_APP_SERVER_API = 'http://${VUE_APP_SERVER_ADDRESS}:9100'
+VUE_APP_SERVER_API = 'http://${VUE_APP_SERVER_ADDRESS}'
 
 # 业务后台访问地址
 VUE_APP_BASE_API = '${VUE_APP_SERVER_API}/sdma-manage/'
@@ -22,4 +22,4 @@ VUE_APP_SJ_API = 'http://${VUE_APP_SJ_BASE_IP_ADDRESS}:9092/SJSE/'
 VUE_APP_PREVIEW_API = '${VUE_APP_SERVER_API}/sdma-preview/'
 
 # websocket连接地址
-VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}:9100/sdma-websocket/websocket/'
+VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}/sdma-websocket/websocket/'
diff --git a/src/views/ysjl/5000/dj/jdgy-cl/index.vue b/src/views/ysjl/5000/dj/jdgy-cl/index.vue
index 5379139..dc5058e 100644
--- a/src/views/ysjl/5000/dj/jdgy-cl/index.vue
+++ b/src/views/ysjl/5000/dj/jdgy-cl/index.vue
@@ -357,7 +357,6 @@ import Sticky from '@/components/Sticky'
 import SignName from '@/views/common/SignName'
 import Utils from '@/utils/contact'
 import merge from 'webpack-merge'
-import { getDepartmentTreeList } from '@/api/common'
 export default {
   name: 'GlGynbYsjl',
   components: { SignName, Sticky },
diff --git a/src/views/ysjl/5000/dj/lygg-cl/index.vue b/src/views/ysjl/5000/dj/lygg-cl/index.vue
index 80b390c..4fa3e0b 100644
--- a/src/views/ysjl/5000/dj/lygg-cl/index.vue
+++ b/src/views/ysjl/5000/dj/lygg-cl/index.vue
@@ -367,7 +367,6 @@ import Sticky from '@/components/Sticky'
 import SignName from '@/views/common/SignName'
 import Utils from '@/utils/contact'
 import merge from 'webpack-merge'
-import { getDepartmentTreeList } from '@/api/common'
 export default {
   name: 'GlGynbYsjl',
   components: { SignName, Sticky },

From 61519ddb13366184c2e0e791bce248ae431c8e45 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Wed, 18 Aug 2021 21:24:00 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/icons/svg/termination.svg        |  1 +
 src/views/task/list.vue              | 22 +++------------
 src/views/ysjl/3000/common/index.vue | 40 ----------------------------
 3 files changed, 5 insertions(+), 58 deletions(-)
 create mode 100644 src/icons/svg/termination.svg

diff --git a/src/icons/svg/termination.svg b/src/icons/svg/termination.svg
new file mode 100644
index 0000000..96362ee
--- /dev/null
+++ b/src/icons/svg/termination.svg
@@ -0,0 +1 @@
+<svg t="1629288862231" class="icon" viewBox="0 0 1025 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11331" width="200" height="200"><path d="M151.379964 874.277018A511.17222 511.17222 0 0 1 861.398178 138.891882l12.907099 12.459823A511.17222 511.17222 0 1 1 151.379964 874.277018z m90.34969-632.575623a380.503822 380.503822 0 0 0-106.068236 206.385784h754.362405a380.503822 380.503822 0 0 0-93.48062-193.159203l-12.587616-13.226581a383.379165 383.379165 0 0 0-530.532868-11.181893l-11.693065 11.181893z m648.294169 335.840149H135.661418a380.503822 380.503822 0 0 0 93.48062 193.159202l12.587616 13.226582a383.379165 383.379165 0 0 0 530.532868 11.181892l11.629168-11.181892a380.503822 380.503822 0 0 0 106.068236-206.385784z" fill="#ffffff" opacity=".8" p-id="11332"></path></svg>
diff --git a/src/views/task/list.vue b/src/views/task/list.vue
index 577a9ed..b6e0039 100644
--- a/src/views/task/list.vue
+++ b/src/views/task/list.vue
@@ -21,8 +21,8 @@
           <el-button v-if="notHasDepartmentId(74)" type="success" icon="el-icon-success" @click="completeRenwu">
             任务完成
           </el-button>
-          <el-button type="info" icon="el-icon-minus" @click="terminationFn">
-            终止任务
+          <el-button type="danger" @click="terminationFn">
+            <svg-icon icon-class="termination" /> 终止任务
           </el-button>
         </div>
       </sticky>
@@ -37,7 +37,6 @@
           <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位名称" clearable style="width: 340px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 230px" @keyup.enter.native="handleFilter" />
           <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="使用登记证号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />
-          <!--<el-input v-model="listQuery.danweineibubianhao" placeholder="单位内编号" clearable style="width: 200px" @keyup.enter.native="handleFilter" />-->
           <el-button type="primary" icon="el-icon-search" @click="handleFilter">
             查询
           </el-button>
@@ -109,14 +108,6 @@
         <el-table-column :formatter="formatterSlrq" align="center" label="报检日期" prop="shouliriqi" width="120" sortable />
         <el-table-column align="center" label="下次检验日期" prop="xiacijianyanriqi" width="120" />
         <el-table-column :formatter="formatter.getChineseName" align="center" label="认领人" prop="renlingren" width="140" />
-        <el-table-column v-if="$store.getters.departmentId === 70 || hasRole('ADMIN')" align="center" label="操作" prop="acces" width="110" fixed="right">
-          <template slot-scope="scope">
-            <template v-if="scope.row.shebeizhongleidaima === '2000'">
-              <el-button title="预览 原始资料" circle size="medium" type="info" icon="el-icon-view" style="float: left" @click="common.viewRawRecords(scope.row.id)" />
-              <slice-upload :renwu-id="scope.row.id" />
-            </template>
-          </template>
-        </el-table-column>
       </template>
     </el-table>
     <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
@@ -218,25 +209,20 @@
       </el-table>
       <pagination v-show="totalCount>0" :total="totalCountCopy" :page-num.sync="listQueryCopy.pageNum" :page-row.sync="listQueryCopy.pageRow" @pagination="getListCopy" />
     </el-dialog>
-
-    <el-dialog title="查看相关鉴证" :modal-append-to-body="false" :visible.sync="dialogEnclosureVisible">
-      <enclosure :relation-id.sync="currentRenwuId" :if-liaison="false" :view-button="false" :is-show-hetong="isSysUser" />
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import Sticky from '@/components/Sticky'
-import SliceUpload from '@/components/SliceUpload'
 import Pagination from '@/components/Pagination'
 import Utils from '../../utils/contact.js'
 import { getOwnList, terminateRenwu, completeRenwuFn } from '@/api/renwu'
 import { cancelRenwuFn } from '@/api/common'
-import Enclosure from '@/views/common/Enclosure'
 import { mapGetters } from 'vuex'
+
 export default {
   name: 'MyTask',
-  components: { Sticky, Pagination, SliceUpload, Enclosure },
+  components: { Sticky, Pagination },
   filters: {
     screen(value) {
       console.log(value, 254444)
diff --git a/src/views/ysjl/3000/common/index.vue b/src/views/ysjl/3000/common/index.vue
index 75c748f..67986b9 100644
--- a/src/views/ysjl/3000/common/index.vue
+++ b/src/views/ysjl/3000/common/index.vue
@@ -22,7 +22,6 @@
             更新
           </el-button>
           <el-button
-            v-if="isSysUser"
             type="success"
             icon="el-icon-upload2"
             size="medium"
@@ -39,44 +38,6 @@
             预览
           </el-button>
         </template>
-        <template v-if="isSysUser">
-          <el-button type="primary" size="medium" @click="Signjyxm">
-            <svg-icon icon-class="sign" />
-            检验项目批量签名
-          </el-button>
-          <el-button
-            type="danger"
-            icon="el-icon-delete"
-            size="medium"
-            @click="signClear"
-          >
-            批量清除签名
-          </el-button>
-          <el-button
-            type="success"
-            size="medium"
-            icon="el-icon-edit"
-            @click="batchUpdDate"
-          >
-            批量修改日期
-          </el-button>
-          <el-button
-            type="primary"
-            size="medium"
-            icon="el-icon-info"
-            @click="showDialogRoleVisible"
-          >
-            编辑权限
-          </el-button>
-        </template>
-        <el-button
-          type="info"
-          size="medium"
-          icon="el-icon-info"
-          @click="dialogEnclosureVisible = true"
-        >
-          相关鉴证
-        </el-button>
       </div>
     </sticky>
     <el-tabs v-model="checkedTab" type="card">
@@ -816,7 +777,6 @@ export default {
       renlingren: [],
       xinghaoList: [],
       dicGzjz: [],
-      isSysUser: this.$store.getters.clientType === 'System',
       cols: [
         {
           name: 'jianyanxiang', // 参与计算的列名，必须和el-table-column prop=''值一致

From bd12415a01b04eaa9a812cab4f19d04663d2b654 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Thu, 19 Aug 2021 10:18:27 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BC=98=E5=8C=96Crud=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9C=89=E7=89=B9=E6=AE=8A=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=B3=A8=E5=85=A5=E6=A8=A1=E5=BC=8F=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/data.js              |  13 +--
 src/components/Crud/crud.js  | 154 +++++++++++++++--------------------
 src/views/document/index.vue |   4 +-
 3 files changed, 73 insertions(+), 98 deletions(-)

diff --git a/src/api/data.js b/src/api/data.js
index 530b4d5..551db4c 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -1,15 +1,10 @@
 import api from '@/utils/api'
 import qs from 'qs'
-import preview from '@/utils/preview'
-export function initData(url, params) {
-  return api({
+
+export function initData(apiRequest, url, params) {
+  const request = apiRequest || api
+  return request({
     url: url + '?' + qs.stringify(params, { indices: false }),
     method: 'get'
   })
 }
-export function initData1(url, params) {
-  return preview({
-    url: url + '?' + qs.stringify(params, { indices: false }),
-    method: 'get'
-  })
-}
diff --git a/src/components/Crud/crud.js b/src/components/Crud/crud.js
index e739560..4b8d2eb 100644
--- a/src/components/Crud/crud.js
+++ b/src/components/Crud/crud.js
@@ -1,4 +1,4 @@
-import { initData, initData1 } from '@/api/data'
+import { initData } from '@/api/data'
 import Vue from 'vue'
 
 /**
@@ -10,8 +10,10 @@ function CRUD(options) {
   const defaultOptions = {
     // 标题
     title: '',
-    // 接口根路由
-    rootApi: 0,
+    /**
+     * 请求接口工具
+     */
+    api: undefined,
     // 请求数据的url
     url: '',
     // 表格数据
@@ -92,8 +94,8 @@ function CRUD(options) {
   }
   const methods = {
     /**
-         * 通用的提示
-         */
+     * 通用的提示
+     */
     submitSuccessNotify() {
       crud.notify(crud.msg.submit, CRUD.NOTIFICATION_TYPE.SUCCESS)
     },
@@ -118,42 +120,22 @@ function CRUD(options) {
       }
       return new Promise((resolve) => {
         // 请求数据
-        if (crud.rootApi) {
-          initData1(crud.url, crud.getQueryParams()).then(data => {
-            crud.page.total = data.total
-            if (data.list) {
-              crud.data = data.list
-            } else {
-              crud.data = data
-            }
-            crud.resetDataStatus()
-            // time 毫秒后显示表格
-            setTimeout(() => {
-              callVmHook(crud, CRUD.HOOK.afterRefresh)
-            }, crud.time)
-            resolve(data)
-          })
-        } else {
-          initData(crud.url, crud.getQueryParams()).then(data => {
-            crud.page.total = data.total
-            if (data.list) {
-              crud.data = data.list
-            } else {
-              crud.data = data
-            }
-            crud.resetDataStatus()
-            // time 毫秒后显示表格
-            setTimeout(() => {
-              callVmHook(crud, CRUD.HOOK.afterRefresh)
-            }, crud.time)
-            resolve(data)
-          })
-        }
+        initData(crud.api, crud.url, crud.getQueryParams()).then(data => {
+          crud.page.total = data.total
+          if (data.list) {
+            crud.data = data.list
+          } else {
+            crud.data = data
+          }
+          crud.resetDataStatus()
+          callVmHook(crud, CRUD.HOOK.afterRefresh)
+          resolve(data)
+        })
       })
     },
     /**
-         * 启动添加
-         */
+     * 启动添加
+     */
     toAdd() {
       if (!(callVmHook(crud, CRUD.HOOK.beforeToAdd, crud.form) && callVmHook(crud, CRUD.HOOK.beforeToCU, crud.form))) {
         return
@@ -163,9 +145,9 @@ function CRUD(options) {
       callVmHook(crud, CRUD.HOOK.afterToCU, crud.form)
     },
     /**
-         * 启动编辑
-         * @param {*} data 数据项
-         */
+     * 启动编辑
+     * @param {*} data 数据项
+     */
     toEdit(data) {
       crud.resetForm(JSON.parse(JSON.stringify(data)))
       if (!(callVmHook(crud, CRUD.HOOK.beforeToEdit, crud.form) && callVmHook(crud, CRUD.HOOK.beforeToCU, crud.form))) {
@@ -177,16 +159,16 @@ function CRUD(options) {
       callVmHook(crud, CRUD.HOOK.afterToCU, crud.form)
     },
     /**
-         * 启动删除
-         * @param {*} data 数据项
-         */
+     * 启动删除
+     * @param {*} data 数据项
+     */
     toDelete(data) {
       crud.getDataStatus(data.id).delete = CRUD.STATUS.PREPARED
     },
     /**
-         * 取消删除
-         * @param {*} data 数据项
-         */
+     * 取消删除
+     * @param {*} data 数据项
+     */
     cancelDelete(data) {
       if (!callVmHook(crud, CRUD.HOOK.beforeDeleteCancel, data)) {
         return
@@ -195,8 +177,8 @@ function CRUD(options) {
       callVmHook(crud, CRUD.HOOK.afterDeleteCancel, data)
     },
     /**
-         * 取消新增/编辑
-         */
+     * 取消新增/编辑
+     */
     cancelCU() {
       const addStatus = crud.status.add
       const editStatus = crud.status.edit
@@ -226,8 +208,8 @@ function CRUD(options) {
       }
     },
     /**
-         * 提交新增/编辑
-         */
+     * 提交新增/编辑
+     */
     submitCU() {
       if (!callVmHook(crud, CRUD.HOOK.beforeValidateCU)) {
         return
@@ -247,8 +229,8 @@ function CRUD(options) {
       })
     },
     /**
-         * 执行添加
-         */
+     * 执行添加
+     */
     doAdd() {
       if (!callVmHook(crud, CRUD.HOOK.beforeSubmit)) {
         return
@@ -266,16 +248,13 @@ function CRUD(options) {
       })
     },
     /**
-         * 执行编辑
-         */
+     * 执行编辑
+     */
     doEdit() {
-      console.log(581222)
       if (!callVmHook(crud, CRUD.HOOK.beforeSubmit)) {
         return
       }
-      console.log(crud.crudMethod, crud.form)
       crud.status.edit = CRUD.STATUS.PROCESSING
-
       crud.crudMethod.edit(crud.form).then(() => {
         crud.status.edit = CRUD.STATUS.NORMAL
         crud.getDataStatus(crud.form.id).edit = CRUD.STATUS.NORMAL
@@ -289,9 +268,9 @@ function CRUD(options) {
       })
     },
     /**
-         * 执行删除
-         * @param {*} data 数据项
-         */
+     * 执行删除
+     * @param {*} data 数据项
+     */
     doDelete(data) {
       let delAll = false
       let dataStatus
@@ -327,8 +306,8 @@ function CRUD(options) {
       })
     },
     /**
-         * 获取查询参数
-         */
+     * 获取查询参数
+     */
     getQueryParams: function() {
       return {
         pageNum: crud.page.pageNum,
@@ -365,9 +344,9 @@ function CRUD(options) {
       callVmHook(crud, CRUD.HOOK.afterRowClick, row)
     },
     /**
-         * 重置查询参数
-         * @param {Boolean} toQuery 重置后进行查询操作
-         */
+     * 重置查询参数
+     * @param {Boolean} toQuery 重置后进行查询操作
+     */
     resetQuery(toQuery = true) {
       const defaultQuery = JSON.parse(JSON.stringify(crud.defaultQuery))
       const query = crud.query
@@ -380,9 +359,9 @@ function CRUD(options) {
       callVmHook(crud, CRUD.HOOK.afterResetQuery)
     },
     /**
-         * 重置表单
-         * @param {Array} data 数据
-         */
+     * 重置表单
+     * @param {Array} data 数据
+     */
     resetForm(data) {
       const form = data || (typeof crud.defaultForm === 'object' ? JSON.parse(JSON.stringify(crud.defaultForm)) : crud.defaultForm())
       const crudFrom = crud.form
@@ -397,11 +376,10 @@ function CRUD(options) {
       }
     },
     /**
-         * 重置数据状态
-         */
+     * 重置数据状态
+     */
     resetDataStatus() {
       const dataStatus = {}
-
       function resetStatus(datas) {
         datas.forEach(e => {
           dataStatus[e.id] = {
@@ -417,17 +395,17 @@ function CRUD(options) {
       crud.dataStatus = dataStatus
     },
     /**
-         * 获取数据状态
-         * @param {Number | String} id 数据项id
-         */
+     * 获取数据状态
+     * @param {Number | String} id 数据项id
+     */
     getDataStatus(id) {
       return crud.dataStatus[id]
     },
     /**
-         * 切换选中状态
-         * @param selection
-         * @param data
-         */
+     * 切换选中状态
+     * @param selection
+     * @param data
+     */
     toggleRowSelection(selection, data) {
       if (data.children) {
         data.children.forEach(val => {
@@ -463,11 +441,11 @@ function CRUD(options) {
     // 预留4位存储：组件 主页、头部、分页、表单，调试查看也方便找
     vms: Array(4),
     /**
-             * 注册组件实例
-             * @param {String} type 类型
-             * @param {*} vm 组件实例
-             * @param {Number} index 该参数内部使用
-             */
+     * 注册组件实例
+     * @param {String} type 类型
+     * @param {*} vm 组件实例
+     * @param {Number} index 该参数内部使用
+     */
     registerVM(type, vm, index = -1) {
       const vmObj = {
         type,
@@ -481,9 +459,9 @@ function CRUD(options) {
       this.vms.splice(index, 1, vmObj)
     },
     /**
-             * 取消注册组件实例
-             * @param {*} vm 组件实例
-             */
+     * 取消注册组件实例
+     * @param {*} vm 组件实例
+     */
     unregisterVM(vm) {
       this.vms.splice(this.vms.findIndex(e => e && e.vm === vm), 1)
     }
@@ -759,4 +737,4 @@ export {
   form,
   pagination,
   crud
-}
+}
diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index 2d7cef2..e661f93 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -87,13 +87,15 @@ import CrudDocumentArchives from '@/api/document_archives'
 import { uploadFileFn, updateInspectionSystemFile } from '@/api/common'
 import { downloadFileUrl } from '@/utils'
 import download from 'downloadjs'
+import preview from '@/utils/preview'
+
 // crud交由presenter持有
 const defaultCrud = presenter(
   CRUD({
     title: '检验机构体系文件管理',
     url: '/inspectionSystemFile/list',
     orderBy: ['id desc'],
-    rootApi: 1,
+    api: preview,
     crudMethod: { ...CrudDocumentArchives }
   })
 )