cloud-web-corejs 1.0.54-dev.277 → 1.0.54-dev.279

package/src/layout/components/extractedCode/viewDialog.vue

@@ -25,6 +25,7 @@
         :_viewType="1"
         @reload="$reloadHandle"
         @openDesignDialog="openDesingerDialogByChild"
+        :extractedObj="extractedObj"
       ></component>
       <el-drawer :title="$t1('表单设计({formName})',{formName})" :visible.sync="showDesingerDialog" :modal="false"
                  :destroy-on-close="true"

package/src/views/bd/setting/form_template/mixins/edit.js

@@ -1,209 +1,234 @@
-import projectTagView from "@base/components/projectTag/view.vue";
-import MenuKindDialog from "@base/views/bd/setting/menu_kind/dialog.vue";
-import preformDialog from "@base/views/bd/setting/form_template/preformDialog.vue";
-import formOplogTable from "@base/components/formOplog/index.vue";
-import {getBdFlag} from "@base/api/user";
-import otherAuthDialog from "../otherAuthDialog.vue";
-
-let modules = {};
-modules = {
-  name: 'bd_form_templateEdit',
-  props: {
-    _dataId: [String, Number],
-    currentFormType: Object,
-    readonly: Boolean,
-    otherFlag:Boolean
-  },
-  components: {
-    projectTagView,
-    MenuKindDialog,
-    preformDialog,
-    formOplogTable,
-    otherAuthDialog
-  },
-  data() {
-    return {
-      isEdit: false,
-      tabIndex: 'first',
-      dataId: '',
-      formTemplate: {
-        enabled: true,
-        history: false,
-        serviceId: 'user',
-        formTypeCode: null,
-        menuKindName: null,
-        menuKindCode: null,
-        serviceName: null,
-        formTemplateTagDTOs: [],
-        hasWf: false
-      },
-      isInited: false,
-      serviceIds: ['user'],
-      showMenuKindDialog: false,
-      isDev: true,
-      showPreformDialog: false,
-      menuKindAuth: {
-        editAuth: 0
-      },
-      sid: null,
-      showOtherAuthDialog:false
-    };
-  },
-  created() {
-    if (this._dataId) {
-      this.dataId = this._dataId;
-    } else {
-      this.formTemplate.menuKindName = this.currentFormType?.name || null;
-      this.formTemplate.menuKindCode = this.currentFormType?.menuKindCode || null;
-      this.formTemplate.serviceName = this.currentFormType?.serviceName || null;
-    }
-  },
-  mounted() {
-    this.getBdEnv();
-    this.getData();
-  },
-  methods: {
-    getData() {
-      if (this.dataId) {
-        this.isEdit = true;
-        this.$commonHttp({
-          aes: true,
-          url: USER_PREFIX + `/formTemplate/getByFormCode`,
-          method: `post`,
-          data: {
-            stringOne: this.dataId
-          },
-          isLoading: true,
-          modalStrictly: true,
-          success: res => {
-            this.formTemplate = res.objx || {};
-            this.getMenuKindAuth(this.formTemplate.menuKindCode);
-            this.$nextTick(() => {
-              this.isInited = true;
-            });
-            //获取操作日志数据
-            this.$refs['oplogTable'].initData({
-              param: () => {
-                return {
-                  logType: "FormTemplate",
-                  logObjCode: this.formTemplate.formCode
-                };
-              }
-            });
-          }
-        });
-      } else {
-        this.getMenuKindAuth(this.formTemplate.menuKindCode);
-        this.isInited = true;
-      }
-    },
-    saveData() {
-      this.$refs.editForm.$baseValidate(valid => {
-        if (valid) {
-          this.openPreformDialog();
-        }
-      });
-    },
-    saveDataHandle(preformData) {
-      var url = USER_PREFIX + (this.isEdit ? `/formTemplate/update` : `/formTemplate/save`);
-      let formData = {
-        ...this.formTemplate,
-        logContent: preformData.logContent
-      };
-      this.$http({
-        aes: true,
-        url: url,
-        method: `post`,
-        data: formData,
-        isLoading: true,
-        success: res => {
-          this.$message({
-            message: res.content,
-            type: 'success',
-            duration: 500,
-            onClose: t => {
-              if (this.isEdit) {
-                this.$baseReload();
-              } else {
-                this.$baseReload({
-                  updateParam: {
-                    _dataId: this.formTemplate.formCode
-                  }
-                });
-              }
-            }
-          });
-        }
-      });
-    },
-    openPreformDialog() {
-      this.showPreformDialog = true;
-    },
-    confirmPreformDialog(preformData) {
-      this.saveDataHandle(preformData);
-    },
-    confirmInsertMenuKind(rows) {
-      if (rows.length > 0) {
-        let row = rows[0];
-        this.$set(this.formTemplate, 'menuKindCode', row.menuKindCode);
-        this.$set(this.formTemplate, 'menuKindName', row.name);
-      }
-    },
-    getBdEnv() {
-      getBdFlag({
-        success: res => {
-          this.isDev = res.objx == 1
-        }
-      });
-    },
-    openDesignDialog() {
-      let readonly = !this.menuKindAuth.editAuth
-      this.$emit('openDesignDialog', {
-        row: this.formTemplate,
-        readonly,
-        callback: () => {
-          this.$baseReload()
-        }
-      })
-    },
-    getMenuKindAuth(menuKindCode) {
-      if(this.otherFlag){
-        this.getOtherMenuKindAuth();
-      }else if (menuKindCode) {
-        this.$http({
-          // aes: true,
-          url: USER_PREFIX + '/menu_kind_auth/getAuth',
-          method: `post`,
-          data: {stringOne: menuKindCode},
-          isLoading: true,
-          success: res => {
-            this.menuKindAuth = res.objx || {}
-          }
-        });
-      }
-    },
-
-    getOtherMenuKindAuth() {
-      if (this.otherFlag && this.formTemplate.sid) {
-        this.$http({
-          aes: true,
-          url: USER_PREFIX + "/form_template_auth/getAuth",
-          method: `post`,
-          data: {stringOne: this.formTemplate.sid},
-          isLoading: true,
-          success: (res) => {
-            this.menuKindAuth = res.objx || {};
-          },
-        });
-      }
-    },
-    openOtherAuthDialog(){
-      this.sid = this.formTemplate.sid
-      this.showOtherAuthDialog = true
-    },
-    confirmOtherAuthDialog(){
-      this.$baseReload()
-    },
-  }
-};
-export default modules
+import projectTagView from "@base/components/projectTag/view.vue";
+import MenuKindDialog from "@base/views/bd/setting/menu_kind/dialog.vue";
+import preformDialog from "@base/views/bd/setting/form_template/preformDialog.vue";
+import formOplogTable from "@base/components/formOplog/index.vue";
+import {getBdFlag} from "@base/api/user";
+import otherAuthDialog from "../otherAuthDialog.vue";
+
+let modules = {};
+modules = {
+  name: 'bd_form_templateEdit',
+  props: {
+    _dataId: [String, Number],
+    currentFormType: Object,
+    readonly: Boolean,
+    otherFlag:Boolean,
+    extractedObj:{
+      type:Object,
+      default:()=> null
+    }
+  },
+  components: {
+    projectTagView,
+    MenuKindDialog,
+    preformDialog,
+    formOplogTable,
+    otherAuthDialog
+  },
+  data() {
+    return {
+      isEdit: false,
+      tabIndex: 'first',
+      dataId: '',
+      formTemplate: {
+        enabled: true,
+        history: false,
+        serviceId: 'user',
+        formTypeCode: null,
+        menuKindName: null,
+        menuKindCode: null,
+        serviceName: null,
+        formTemplateTagDTOs: [],
+        hasWf: false
+      },
+      isInited: false,
+      serviceIds: ['user'],
+      showMenuKindDialog: false,
+      isDev: true,
+      showPreformDialog: false,
+      menuKindAuth: {
+        editAuth: 0
+      },
+      sid: null,
+      showOtherAuthDialog:false
+    };
+  },
+  created() {
+    if(this.extractedObj?.objx?.id){
+      this.dataId = this.extractedObj.obj.id;
+    }else if (this._dataId) {
+      this.dataId = this._dataId;
+    } else {
+      this.formTemplate.menuKindName = this.currentFormType?.name || null;
+      this.formTemplate.menuKindCode = this.currentFormType?.menuKindCode || null;
+      this.formTemplate.serviceName = this.currentFormType?.serviceName || null;
+    }
+  },
+  mounted() {
+    this.getBdEnv();
+    this.getData();
+  },
+  methods: {
+    initData(formData){
+      this.isEdit = true;
+      this.formTemplate = formData || {};
+      this.getMenuKindAuth(this.formTemplate.menuKindCode);
+      this.$nextTick(() => {
+        this.isInited = true;
+      });
+    },
+    getData() {
+      if(this.extractedObj?.objx){
+        this.initData(this.extractedObj.objx)
+      }else if (this.dataId) {
+        this.$commonHttp({
+          aes: true,
+          url: USER_PREFIX + `/formTemplate/getByFormCode`,
+          method: `post`,
+          data: {
+            stringOne: this.dataId
+          },
+          isLoading: true,
+          modalStrictly: true,
+          success: res => {
+            this.initData(res.objx)
+            //获取操作日志数据
+            this.$refs['oplogTable'].initData({
+              param: () => {
+                return {
+                  logType: "FormTemplate",
+                  logObjCode: this.formTemplate.formCode
+                };
+              }
+            });
+            /* this.formTemplate = res.objx || {};
+            this.getMenuKindAuth(this.formTemplate.menuKindCode);
+            this.$nextTick(() => {
+              this.isInited = true;
+            });
+            //获取操作日志数据
+            this.$refs['oplogTable'].initData({
+              param: () => {
+                return {
+                  logType: "FormTemplate",
+                  logObjCode: this.formTemplate.formCode
+                };
+              }
+            }); */
+          }
+        });
+      } else {
+        this.getMenuKindAuth(this.formTemplate.menuKindCode);
+        this.isInited = true;
+      }
+    },
+    saveData() {
+      this.$refs.editForm.$baseValidate(valid => {
+        if (valid) {
+          this.openPreformDialog();
+        }
+      });
+    },
+    saveDataHandle(preformData) {
+      var url = USER_PREFIX + (this.isEdit ? `/formTemplate/update` : `/formTemplate/save`);
+      let formData = {
+        ...this.formTemplate,
+        logContent: preformData.logContent
+      };
+      this.$http({
+        aes: true,
+        url: url,
+        method: `post`,
+        data: formData,
+        isLoading: true,
+        success: res => {
+          this.$message({
+            message: res.content,
+            type: 'success',
+            duration: 500,
+            onClose: t => {
+              if (this.isEdit) {
+                this.$baseReload();
+              } else {
+                this.$baseReload({
+                  updateParam: {
+                    _dataId: this.formTemplate.formCode
+                  }
+                });
+              }
+            }
+          });
+        }
+      });
+    },
+    openPreformDialog() {
+      this.showPreformDialog = true;
+    },
+    confirmPreformDialog(preformData) {
+      this.saveDataHandle(preformData);
+    },
+    confirmInsertMenuKind(rows) {
+      if (rows.length > 0) {
+        let row = rows[0];
+        this.$set(this.formTemplate, 'menuKindCode', row.menuKindCode);
+        this.$set(this.formTemplate, 'menuKindName', row.name);
+      }
+    },
+    getBdEnv() {
+      getBdFlag({
+        success: res => {
+          this.isDev = res.objx == 1
+        }
+      });
+    },
+    openDesignDialog() {
+      let readonly = !this.menuKindAuth.editAuth
+      this.$emit('openDesignDialog', {
+        row: this.formTemplate,
+        readonly,
+        callback: () => {
+          this.$baseReload()
+        }
+      })
+    },
+    getMenuKindAuth(menuKindCode) {
+      if(this.otherFlag){
+        this.getOtherMenuKindAuth();
+      }else if (menuKindCode) {
+        this.$http({
+          // aes: true,
+          url: USER_PREFIX + '/menu_kind_auth/getAuth',
+          method: `post`,
+          data: {stringOne: menuKindCode},
+          isLoading: true,
+          success: res => {
+            this.menuKindAuth = res.objx || {}
+          }
+        });
+      }
+    },
+
+    getOtherMenuKindAuth() {
+      if (this.otherFlag && this.formTemplate.sid) {
+        this.$http({
+          aes: true,
+          url: USER_PREFIX + "/form_template_auth/getAuth",
+          method: `post`,
+          data: {stringOne: this.formTemplate.sid},
+          isLoading: true,
+          success: (res) => {
+            this.menuKindAuth = res.objx || {};
+          },
+        });
+      }
+    },
+    openOtherAuthDialog(){
+      this.sid = this.formTemplate.sid
+      this.showOtherAuthDialog = true
+    },
+    confirmOtherAuthDialog(){
+      this.$baseReload()
+    },
+  }
+};
+export default modules

