Merge branch 'lph01'

zkqy-ui/.env.production

@@ -6,3 +6,10 @@ ENV = 'production'
 
 #管理系统/生产环境
 VUE_APP_BASE_API = '/prod-api'
+
+#数据擎模块IP
+VUE_APP_BASE_API2 = 'http://62.234.61.92:8099/'
+#表单引擎模块IP
+VUE_APP_BASE_API3 = 'http://62.234.61.92:8088/'
+#流程引擎模块IP
+VUE_APP_BASE_API4 = 'http://62.234.61.92:8055/'

zkqy-ui/src/components/updateModule/bpmn-js/lib/features/context-pad/ContextPadProvider.js

@@ -31,10 +31,10 @@ import {
  * A provider for BPMN 2.0 elements context pad
  */
 export default function ContextPadProvider(
-    config, injector, eventBus,
-    contextPad, modeling, elementFactory,
-    connect, create, popupMenu,
-    canvas, rules, translate) {
+  config, injector, eventBus,
+  contextPad, modeling, elementFactory,
+  connect, create, popupMenu,
+  canvas, rules, translate) {
 
   config = config || {};
 
@@ -56,9 +56,9 @@ export default function ContextPadProvider(
     this._autoPlace = injector.get('autoPlace', false);
   }
 
-  eventBus.on('create.end', 250, function(event) {
+  eventBus.on('create.end', 250, function (event) {
     var context = event.context,
-        shape = context.shape;
+      shape = context.shape;
 
     if (!hasPrimaryModifier(event) || !contextPad.isOpen(shape)) {
       return;
@@ -87,7 +87,7 @@ ContextPadProvider.$inject = [
   'translate'
 ];
 
-ContextPadProvider.prototype.getMultiElementContextPadEntries = function(elements) {
+ContextPadProvider.prototype.getMultiElementContextPadEntries = function (elements) {
   var modeling = this._modeling;
 
   var actions = {};
@@ -99,7 +99,7 @@ ContextPadProvider.prototype.getMultiElementContextPadEntries = function(element
         className: 'bpmn-icon-trash',
         title: this._translate('Remove'),
         action: {
-          click: function(event, elements) {
+          click: function (event, elements) {
             modeling.removeElements(elements.slice());
           }
         }
@@ -114,14 +114,14 @@ ContextPadProvider.prototype.getMultiElementContextPadEntries = function(element
  * @param {djs.model.Base[]} elements
  * @return {boolean}
  */
-ContextPadProvider.prototype._isDeleteAllowed = function(elements) {
+ContextPadProvider.prototype._isDeleteAllowed = function (elements) {
 
   var baseAllowed = this._rules.allowed('elements.delete', {
     elements: elements
   });
 
   if (isArray(baseAllowed)) {
-    return every(baseAllowed, function(element) {
+    return every(baseAllowed, function (element) {
       return includes(baseAllowed, element);
     });
   }
@@ -129,18 +129,18 @@ ContextPadProvider.prototype._isDeleteAllowed = function(elements) {
   return baseAllowed;
 };
 
-ContextPadProvider.prototype.getContextPadEntries = function(element) {
+ContextPadProvider.prototype.getContextPadEntries = function (element) {
   var contextPad = this._contextPad,
-      modeling = this._modeling,
+    modeling = this._modeling,
 
-      elementFactory = this._elementFactory,
-      connect = this._connect,
-      create = this._create,
-      popupMenu = this._popupMenu,
-      canvas = this._canvas,
-      rules = this._rules,
-      autoPlace = this._autoPlace,
-      translate = this._translate;
+    elementFactory = this._elementFactory,
+    connect = this._connect,
+    create = this._create,
+    popupMenu = this._popupMenu,
+    canvas = this._canvas,
+    rules = this._rules,
+    autoPlace = this._autoPlace,
+    translate = this._translate;
 
   var actions = {};
 
@@ -155,7 +155,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
   }
 
   function removeElement(e, element) {
-    modeling.removeElements([ element ]);
+    modeling.removeElements([element]);
   }
 
   function getReplaceMenuPosition(element) {
@@ -163,10 +163,10 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
     var Y_OFFSET = 5;
 
     var diagramContainer = canvas.getContainer(),
-        pad = contextPad.getPad(element).html;
+      pad = contextPad.getPad(element).html;
 
     var diagramRect = diagramContainer.getBoundingClientRect(),
-        padRect = pad.getBoundingClientRect();
+      padRect = pad.getBoundingClientRect();
 
     var top = padRect.top - diagramRect.top;
     var left = padRect.left - diagramRect.left;
@@ -206,7 +206,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
     }
 
 
-    var append = autoPlace ? function(event, element) {
+    var append = autoPlace ? function (event, element) {
       var shape = elementFactory.createShape(assign({ type: type }, options));
 
       autoPlace.append(element, shape);
@@ -226,7 +226,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
 
   function splitLaneHandler(count) {
 
-    return function(event, element) {
+    return function (event, element) {
 
       // actual split
       modeling.splitLane(element, count);
@@ -238,7 +238,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
   }
 
 
-  if (isAny(businessObject, [ 'bpmn:Lane', 'bpmn:Participant' ]) && isExpanded(element)) {
+  if (isAny(businessObject, ['bpmn:Lane', 'bpmn:Participant']) && isExpanded(element)) {
 
     var childLanes = getChildLanes(element);
 
@@ -248,7 +248,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
         className: 'bpmn-icon-lane-insert-above',
         title: translate('Add Lane above'),
         action: {
-          click: function(event, element) {
+          click: function (event, element) {
             modeling.addLane(element, 'top');
           }
         }
@@ -290,7 +290,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
         className: 'bpmn-icon-lane-insert-below',
         title: translate('Add Lane below'),
         action: {
-          click: function(event, element) {
+          click: function (event, element) {
             modeling.addLane(element, 'bottom');
           }
         }
@@ -336,10 +336,10 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
       });
     } else
 
-    if (isEventType(businessObject, 'bpmn:BoundaryEvent', 'bpmn:CompensateEventDefinition')) {
+      if (isEventType(businessObject, 'bpmn:BoundaryEvent', 'bpmn:CompensateEventDefinition')) {
 
-      assign(actions, {
-        'append.compensation-activity':
+        assign(actions, {
+          'append.compensation-activity':
             appendAction(
               'bpmn:Task',
               'bpmn-icon-task',
@@ -348,37 +348,37 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
                 isForCompensation: true
               }
             )
-      });
-    } else
-
-    if (!is(businessObject, 'bpmn:EndEvent') &&
-        !businessObject.isForCompensation &&
-        !isEventType(businessObject, 'bpmn:IntermediateThrowEvent', 'bpmn:LinkEventDefinition') &&
-        !isEventSubProcess(businessObject)) {
-
-      assign(actions, {
-        'append.end-event': appendAction(
-          'bpmn:EndEvent',
-          'bpmn-icon-end-event-none',
-          translate('Append EndEvent')
-        ),
-        'append.gateway': appendAction(
-          'bpmn:ExclusiveGateway',
-          'bpmn-icon-gateway-none',
-          translate('Append Gateway')
-        ),
-        'append.append-task': appendAction(
-          'bpmn:Task',
-          'bpmn-icon-task',
-          translate('Append Task')
-        ),
-        'append.intermediate-event': appendAction(
-          'bpmn:IntermediateThrowEvent',
-          'bpmn-icon-intermediate-event-none',
-          translate('Append Intermediate/Boundary Event')
-        )
-      });
-    }
+        });
+      } else
+
+        if (!is(businessObject, 'bpmn:EndEvent') &&
+          !businessObject.isForCompensation &&
+          !isEventType(businessObject, 'bpmn:IntermediateThrowEvent', 'bpmn:LinkEventDefinition') &&
+          !isEventSubProcess(businessObject)) {
+
+          assign(actions, {
+            'append.end-event': appendAction(
+              'bpmn:EndEvent',
+              'bpmn-icon-end-event-none',
+              translate('Append EndEvent')
+            ),
+            // 'append.gateway': appendAction(
+            //   'bpmn:ExclusiveGateway',
+            //   'bpmn-icon-gateway-none',
+            //   translate('Append Gateway')
+            // ),
+            // 'append.append-task': appendAction(
+            //   'bpmn:Task',
+            //   'bpmn-icon-task',
+            //   translate('Append Task')
+            // ),
+            // 'append.intermediate-event': appendAction(
+            //   'bpmn:IntermediateThrowEvent',
+            //   'bpmn-icon-intermediate-event-none',
+            //   translate('Append Intermediate/Boundary Event')
+            // )
+          });
+        }
   }
 
   if (!popupMenu.isEmpty(element, 'bpmn-replace')) {
@@ -390,7 +390,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
         className: 'bpmn-icon-screw-wrench',
         title: translate('Change type'),
         action: {
-          click: function(event, element) {
+          click: function (event, element) {
 
             var position = assign(getReplaceMenuPosition(element), {
               cursor: { x: event.x, y: event.y }
@@ -431,10 +431,10 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
         className: 'bpmn-icon-connection-multi',
         title: translate(
           'Connect using ' +
-            (businessObject.isForCompensation
-              ? ''
-              : 'Sequence/MessageFlow or ') +
-            'Association'
+          (businessObject.isForCompensation
+            ? ''
+            : 'Sequence/MessageFlow or ') +
+          'Association'
         ),
         action: {
           click: startConnect,
@@ -458,7 +458,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
     });
   }
 
-  if (isAny(businessObject, [ 'bpmn:DataObjectReference', 'bpmn:DataStoreReference' ])) {
+  if (isAny(businessObject, ['bpmn:DataObjectReference', 'bpmn:DataStoreReference'])) {
     assign(actions, {
       'connect': {
         group: 'connect',
@@ -479,7 +479,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
   }
 
   // delete element entry, only show if allowed by rules
-  var deleteAllowed = rules.allowed('elements.delete', { elements: [ element ] });
+  var deleteAllowed = rules.allowed('elements.delete', { elements: [element] });
 
   if (isArray(deleteAllowed)) {
 
@@ -512,7 +512,7 @@ function isEventType(eventBo, type, definition) {
   var isDefinition = false;
 
   var definitions = eventBo.eventDefinitions || [];
-  forEach(definitions, function(def) {
+  forEach(definitions, function (def) {
     if (def.$type === definition) {
       isDefinition = true;
     }

zkqy-ui/src/views/system/bpmnPro/data/index.js

@@ -1,3 +1,61 @@
+export const formList = [
+  {
+    formKey: "AssignEmployees",
+    formName: "分配班组",
+  },
+  {
+    formKey: "NodeShow",
+    formName: "节点展示",
+  },
+  {
+    formKey: "Notes",
+    formName: "物料备注",
+  },
+  {
+    formKey: "ProductionProcesses",
+    formName: "工序:领料",
+  },
+  {
+    formKey: "PersonalDistribution",
+    formName: "工序:检验",
+  },
+  {
+    formKey: "RecordQuality",
+    formName: "记录质控卡",
+  },
+  {
+    formKey: "GY06",
+    formName: "节点回退",
+  },
+  {
+    formKey: "Print",
+    formName: "打印交接单",
+  },
+  {
+    formKey: "KB01",
+    formName: "不需表单",
+  },
+  // {
+  //   formKey: "EditFinishTime",
+  //   formName: "编辑完成时间",
+  // },
+  {
+    formKey: "FinishTask",
+    formName: "完成任务",
+  },
+  {
+    formKey: "QualityControlCardSubCardProcessing",
+    formName: "质控卡分卡处理",
+  },
+  // {
+  //   formKey: "EditQualityCard ",
+  //   formName: "质控卡修改",
+  // },
+  {
+    formKey: "ScrapDisposition",
+    formName: "产品报废处理",
+  },
+]
 export const formList = [
   {
     formKey: "AssignEmployees",
@@ -55,5 +113,5 @@ export const formList = [
     formKey: "ScrapDisposition",
     formName: "产品报废处理",
   },
-  
+
 ]

zkqy-ui/src/views/system/tenant/index.vue

@@ -664,6 +664,7 @@ export default {
             });
           }
         }
+        this.reset();
       });
     },
     /** 提交按钮 */

zkqy-ui/vue.config.js

@@ -37,7 +37,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.110.59:8080`,
+        // target: `http://192.168.110.76:8080`,
         target: `http://62.234.61.92:8080`,
         changeOrigin: true,
         pathRewrite: {
@@ -66,110 +66,132 @@ module.exports = {
         }
       },
     },
-    disableHostCheck: true
+    '/DB': {
+      target: `http://62.234.61.92:8099`,
+      changeOrigin: true,
+      pathRewrite: {
+        ['^' + '/DB']: ''
+      }
+    },
+    '/FORM': {
+      target: `http://62.234.61.92:8088`,
+      changeOrigin: true,
+      pathRewrite: {
+        ['^' + '/FORM']: ''
+      }
+    },
+    '/BPM': {
+      target: `http://62.234.61.92:8055`,
+      changeOrigin: true,
+      pathRewrite: {
+        ['^' + '/BPM']: ''
+      }
+    },
   },
+  disableHostCheck: true
+},
   css: {
-    loaderOptions: {
-      sass: {
-        sassOptions: { outputStyle: "expanded" }
-      },
-      less: {
-        modifyVars: {
-          "primary-color": "#13c2c2",
+  loaderOptions: {
+    sass: {
+      sassOptions: { outputStyle: "expanded" }
+    },
+    less: {
+      modifyVars: {
+        "primary-color": "#13c2c2",
           // "primary-color": "#9867f7",
           "layout-color": "#9867f7"
-          // "layout-color": "#ee88aa"
-        },
-        javascriptEnabled: true
-      }
+        // "layout-color": "#ee88aa"
+      },
+      javascriptEnabled: true
     }
-  },
-  configureWebpack: {
-    name: name,
+  }
+},
+configureWebpack: {
+  name: name,
     resolve: {
-      alias: {
-        '@': resolve('src'),
+    alias: {
+      '@': resolve('src'),
         '@packages': resolve('src/views/system/bpmnPro/components'),
-        '@utils': resolve('src/utils/bpmn')
-      }
-    },
-    plugins: [
-      // http://doc.zkqy.vip/zkqy-vue/other/faq.html#使用gzip解压缩静态文件
-      new CompressionPlugin({
-        cache: false,                   // 不启用文件缓存
-        test: /\.(js|css|html)?$/i,     // 压缩文件格式
-        filename: '[path].gz[query]',   // 压缩后的文件名
-        algorithm: 'gzip',              // 使用gzip压缩
-        minRatio: 0.8,                   // 压缩率小于1才会压缩
+          '@utils': resolve('src/utils/bpmn')
+    }
+  },
+  plugins: [
+    // http://doc.zkqy.vip/zkqy-vue/other/faq.html#使用gzip解压缩静态文件
+    new CompressionPlugin({
+      cache: false,                   // 不启用文件缓存
+      test: /\.(js|css|html)?$/i,     // 压缩文件格式
+      filename: '[path].gz[query]',   // 压缩后的文件名
+      algorithm: 'gzip',              // 使用gzip压缩
+      minRatio: 0.8,                   // 压缩率小于1才会压缩
 
-      }),
-      new MonacoWebpackPlugin()
-    ],
+    }),
+    new MonacoWebpackPlugin()
+  ],
     // devtool: isDev ? "source-map" : false
   },
-  chainWebpack(config) {
-    config.plugins.delete('preload') // TODO: need test
-    config.plugins.delete('prefetch') // TODO: need test
+chainWebpack(config) {
+  config.plugins.delete('preload') // TODO: need test
+  config.plugins.delete('prefetch') // TODO: need test
 
-    // set svg-sprite-loader
-    config.module
-      .rule('svg')
-      .exclude.add(resolve('src/assets/icons'))
-      .end()
-    config.module
-      .rule('icons')
-      .test(/\.svg$/)
-      .include.add(resolve('src/assets/icons'))
-      .end()
-      .use('svg-sprite-loader')
-      .loader('svg-sprite-loader')
-      .options({
-        symbolId: 'icon-[name]'
-      })
-      .end()
+  // set svg-sprite-loader
+  config.module
+    .rule('svg')
+    .exclude.add(resolve('src/assets/icons'))
+    .end()
+  config.module
+    .rule('icons')
+    .test(/\.svg$/)
+    .include.add(resolve('src/assets/icons'))
+    .end()
+    .use('svg-sprite-loader')
+    .loader('svg-sprite-loader')
+    .options({
+      symbolId: 'icon-[name]'
+    })
+    .end()
 
-    config
-      .when(process.env.NODE_ENV !== 'development',
-        config => {
-          config
-            .plugin('ScriptExtHtmlWebpackPlugin')
-            .after('html')
-            .use('script-ext-html-webpack-plugin', [{
-              // `runtime` must same as runtimeChunk name. default is `runtime`
-              inline: /runtime\..*\.js$/
-            }])
-            .end()
-          config
-            .optimization.splitChunks({
-              chunks: 'all',
-              cacheGroups: {
-                libs: {
-                  name: 'chunk-libs',
-                  test: /[\\/]node_modules[\\/]/,
-                  priority: 10,
-                  chunks: 'initial' // only package third parties that are initially dependent
-                },
-                elementUI: {
-                  name: 'chunk-elementUI', // split elementUI into a single package
-                  priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
-                  test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
-                },
-                commons: {
-                  name: 'chunk-commons',
-                  test: resolve('src/components'), // can customize your rules
-                  minChunks: 3, //  minimum common number
-                  priority: 5,
-                  reuseExistingChunk: true
-                }
+  config
+    .when(process.env.NODE_ENV !== 'development',
+      config => {
+        config
+          .plugin('ScriptExtHtmlWebpackPlugin')
+          .after('html')
+          .use('script-ext-html-webpack-plugin', [{
+            // `runtime` must same as runtimeChunk name. default is `runtime`
+            inline: /runtime\..*\.js$/
+          }])
+          .end()
+        config
+          .optimization.splitChunks({
+            chunks: 'all',
+            cacheGroups: {
+              libs: {
+                name: 'chunk-libs',
+                test: /[\\/]node_modules[\\/]/,
+                priority: 10,
+                chunks: 'initial' // only package third parties that are initially dependent
+              },
+              elementUI: {
+                name: 'chunk-elementUI', // split elementUI into a single package
+                priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+                test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
+              },
+              commons: {
+                name: 'chunk-commons',
+                test: resolve('src/components'), // can customize your rules
+                minChunks: 3, //  minimum common number
+                priority: 5,
+                reuseExistingChunk: true
               }
-            })
-          config.optimization.runtimeChunk('single'),
-          {
-            from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
-            to: './' //到根目录下
-          }
-
+            }
+          })
+        config.optimization.runtimeChunk('single'),
+        {
+          from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
+          to: './' //到根目录下
         }
-      )
-  }
+
+      }
+    )
+}
 }