package/src/views/bd/setting/push_data/edit.vue

@@ -22,14 +22,22 @@
                 <td>{{ pushData.id }}</td>
                 <th>{{ $t1('任务编码') }}</th>
                 <td>{{ pushData.taskCode }}</td>
+                <th>{{ $t1('业务方产生时间点') }}</th>
+                <td>{{ pushData.generateDate }}</td>
+              </tr>
+              <tr>
+                <th>{{ $t1('组织编码') }}</th>
+                <td>{{ pushData.callbackCompanyCode }}</td>
                 <th>{{ $t1('数据唯一标识') }}</th>
                 <td colspan="3">{{ pushData.sid }}</td>
               </tr>
               <tr>
-                <th>{{ $t1('业务方产生时间点') }}</th>
-                <td>{{ pushData.generateDate }}</td>
                 <th>{{ $t1('业务数据标识') }}</th>
-                <td>{{ pushData.transfer }}</td>
+                <td colspan="7">{{ pushData.transfer }}</td>
+              </tr>
+              <tr>
+                <th>{{ $t1('推送数据') }}</th>
+                <td colspan="7">{{ pushData.data }}</td>
               </tr>
               <tr>
                 <th>{{ $t1('冗余字段1') }}</th>
@@ -49,18 +57,6 @@
                 <th>{{ $t1('备注') }}</th>
                 <td colspan="7">{{ pushData.remark }}</td>
               </tr>
-              <tr>
-                <th>{{ $t1('推送数据') }}</th>
-                <td colspan="7">{{ pushData.data }}</td>
-              </tr>
-              <tr>
-                <th>{{ $t1('回传的数据类型') }}</th>
-                <td>{{ pushData.callbackDataType }}</td>
-                <th>{{ $t1('回传的单据数据编码或ID') }}</th>
-                <td>{{ pushData.callbackCode }}</td>
-                <th>{{ $t1('回传的组织编码') }}</th>
-                <td>{{ pushData.callbackCompanyCode }}</td>
-              </tr>
               <tr>
                 <th>{{ $t1('服务名') }}</th>
                 <td colspan="7">{{ pushData.serverName }}</td>
@@ -70,6 +66,10 @@
                 <td>{{ pushData.createBy }}</td>
                 <th>{{ $t1('创建时间') }}</th>
                 <td>{{ pushData.createDate }}</td>
+                <th class="no"></th>
+                <td></td>
+                <th class="no"></th>
+                <td></td>
               </tr>
               </tbody>
             </table>

package/src/views/bd/setting/push_data/list.vue

@@ -23,7 +23,7 @@
           <template v-slot>
             <el-select v-model="serverName">
               <el-option v-for="(serviceId,index) in serviceIds" :key="index" :value="serviceId"
-                         :label="serviceId"></el-option>
+                         :label="serviceId" @change="searchEvent"></el-option>
             </el-select>
           </template>
         </vxe-form-item>
@@ -211,25 +211,15 @@ export default {
             width: 150
           },
           {
-            title: '备注',
-            field: 'remark',
-            width: 200
-          },
-          {
-            title: '回传的数据类型',
-            field: 'callbackDataType',
+            title: '组织编码',
+            field: 'callbackCompanyCode',
             width: 150
           },
           {
-            title: '回传的单据数据编码或ID',
-            field: 'callbackCode',
+            title: '备注',
+            field: 'remark',
             width: 200
           },
-          {
-            title: '回传的组织编码',
-            field: 'callbackCompanyCode',
-            width: 150
-          },
           {
             field: 'createBy',
             title: this.$t1('创建人'),

package/src/views/bd/setting/push_data_h/edit.vue

@@ -22,14 +22,22 @@
                 <td>{{ pushDataH.id }}</td>
                 <th>{{ $t1('任务编码') }}</th>
                 <td>{{ pushDataH.taskCode }}</td>
+                <th>{{ $t1('业务方产生时间点') }}</th>
+                <td>{{ pushDataH.generateDate }}</td>
+              </tr>
+              <tr>
+                <th>{{ $t1('组织编码') }}</th>
+                <td>{{ pushDataH.callbackCompanyCode }}</td>
                 <th>{{ $t1('数据唯一标识') }}</th>
                 <td colspan="3">{{ pushDataH.sid }}</td>
               </tr>
               <tr>
-                <th>{{ $t1('业务方产生时间点') }}</th>
-                <td>{{ pushDataH.generateDate }}</td>
                 <th>{{ $t1('业务数据标识') }}</th>
-                <td>{{ pushDataH.transfer }}</td>
+                <td colspan="7">{{ pushDataH.transfer }}</td>
+              </tr>
+              <tr>
+                <th>{{ $t1('推送数据') }}</th>
+                <td colspan="7">{{ pushDataH.data }}</td>
               </tr>
               <tr>
                 <th>{{ $t1('冗余字段1') }}</th>
@@ -49,18 +57,6 @@
                 <th>{{ $t1('备注') }}</th>
                 <td colspan="7">{{ pushDataH.remark }}</td>
               </tr>
-              <tr>
-                <th>{{ $t1('推送数据') }}</th>
-                <td colspan="7">{{ pushDataH.data }}</td>
-              </tr>
-              <tr>
-                <th>{{ $t1('回传的数据类型') }}</th>
-                <td>{{ pushDataH.callbackDataType }}</td>
-                <th>{{ $t1('回传的单据数据编码或ID') }}</th>
-                <td>{{ pushDataH.callbackCode }}</td>
-                <th>{{ $t1('回传的组织编码') }}</th>
-                <td>{{ pushDataH.callbackCompanyCode }}</td>
-              </tr>
               <tr>
                 <th>{{ $t1('服务名') }}</th>
                 <td colspan="7">{{ pushDataH.serverName }}</td>
@@ -70,6 +66,10 @@
                 <td>{{ pushDataH.createBy }}</td>
                 <th>{{ $t1('创建时间') }}</th>
                 <td>{{ pushDataH.createDate }}</td>
+                <th class="no"></th>
+                <td></td>
+                <th class="no"></th>
+                <td></td>
               </tr>
               </tbody>
             </table>

package/src/views/bd/setting/push_data_h/list.vue

@@ -21,7 +21,7 @@
                 @submit="searchEvent" @reset="searchEvent">
         <vxe-form-item :title="$t1('服务名')+':'">
           <template v-slot>
-            <el-select v-model="serverName">
+            <el-select v-model="serverName" @change="searchEvent">
               <el-option v-for="(serviceId,index) in serviceIds" :key="index" :value="serviceId"
                          :label="serviceId"></el-option>
             </el-select>
@@ -221,29 +221,15 @@ export default {
             width: 150
           },
           {
-            title: '备注',
-            field: 'remark',
-            width: 200
-          },
-          {
-            title: '回传的数据类型',
-            field: 'callbackDataType',
+            title: '组织编码',
+            field: 'callbackCompanyCode',
             width: 150
           },
           {
-            title: '回传的单据数据编码或ID',
-            field: 'callbackCode',
+            title: '备注',
+            field: 'remark',
             width: 200
           },
-          {
-            title: '回传的组织编码',
-            field: 'callbackCompanyCode',
-            width: 150
-          },
-
-
-
-
           {
             field: 'createBy',
             title: this.$t1('创建人'),