Merge remote-tracking branch 'origin/dev' into dev

build/index.js

@@ -19,7 +19,7 @@ if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
   app.use(
     publicPath,
     serveStatic('./dist', {
-      index: ['index.html', '/']
+      index: ['', '/']
     })
   )
 

package.json

@@ -5,6 +5,7 @@
   "author": "捷道",
   "license": "MIT",
   "scripts": {
+    "local": "vue-cli-service serve --mode local",
     "dev": "vue-cli-service serve",
     "build:dev": "vue-cli-service build --mode dev",
     "build:prod": "vue-cli-service build",

src/api/ecw/productPrice.js

@@ -89,3 +89,10 @@ export function batchOff(query) {
   })
 }
 
+export function getPriceSnapshotList(priceId){
+  return request({
+    url: '/ecw/product-price/priceSnapshotList',
+    method: 'get',
+    params: {priceId}
+  })
+}
\ No newline at end of file

src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue

@@ -72,7 +72,7 @@
             <el-button :size="headerButtonSize" icon="el-icon-refresh" @click="processRestart" />
           </el-tooltip>
         </el-button-group>
-        <el-button :size="headerButtonSize" :type="headerButtonType" icon="el-icon-plus" @click="processSave">保存模型</el-button>
+        <el-button :size="headerButtonSize" :type="headerButtonType" icon="el-icon-plus" @click="processSave" :disabled = "simulationStatus">保存模型</el-button>
       </template>
       <!-- 用于打开本地文件-->
       <input type="file" id="files" ref="refFile" style="display: none" accept=".xml, .bpmn" @change="importLocalFile" />
@@ -118,6 +118,7 @@ export default {
   componentName: "MyProcessDesigner",
   props: {
     value: String, // xml 字符串
+    valueWatch: true, // xml 字符串的 watch 状态
     processId: String, // 流程 key 标识
     processName: String, // 流程 name 名字
     formId: Number, // 流程 form 表单编号
@@ -252,11 +253,6 @@ export default {
       this.bpmnModeler = null;
     });
   },
-  watch: {
-    value: function (newValue) { // 在 xmlString 发生变化时，重新创建，从而绘制流程图
-      this.createNewDiagram(newValue);
-    }
-  },
   methods: {
     initBpmnModeler() {
       if (this.bpmnModeler) return;
@@ -307,7 +303,7 @@ export default {
       let newName = this.processName || `业务流程_${new Date().getTime()}`;
       let xmlString = xml || DefaultEmptyXML(newId, newName, this.prefix);
       try {
-        console.log(this.bpmnModeler.importXML);
+        // console.log(this.bpmnModeler.importXML);
         let { warnings } = await this.bpmnModeler.importXML(xmlString);
         if (warnings && warnings.length) {
           warnings.forEach(warn => console.warn(warn));
@@ -459,7 +455,7 @@ export default {
         this.previewModelVisible = true;
       });
     },
-    /* ------------------------------------------------ 捷道源码 methods ------------------------------------------------------ */
+    /* ------------------------------------------------ 芋道源码 methods ------------------------------------------------------ */
     async processSave() {
       const { err, xml } = await this.bpmnModeler.saveXML();
       // 读取异常时抛出异常
@@ -478,8 +474,3 @@ export default {
   }
 };
 </script>
-<style scoped>
-.my-process-designer{
-  height: calc(100vh - 84px - 40px);
-}
-</style>

src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue

@@ -90,15 +90,14 @@ export default {
       let xmlString = xml || DefaultEmptyXML(newId, newName, this.prefix);
       try {
         // console.log(this.bpmnModeler.importXML);
-        let { warnings } = await this.bpmnModeler.importXML(xmlString)
-        // 220906 增加一个缩放，自动适应尺寸
-        this.bpmnModeler.get('canvas').zoom('fit-viewport');
-        
+        let { warnings } = await this.bpmnModeler.importXML(xmlString);
         if (warnings && warnings.length) {
           warnings.forEach(warn => console.warn(warn));
         }
         // 高亮流程图
         await this.highlightDiagram();
+        const canvas = this.bpmnModeler.get('canvas');
+        canvas.zoom("fit-viewport", "auto");
       } catch (e) {
         console.error(e);
         // console.error(`[Process Designer Warn]: ${e?.message || e}`);
@@ -117,23 +116,25 @@ export default {
       let todoActivity = activityList.find(m => !m.endTime) // 找到待办的任务
       let endActivity = activityList[activityList.length - 1] // 获得最后一个任务
       // debugger
-      console.log(this.bpmnModeler.getDefinitions().rootElements[0].flowElements);
+      // console.log(this.bpmnModeler.getDefinitions().rootElements[0].flowElements);
       this.bpmnModeler.getDefinitions().rootElements[0].flowElements?.forEach(n => {
         let activity = activityList.find(m => m.key === n.id) // 找到对应的活动
+        if (!activity) {
+          return;
+        }
         if (n.$type === 'bpmn:UserTask') { // 用户任务
-          if (!activity) {
-            return;
-          }
           // 处理用户任务的高亮
           const task = this.taskList.find(m => m.id === activity.taskId); // 找到活动对应的 taskId
-          if (task) {
-            canvas.addMarker(n.id, this.getResultCss(task.result));
-            // 如果非通过，就不走后面的线条了
-            if (task.result !== 2) {
-              return;
-            }
+          if (!task) {
+            return;
           }
+          // 高亮任务
+          canvas.addMarker(n.id, this.getResultCss(task.result));
 
+          // 如果非通过，就不走后面的线条了
+          if (task.result !== 2) {
+            return;
+          }
           // 处理 outgoing 出线
           const outgoing = this.getActivityOutgoing(activity);
           outgoing?.forEach(nn => {
@@ -157,9 +158,6 @@ export default {
             }
           });
         } else if (n.$type === 'bpmn:ExclusiveGateway') { // 排它网关
-          if (!activity) {
-            return
-          }
           // 设置【bpmn:ExclusiveGateway】排它网关的高亮
           canvas.addMarker(n.id, this.getActivityHighlightCss(activity));
           // 查找需要高亮的连线
@@ -184,9 +182,6 @@ export default {
             canvas.addMarker(matchNN.id, this.getActivityHighlightCss(matchActivity));
           }
         } else if (n.$type === 'bpmn:ParallelGateway') { // 并行网关
-          if (!activity) {
-            return
-          }
           // 设置【bpmn:ParallelGateway】并行网关的高亮
           canvas.addMarker(n.id, this.getActivityHighlightCss(activity));
           n.outgoing?.forEach(nn => {
@@ -212,6 +207,17 @@ export default {
             return;
           }
           canvas.addMarker(n.id, this.getResultCss(this.processInstance.result));
+        } else if (n.$type === 'bpmn:ServiceTask'){ //服务任务
+          if(activity.startTime>0 && activity.endTime===0){//进入执行，标识进行色
+            canvas.addMarker(n.id, this.getResultCss(1));
+          }
+          if(activity.endTime>0){// 执行完成，节点标识完成色, 所有outgoing标识完成色。
+            canvas.addMarker(n.id, this.getResultCss(2));
+            const outgoing = this.getActivityOutgoing(activity)
+            outgoing?.forEach(out=>{
+              canvas.addMarker(out.id,this.getResultCss(2))
+            })
+          }
         }
       })
     },
@@ -219,13 +225,13 @@ export default {
       return activity.endTime ? 'highlight' : 'highlight-todo';
     },
     getResultCss(result) {
-      if (result === 1) {
+      if (result === 1) { // 审批中
         return 'highlight-todo';
-      } else if (result === 2) {
+      } else if (result === 2) { // 已通过
         return 'highlight';
-      } else if (result === 3) {
+      } else if (result === 3) { // 不通过
         return 'highlight-reject';
-      } else if (result === 4) {
+      } else if (result === 4) { // 已取消
         return 'highlight-cancel';
       }
       return '';
@@ -267,6 +273,10 @@ export default {
       !this.elementOverlayIds && (this.elementOverlayIds = {});
       !this.overlays && (this.overlays = this.bpmnModeler.get("overlays"));
       // 展示信息
+      const activity = this.activityList.find(m => m.key === element.id);
+      if (!activity) {
+        return;
+      }
       if (!this.elementOverlayIds[element.id] && element.type !== "bpmn:Process") {
         let html = `<div class="element-overlays">
             <p>Elemet id: ${element.id}</p>
@@ -278,10 +288,6 @@ export default {
                   <p>创建时间：${this.parseTime(this.processInstance.createTime)}`;
         } else if (element.type === 'bpmn:UserTask') {
           // debugger
-          const activity = this.activityList.find(m => m.key === element.id);
-          if (!activity) {
-            return;
-          }
           let task = this.taskList.find(m => m.id === activity.taskId); // 找到活动对应的 taskId
           if (!task) {
             return;
@@ -293,9 +299,17 @@ export default {
           if (task.endTime) {
             html += `<p>结束时间：${this.parseTime(task.endTime)}</p>`
           }
-          if (task.comment) {
-            html += `<p>审批建议：${task.comment}</p>`
+          if (task.reason) {
+            html += `<p>审批建议：${task.reason}</p>`
+          }
+        } else if (element.type === 'bpmn:ServiceTask' && this.processInstance) {
+          if(activity.startTime>0){
+            html = `<p>创建时间：${this.parseTime(activity.startTime)}</p>`;
           }
+          if(activity.endTime>0){
+            html += `<p>结束时间：${this.parseTime(activity.endTime)}</p>`
+          }
+          console.log(html)
         } else if (element.type === 'bpmn:EndEvent' && this.processInstance) {
           html = `<p>结果：${this.getDictDataLabel(this.DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT, this.processInstance.result)}</p>`;
           if (this.processInstance.endTime) {
@@ -317,7 +331,8 @@ export default {
 };
 </script>
 
-<style scoped>
+<style>
+
 /** 处理中 */
 .highlight-todo.djs-connection > .djs-visual > path {
   stroke: #1890ff !important;
@@ -331,13 +346,13 @@ export default {
   fill-opacity: 0.2 !important;
 }
 
-/deep/.highlight-todo.djs-connection > .djs-visual > path {
+:deep(.highlight-todo.djs-connection > .djs-visual > path) {
   stroke: #1890ff !important;
   stroke-dasharray: 4px !important;
   fill-opacity: 0.2 !important;
   marker-end: url(#sequenceflow-end-_E7DFDF-_E7DFDF-803g1kf6zwzmcig1y2ulm5egr);
 }
-/deep/.highlight-todo.djs-shape .djs-visual > :nth-child(1) {
+:deep(.highlight-todo.djs-shape .djs-visual > :nth-child(1)) {
   fill: #1890ff !important;
   stroke: #1890ff !important;
   stroke-dasharray: 4px !important;
@@ -366,20 +381,20 @@ export default {
   fill: green !important; /* color elements as green */
 }
 
-/deep/.highlight.djs-shape .djs-visual > :nth-child(1) {
+:deep(.highlight.djs-shape .djs-visual > :nth-child(1)) {
   fill: green !important;
   stroke: green !important;
   fill-opacity: 0.2 !important;
 }
-/deep/.highlight.djs-shape .djs-visual > :nth-child(2) {
+:deep(.highlight.djs-shape .djs-visual > :nth-child(2)) {
   fill: green !important;
 }
-/deep/.highlight.djs-shape .djs-visual > path {
+:deep(.highlight.djs-shape .djs-visual > path) {
   fill: green !important;
   fill-opacity: 0.2 !important;
   stroke: green !important;
 }
-/deep/.highlight.djs-connection > .djs-visual > path {
+:deep(.highlight.djs-connection > .djs-visual > path) {
   stroke: green !important;
 }
 
@@ -405,20 +420,20 @@ export default {
   fill: red !important; /* color elements as green */
 }
 
-/deep/.highlight-reject.djs-shape .djs-visual > :nth-child(1) {
+:deep(.highlight-reject.djs-shape .djs-visual > :nth-child(1)) {
   fill: red !important;
   stroke: red !important;
   fill-opacity: 0.2 !important;
 }
-/deep/.highlight-reject.djs-shape .djs-visual > :nth-child(2) {
+:deep(.highlight-reject.djs-shape .djs-visual > :nth-child(2)) {
   fill: red !important;
 }
-/deep/.highlight-reject.djs-shape .djs-visual > path {
+:deep(.highlight-reject.djs-shape .djs-visual > path) {
   fill: red !important;
   fill-opacity: 0.2 !important;
   stroke: red !important;
 }
-/deep/.highlight-reject.djs-connection > .djs-visual > path {
+:deep(.highlight-reject.djs-connection > .djs-visual > path) {
   stroke: red !important;
 }
 
@@ -444,20 +459,20 @@ export default {
   fill: grey !important; /* color elements as green */
 }
 
-/deep/.highlight-cancel.djs-shape .djs-visual > :nth-child(1) {
+:deep(.highlight-cancel.djs-shape .djs-visual > :nth-child(1)) {
   fill: grey !important;
   stroke: grey !important;
   fill-opacity: 0.2 !important;
 }
-/deep/.highlight-cancel.djs-shape .djs-visual > :nth-child(2) {
+:deep(.highlight-cancel.djs-shape .djs-visual > :nth-child(2)) {
   fill: grey !important;
 }
-/deep/.highlight-cancel.djs-shape .djs-visual > path {
+:deep(.highlight-cancel.djs-shape .djs-visual > path) {
   fill: grey !important;
   fill-opacity: 0.2 !important;
   stroke: grey !important;
 }
-/deep/.highlight-cancel.djs-connection > .djs-visual > path {
+:deep(.highlight-cancel.djs-connection > .djs-visual > path) {
   stroke: grey !important;
 }
 

src/components/bpmnProcessDesigner/package/designer/plugins/content-pad/contentPadProvider.js

@@ -49,14 +49,14 @@ export default function ContextPadProvider(
   }
 
   eventBus.on("create.end", 250, function(event) {
-    var context = event.context,
-      shape = context.shape;
+    const context = event.context,
+      shape = context.shape
 
     if (!hasPrimaryModifier(event) || !contextPad.isOpen(shape)) {
       return;
     }
 
-    var entries = contextPad.getEntries(shape);
+    const entries = contextPad.getEntries(shape)
 
     if (entries.replace) {
       entries.replace.action.click(event, shape);
@@ -81,7 +81,7 @@ ContextPadProvider.$inject = [
 ];
 
 ContextPadProvider.prototype.getContextPadEntries = function(element) {
-  var contextPad = this._contextPad,
+  const contextPad = this._contextPad,
     modeling = this._modeling,
     elementFactory = this._elementFactory,
     connect = this._connect,
@@ -90,15 +90,15 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
     canvas = this._canvas,
     rules = this._rules,
     autoPlace = this._autoPlace,
-    translate = this._translate;
+    translate = this._translate
 
-  var actions = {};
+  const actions = {}
 
   if (element.type === "label") {
     return actions;
   }
 
-  var businessObject = element.businessObject;
+  const businessObject = element.businessObject
 
   function startConnect(event, element) {
     connect.start(event, element);
@@ -109,21 +109,21 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
   }
 
   function getReplaceMenuPosition(element) {
-    var Y_OFFSET = 5;
+    const Y_OFFSET = 5
 
-    var diagramContainer = canvas.getContainer(),
-      pad = contextPad.getPad(element).html;
+    const diagramContainer = canvas.getContainer(),
+      pad = contextPad.getPad(element).html
 
-    var diagramRect = diagramContainer.getBoundingClientRect(),
-      padRect = pad.getBoundingClientRect();
+    const diagramRect = diagramContainer.getBoundingClientRect(),
+      padRect = pad.getBoundingClientRect()
 
-    var top = padRect.top - diagramRect.top;
-    var left = padRect.left - diagramRect.left;
+    const top = padRect.top - diagramRect.top
+    const left = padRect.left - diagramRect.left
 
-    var pos = {
+    const pos = {
       x: left,
       y: top + padRect.height + Y_OFFSET
-    };
+    }
 
     return pos;
   }
@@ -145,19 +145,19 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
     }
 
     function appendStart(event, element) {
-      var shape = elementFactory.createShape(assign({ type: type }, options));
+      const shape = elementFactory.createShape(assign({ type: type }, options))
       create.start(event, shape, {
         source: element
       });
     }
 
-    var append = autoPlace
+    const append = autoPlace
       ? function(event, element) {
-          var shape = elementFactory.createShape(assign({ type: type }, options));
+        const shape = elementFactory.createShape(assign({ type: type }, options))
 
-          autoPlace.append(element, shape);
-        }
-      : appendStart;
+        autoPlace.append(element, shape)
+      }
+      : appendStart
 
     return {
       group: "model",
@@ -182,7 +182,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
   }
 
   if (isAny(businessObject, ["bpmn:Lane", "bpmn:Participant"]) && isExpanded(businessObject)) {
-    var childLanes = getChildLanes(element);
+    const childLanes = getChildLanes(element)
 
     assign(actions, {
       "lane-insert-above": {
@@ -302,9 +302,9 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
         title: translate("Change type"),
         action: {
           click: function(event, element) {
-            var position = assign(getReplaceMenuPosition(element), {
+            const position = assign(getReplaceMenuPosition(element), {
               cursor: { x: event.x, y: event.y }
-            });
+            })
 
             popupMenu.open(element, "bpmn-replace", position);
           }
@@ -350,7 +350,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
   }
 
   // delete element entry, only show if allowed by rules
-  var deleteAllowed = rules.allowed("elements.delete", { elements: [element] });
+  let deleteAllowed = rules.allowed('elements.delete', { elements: [element] })
 
   if (isArray(deleteAllowed)) {
     // was the element returned as a deletion candidate?
@@ -376,10 +376,10 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
 // helpers /////////
 
 function isEventType(eventBo, type, definition) {
-  var isType = eventBo.$instanceOf(type);
-  var isDefinition = false;
+  const isType = eventBo.$instanceOf(type)
+  let isDefinition = false
 
-  var definitions = eventBo.eventDefinitions || [];
+  const definitions = eventBo.eventDefinitions || []
   forEach(definitions, function(def) {
     if (def.$type === definition) {
       isDefinition = true;

src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/activiti/activitiExtension.js

 "use strict";
 
-var some = require("min-dash").some;
+const some = require('min-dash').some
 
-var ALLOWED_TYPES = {
-  FailedJobRetryTimeCycle: ["bpmn:StartEvent", "bpmn:BoundaryEvent", "bpmn:IntermediateCatchEvent", "bpmn:Activity"],
-  Connector: ["bpmn:EndEvent", "bpmn:IntermediateThrowEvent"],
-  Field: ["bpmn:EndEvent", "bpmn:IntermediateThrowEvent"]
-};
+const ALLOWED_TYPES = {
+  FailedJobRetryTimeCycle: ['bpmn:StartEvent', 'bpmn:BoundaryEvent', 'bpmn:IntermediateCatchEvent', 'bpmn:Activity'],
+  Connector: ['bpmn:EndEvent', 'bpmn:IntermediateThrowEvent'],
+  Field: ['bpmn:EndEvent', 'bpmn:IntermediateThrowEvent']
+}
 
 function is(element, type) {
   return element && typeof element.$instanceOf === "function" && element.$instanceOf(type);
@@ -32,8 +32,8 @@ function anyType(element, types) {
 }
 
 function isAllowed(propName, propDescriptor, newElement) {
-  var name = propDescriptor.name,
-    types = ALLOWED_TYPES[name.replace(/activiti:/, "")];
+  const name = propDescriptor.name,
+    types = ALLOWED_TYPES[name.replace(/activiti:/, '')]
 
   return name === propName && anyType(newElement, types);
 }
@@ -42,8 +42,8 @@ function ActivitiModdleExtension(eventBus) {
   eventBus.on(
     "property.clone",
     function(context) {
-      var newElement = context.newElement,
-        propDescriptor = context.propertyDescriptor;
+      const newElement = context.newElement,
+        propDescriptor = context.propertyDescriptor
 
       this.canCloneProperty(newElement, propDescriptor);
     },

src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/camunda/extension.js

 "use strict";
 
-var isFunction = require("min-dash").isFunction,
-  isObject = require("min-dash").isObject,
-  some = require("min-dash").some;
+const isFunction = require('min-dash').isFunction,
+  isObject = require('min-dash').isObject,
+  some = require('min-dash').some
 
-var WILDCARD = "*";
+const WILDCARD = '*'
 
 function CamundaModdleExtension(eventBus) {
-  var self = this;
+  const self = this
 
   eventBus.on("moddleCopy.canCopyProperty", function(context) {
-    var property = context.property,
-      parent = context.parent;
+    const property = context.property,
+      parent = context.parent
 
     return self.canCopyProperty(property, parent);
   });
@@ -45,14 +45,14 @@ CamundaModdleExtension.prototype.canCopyProperty = function(property, parent) {
 
 CamundaModdleExtension.prototype.canHostInputOutput = function(parent) {
   // allowed in camunda:Connector
-  var connector = getParent(parent, "camunda:Connector");
+  const connector = getParent(parent, 'camunda:Connector')
 
   if (connector) {
     return true;
   }
 
   // special rules inside bpmn:FlowNode
-  var flowNode = getParent(parent, "bpmn:FlowNode");
+  const flowNode = getParent(parent, 'bpmn:FlowNode')
 
   if (!flowNode) {
     return false;
@@ -62,15 +62,13 @@ CamundaModdleExtension.prototype.canHostInputOutput = function(parent) {
     return false;
   }
 
-  if (is(flowNode, "bpmn:SubProcess") && flowNode.get("triggeredByEvent")) {
-    return false;
-  }
+  return !(is(flowNode, "bpmn:SubProcess") && flowNode.get("triggeredByEvent"));
+
 
-  return true;
 };
 
 CamundaModdleExtension.prototype.canHostConnector = function(parent) {
-  var serviceTaskLike = getParent(parent, "camunda:ServiceTaskLike");
+  const serviceTaskLike = getParent(parent, 'camunda:ServiceTaskLike')
 
   if (is(serviceTaskLike, "bpmn:MessageEventDefinition")) {
     // only allow on throw and end events
@@ -81,13 +79,13 @@ CamundaModdleExtension.prototype.canHostConnector = function(parent) {
 };
 
 CamundaModdleExtension.prototype.canHostIn = function(parent) {
-  var callActivity = getParent(parent, "bpmn:CallActivity");
+  const callActivity = getParent(parent, 'bpmn:CallActivity')
 
   if (callActivity) {
     return true;
   }
 
-  var signalEventDefinition = getParent(parent, "bpmn:SignalEventDefinition");
+  const signalEventDefinition = getParent(parent, 'bpmn:SignalEventDefinition')
 
   if (signalEventDefinition) {
     // only allow on throw and end events
@@ -129,9 +127,9 @@ function getParent(element, type) {
 
 function isAllowedInParent(property, parent) {
   // (1) find property descriptor
-  var descriptor = property.$type && property.$model.getTypeDescriptor(property.$type);
+  const descriptor = property.$type && property.$model.getTypeDescriptor(property.$type)
 
-  var allowedIn = descriptor && descriptor.meta && descriptor.meta.allowedIn;
+  const allowedIn = descriptor && descriptor.meta && descriptor.meta.allowedIn
 
   if (!allowedIn || isWildcard(allowedIn)) {
     return true;

src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/flowable/flowableExtension.js

 "use strict";
 
-var some = require("min-dash").some;
+const some = require('min-dash').some
 
-var ALLOWED_TYPES = {
-  FailedJobRetryTimeCycle: ["bpmn:StartEvent", "bpmn:BoundaryEvent", "bpmn:IntermediateCatchEvent", "bpmn:Activity"],
-  Connector: ["bpmn:EndEvent", "bpmn:IntermediateThrowEvent"],
-  Field: ["bpmn:EndEvent", "bpmn:IntermediateThrowEvent"]
-};
+const ALLOWED_TYPES = {
+  FailedJobRetryTimeCycle: ['bpmn:StartEvent', 'bpmn:BoundaryEvent', 'bpmn:IntermediateCatchEvent', 'bpmn:Activity'],
+  Connector: ['bpmn:EndEvent', 'bpmn:IntermediateThrowEvent'],
+  Field: ['bpmn:EndEvent', 'bpmn:IntermediateThrowEvent']
+}
 
 function is(element, type) {
   return element && typeof element.$instanceOf === "function" && element.$instanceOf(type);
@@ -32,8 +32,8 @@ function anyType(element, types) {
 }
 
 function isAllowed(propName, propDescriptor, newElement) {
-  var name = propDescriptor.name,
-    types = ALLOWED_TYPES[name.replace(/flowable:/, "")];
+  const name = propDescriptor.name,
+    types = ALLOWED_TYPES[name.replace(/flowable:/, '')]
 
   return name === propName && anyType(newElement, types);
 }
@@ -42,8 +42,8 @@ function FlowableModdleExtension(eventBus) {
   eventBus.on(
     "property.clone",
     function(context) {
-      var newElement = context.newElement,
-        propDescriptor = context.propertyDescriptor;
+      const newElement = context.newElement,
+        propDescriptor = context.propertyDescriptor
 
       this.canCloneProperty(newElement, propDescriptor);
     },

src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js

@@ -10,18 +10,18 @@ F.prototype = PaletteProvider.prototype; // 核心，将父类的原型赋值给
 
 // 利用中介函数重写原型链方法
 F.prototype.getPaletteEntries = function() {
-  var actions = {},
+  const actions = {},
     create = this._create,
     elementFactory = this._elementFactory,
     spaceTool = this._spaceTool,
     lassoTool = this._lassoTool,
     handTool = this._handTool,
     globalConnect = this._globalConnect,
-    translate = this._translate;
+    translate = this._translate
 
   function createAction(type, group, className, title, options) {
     function createListener(event) {
-      var shape = elementFactory.createShape(assign({ type: type }, options));
+      const shape = elementFactory.createShape(assign({ type: type }, options))
 
       if (options) {
         shape.businessObject.di.isExpanded = options.isExpanded;
@@ -30,7 +30,7 @@ F.prototype.getPaletteEntries = function() {
       create.start(event, shape);
     }
 
-    var shortType = type.replace(/^bpmn:/, "");
+    const shortType = type.replace(/^bpmn:/, '')
 
     return {
       group: group,
@@ -44,19 +44,19 @@ F.prototype.getPaletteEntries = function() {
   }
 
   function createSubprocess(event) {
-    var subProcess = elementFactory.createShape({
-      type: "bpmn:SubProcess",
+    const subProcess = elementFactory.createShape({
+      type: 'bpmn:SubProcess',
       x: 0,
       y: 0,
       isExpanded: true
-    });
+    })
 
-    var startEvent = elementFactory.createShape({
-      type: "bpmn:StartEvent",
+    const startEvent = elementFactory.createShape({
+      type: 'bpmn:StartEvent',
       x: 40,
       y: 82,
       parent: subProcess
-    });
+    })
 
     create.start(event, [subProcess, startEvent], {
       hints: {

src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js

@@ -19,18 +19,18 @@ export default function PaletteProvider(palette, create, elementFactory, spaceTo
 PaletteProvider.$inject = ["palette", "create", "elementFactory", "spaceTool", "lassoTool", "handTool", "globalConnect", "translate"];
 
 PaletteProvider.prototype.getPaletteEntries = function() {
-  var actions = {},
+  const actions = {},
     create = this._create,
     elementFactory = this._elementFactory,
     spaceTool = this._spaceTool,
     lassoTool = this._lassoTool,
     handTool = this._handTool,
     globalConnect = this._globalConnect,
-    translate = this._translate;
+    translate = this._translate
 
   function createAction(type, group, className, title, options) {
     function createListener(event) {
-      var shape = elementFactory.createShape(assign({ type: type }, options));
+      const shape = elementFactory.createShape(assign({ type: type }, options))
 
       if (options) {
         shape.businessObject.di.isExpanded = options.isExpanded;
@@ -39,7 +39,7 @@ PaletteProvider.prototype.getPaletteEntries = function() {
       create.start(event, shape);
     }
 
-    var shortType = type.replace(/^bpmn:/, "");
+    const shortType = type.replace(/^bpmn:/, '')
 
     return {
       group: group,
@@ -53,19 +53,19 @@ PaletteProvider.prototype.getPaletteEntries = function() {
   }
 
   function createSubprocess(event) {
-    var subProcess = elementFactory.createShape({
-      type: "bpmn:SubProcess",
+    const subProcess = elementFactory.createShape({
+      type: 'bpmn:SubProcess',
       x: 0,
       y: 0,
       isExpanded: true
-    });
+    })
 
-    var startEvent = elementFactory.createShape({
-      type: "bpmn:StartEvent",
+    const startEvent = elementFactory.createShape({
+      type: 'bpmn:StartEvent',
       x: 40,
       y: 82,
       parent: subProcess
-    });
+    })
 
     create.start(event, [subProcess, startEvent], {
       hints: {

src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue

@@ -163,7 +163,6 @@ export default {
     // 初始化数据
     initFormOnChanged(element) {
       let activatedElement = element;
-      // debugger
       if (!activatedElement) {
         activatedElement =
           window.bpmnInstances.elementRegistry.find(el => el.type === "bpmn:Process") ??

src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue

@@ -2,6 +2,7 @@
   <div class="panel-tab__content">
     <el-form size="mini" label-width="90px" :model="model" :rules="rules" @submit.native.prevent>
       <div v-if="elementBaseInfo.$type === 'bpmn:Process'"> <!-- 如果是 Process 信息的时候，使用自定义表单 -->
+
         <el-form-item label="流程标识" prop="key">
           <el-input v-model="model.key" placeholder="请输入流标标识"
                     :disabled="model.id !== undefined && model.id.length > 0" @change="handleKeyUpdate" />
@@ -66,6 +67,7 @@ export default {
   },
   methods: {
     resetBaseInfo() {
+      debugger;
       this.bpmnElement = window?.bpmnInstances?.bpmnElement;
       this.elementBaseInfo = JSON.parse(JSON.stringify(this.bpmnElement.businessObject));
     },
@@ -74,7 +76,7 @@ export default {
       if (!value) {
         return;
       }
-      if (!value.match(/[a-zA-Z_][\-_.0-9_a-zA-Z$]*/)) {
+      if (!value.match(/[a-zA-Z_][\-_.0-9a-zA-Z$]*/)) {
         console.log('key 不满足 XML NCName 规则，所以不进行赋值');
         return;
       }
@@ -101,6 +103,7 @@ export default {
       const attrObj = Object.create(null);
       attrObj[key] = this.elementBaseInfo[key];
       if (key === "id") {
+        debugger;
         window.bpmnInstances.modeling.updateProperties(this.bpmnElement, {
           id: this.elementBaseInfo[key],
           di: { id: `${this.elementBaseInfo[key]}_di` }

src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue

@@ -15,7 +15,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="表达式" v-if="flowConditionForm.conditionType && flowConditionForm.conditionType === 'expression'" key="express">
-        <el-input v-model="flowConditionForm.body" clearable @change="updateFlowCondition" />
+        <el-input v-model="flowConditionForm.body" style="width:192px;"  clearable @change="updateFlowCondition" />
       </el-form-item>
       <template v-if="flowConditionForm.conditionType && flowConditionForm.conditionType === 'script'">
         <el-form-item label="脚本语言" key="language">

src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue

@@ -15,7 +15,7 @@
         <el-form-item label="循环基数" key="loopCardinality">
           <el-input v-model="loopInstanceForm.loopCardinality" clearable @change="updateLoopCardinality" />
         </el-form-item>
-        <el-form-item label="集合" key="collection">
+        <el-form-item label="集合" key="collection" v-show="false">
           <el-input v-model="loopInstanceForm.collection" clearable @change="updateLoopBase" />
         </el-form-item>
         <el-form-item label="元素变量" key="elementVariable">
@@ -131,7 +131,7 @@ export default {
       if (type === "SequentialMultiInstance") {
         this.multiLoopInstance = window.bpmnInstances.moddle.create("bpmn:MultiInstanceLoopCharacteristics", { isSequential: true });
       } else {
-        this.multiLoopInstance = window.bpmnInstances.moddle.create("bpmn:MultiInstanceLoopCharacteristics");
+        this.multiLoopInstance = window.bpmnInstances.moddle.create("bpmn:MultiInstanceLoopCharacteristics", { collection: "${coll_userList}" });
       }
       window.bpmnInstances.modeling.updateProperties(this.bpmnElement, {
         loopCharacteristics: this.multiLoopInstance

src/components/bpmnProcessDesigner/package/theme/process-designer.scss

@@ -13,7 +13,7 @@
   display: flex;
   flex-direction: column;
   width: 100%;
-  height: 100%;
+  height: 500px;
   box-sizing: border-box;
   .my-process-designer__header {
     width: 100%;
@@ -141,11 +141,11 @@
   }
 }
 pre {
-  /* margin: 0;
+  margin: 0;
   height: 100%;
   overflow: hidden;
   max-height: calc(80vh - 32px);
-  overflow-y: auto; */
+  overflow-y: auto;
 }
 .hljs {
   word-break: break-word;

src/utils/index.js

@@ -457,4 +457,10 @@ export function dataURLtoBlob(base64Data) {
       type: mimeString
   });
   return blob;
+}
+
+// 将字符串转成数组
+export function str2arr(str, separator = ','){
+  if(!str) return []
+  return str.split(separator).filter(item => item)
 }
\ No newline at end of file

src/views/bpm/model/modelEditor.vue

 <template>
   <div class="app-container">
+
     <!-- 流程设计器，负责绘制流程等 -->
-    <my-process-designer :key="`designer-${reloadIndex}`" v-model="xmlString" v-bind="controlForm"
+    <my-process-designer v-if="xmlString !== undefined" :key="`designer-${reloadIndex}`" v-model="xmlString" v-bind="controlForm"
       keyboard ref="processDesigner" @init-finished="initModeler"
       @save="save"/>
 
@@ -29,7 +30,7 @@ export default {
   components: { MyProcessPalette },
   data() {
     return {
-      xmlString: "", // BPMN XML
+      xmlString: undefined, // BPMN XML
       modeler: null,
       reloadIndex: 0,
       controlDrawerVisible: false,
@@ -38,7 +39,7 @@ export default {
         simulation: true,
         labelEditing: false,
         labelVisible: false,
-        prefix: "activiti",
+        prefix: "flowable",
         headerButtonSize: "mini",
         additionalModel: [CustomContentPadProvider, CustomPaletteProvider]
       },
@@ -53,6 +54,7 @@ export default {
   created() {
     // 如果 modelId 非空，说明是修改流程模型
     const modelId = this.$route.query && this.$route.query.modelId
+
     if (modelId) {
       getModel(modelId).then(response => {
         this.xmlString = response.data.bpmnXml
@@ -68,24 +70,8 @@ export default {
     initModeler(modeler) {
       setTimeout(() => {
         this.modeler = modeler;
-        console.log(modeler);
       }, 10);
     },
-    reloadProcessDesigner(deep) {
-      this.controlForm.additionalModel = [];
-      for (let key in this.addis) {
-        if (this.addis[key]) {
-          this.controlForm.additionalModel.push(this.addis[key]);
-        }
-      }
-      deep && (this.xmlString = undefined);
-      this.reloadIndex += 1;
-      this.modeler = null; // 避免 panel 异常
-      // if (deep) {
-      //   this.xmlString = undefined;
-      //   this.$refs.processDesigner.processRestart();
-      // }
-    },
     save(bpmnXml) {
       const data = {
         ...this.model,
@@ -129,9 +115,6 @@ export default {
 //  display: inline-grid;
 //  grid-template-columns: 100px auto max-content;
 //}
-.app-container{
-  min-height: calc(100vh - 84px);
-}
 .demo-control-bar {
   position: fixed;
   right: 8px;
@@ -174,9 +157,9 @@ export default {
   color: #fafafa;
 }
 
-/* .my-process-designer {
+.my-process-designer {
   height: calc(100vh - 84px);
-} */
+}
 .process-panel__container {
   position: absolute;
   right: 0;

src/views/bpm/processInstance/index.vue

@@ -38,10 +38,10 @@
 
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
+       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
                    v-hasPermi="['bpm:process-instance:query']">{{$t('发起流程')}}</el-button>
-      </el-col> -->
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

src/views/ecw/coupon/detail.vue

+<script>
+import Edit from './edit'
+Edit.name = 'CouponDetail'
+export default Edit
+</script>
\ No newline at end of file

src/views/ecw/coupon/edit.vue

@@ -261,6 +261,7 @@ import ProductsSelector from '@/components/ProductsSelector'
 import Editor from '@/components/Editor'
 import Selector from '@/components/Selector/index'
 import {parseTime} from '@/utils/ruoyi'
+import {str2arr} from '@/utils/index'
 
 
 export default {
@@ -304,6 +305,7 @@ export default {
 			},
 			errTips: {}, // 跟fee对应的错误提示
 			isAllProduct: false, // 是否全部商品
+			initing: false, // 初始化中，编辑或者查看的时候，初始化中修改type不改默认值
 		};
 	},
     computed:{
@@ -370,13 +372,15 @@ export default {
         // 非优惠券则查询优惠券列表
         if(val && val != 1){
           this.getCouponSelect()
-
-          // 非优惠券给默认数据
-          this.$set(this.form, 'documentDeclarationArr', ["1", "2", "3"])
-          this.$set(this.form, 'isCargoControlArr', ["0", "1"])
-          this.$set(this.form, 'orderAttrArr', ["2","3","1"])
-          this.$set(this.form, 'brandArr', ["0","1", "2"])
-		  this.$set(this.form, 'suitableLineType', 0)
+		
+          if(!this.initing){
+			// 非优惠券给默认数据
+			this.$set(this.form, 'documentDeclarationArr', ["1", "2", "3"])
+			this.$set(this.form, 'isCargoControlArr', ["0", "1"])
+			this.$set(this.form, 'orderAttrArr', ["2","3","1"])
+			this.$set(this.form, 'brandArr', ["0","1", "2"])
+			this.$set(this.form, 'suitableLineType', 0)
+		  }
         }
 
 		// 过一遍费用，禁用/启用、同步 部分货币单位
@@ -416,9 +420,13 @@ export default {
 		}
     	getCurrencyList().then(res => this.currencyList = res.data)
 		if (this.$route.query.id) {
+			this.initing = true
 			getCoupon(this.$route.query.id).then((res) => {
-				this.form = res.data
-
+				this.form = res.data;
+				['orderAttr', 'isCargoControl', 'brand', 'documentDeclaration'].forEach(field => {
+					this.$set(this.form, field + 'Arr', str2arr(res.data[field]))
+				})
+				
 				// 没有商品则表示全部
 				if(!this.form.prodIds){
 					this.isAllProduct = true
@@ -464,6 +472,10 @@ export default {
 						this.fee[type] = [{type}]
 					}
 				})
+			}).finally(() => {
+				this.$nextTick(() => {
+					this.initing = false
+				})
 			})
 		}
 		// 不是编辑查看则给默认的费用表格
@@ -489,7 +501,14 @@ export default {
 				// 只要不是按产品单位满减
 				if(!item.combUnit || item.combUnit.split('_')[0] != 'prodUnit'){
 					this.$set(item, 'reduceCurrencyDisabled', true)
-					this.$set(item, 'reduceCurrencyId', +item.fullCurrencyId || +item.combUnit.split('_')[1])
+					let currencyId = +item.fullCurrencyId
+					if(!currencyId && item.combUnit){
+						currencyId = +item.combUnit.split('_')[1]
+					}
+					if(!currencyId){
+						currencyId = this.currencyList[0].id
+					}
+					this.$set(item, 'reduceCurrencyId', currencyId)
 				}
 				
 				return
@@ -522,7 +541,7 @@ export default {
 			
 		},
 		getCouponSelect(){
-			getCouponSelect({overdueStatus: 1, status: 1}).then(res => {
+			getCouponSelect({overdueStatus: 1, status: 1, pageSize: 100}).then(res => {
 				this.couponList = res.data
 			})
 		},
@@ -639,7 +658,7 @@ export default {
 				}
 
 				// 没勾选全部就需要选择商品
-				if(!this.isAllProduct && !this.form.prodIds){
+				if(this.form.type != 1 && !this.isAllProduct && !this.form.prodIds){
 					return this.$message.error('请选择商品')
 				}
 

src/views/ecw/coupon/index.vue

@@ -3,9 +3,9 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="标题" prop="titleZh">
+      <!-- <el-form-item label="标题" prop="titleZh">
         <el-input v-model="queryParams.titleZh" placeholder="请输入标题" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="标题" prop="titleEn">
         <el-input v-model="queryParams.titleEn" placeholder="请输入标题" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item> -->
@@ -16,6 +16,12 @@
         </el-select> -->
         <dict-selector :type='DICT_TYPE.ECW_COUPON_TYPE' v-model="queryParams.type" />
       </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <dict-selector :type="DICT_TYPE.ECW_COUPON_STATUS" v-model="queryParams.status"/>
+      </el-form-item>
+      <el-form-item label="关键字" prop="conditionCurrencyId">
+        <el-input v-model="queryParams.searchKey" placeholder="请输入关键字" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
       <!-- <el-form-item label="使用条件(优惠卷专用)" prop="cashCondition">
         <el-input v-model="queryParams.cashCondition" placeholder="请输入使用条件(优惠卷专用)" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
@@ -25,26 +31,26 @@
       <el-form-item label="条件货币ID" prop="conditionCurrencyId">
         <el-input v-model="queryParams.conditionCurrencyId" placeholder="请输入条件货币ID" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item> -->
-      <el-form-item label="开始时间">
+      <!-- <el-form-item label="开始时间">
         <el-date-picker v-model="dateRangeStartTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="减免货币ID" prop="reduceCurrencyId">
         <el-input v-model="queryParams.reduceCurrencyId" placeholder="请输入减免货币ID" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item> -->
-      <el-form-item label="结束时间">
+      <!-- <el-form-item label="结束时间">
         <el-date-picker v-model="dateRangeEndTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="领券后X天起生效" prop="afterReceiveDays">
         <el-input v-model="queryParams.afterReceiveDays" placeholder="请输入领券后X天起生效" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="有效天数" prop="validDays">
         <el-input v-model="queryParams.validDays" placeholder="请输入有效天数" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item> -->
-      <el-form-item label="费用类型" prop="costType">
+      <!-- <el-form-item label="费用类型" prop="costType">
         <dict-selector :type="DICT_TYPE.ECW_COUPON_COST_TYPE" v-model="queryParams.costType"/>
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="优惠清单" prop="discountDetailed">
         <el-input v-model="queryParams.discountDetailed" placeholder="请输入优惠清单" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
@@ -74,12 +80,12 @@
       <el-form-item label="每个用户领券上限，如不填则默认为1" prop="limitNum">
         <el-input v-model="queryParams.limitNum" placeholder="请输入每个用户领券上限，如不填则默认为1" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item> -->
-      <el-form-item label="过期状态" prop="overdueStatus">
+      <!-- <el-form-item label="过期状态" prop="overdueStatus">
         <dict-selector :type="DICT_TYPE.ECW_COUPON_OVERDUE_STATUS" v-model="queryParams.overdueStatus"/>
-      </el-form-item>
-      <el-form-item label="投放状态" prop="putonStatus">
+      </el-form-item> -->
+      <!-- <el-form-item label="投放状态" prop="putonStatus">
         <dict-selector :type="DICT_TYPE.ECW_COUPON_PUTON_STATUS" v-model="queryParams.putonStatus"/>
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="获取方式 0=客户领取 1=平台发放" prop="getWay">
         <el-input v-model="queryParams.getWay" placeholder="请输入获取方式 0=客户领取 1=平台发放" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
@@ -97,9 +103,7 @@
       <el-form-item label="单证报关(可多选) 1 我司全代 2自单代报 3混合报关" prop="documentDeclaration">
         <el-input v-model="queryParams.documentDeclaration" placeholder="请输入单证报关(可多选) 1 我司全代 2自单代报 3混合报关" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item> -->
-      <el-form-item label="状态" prop="status">
-        <dict-selector :type="DICT_TYPE.ECW_COUPON_STATUS" v-model="queryParams.status"/>
-      </el-form-item>
+      
       <!-- <el-form-item label="创建时间">
         <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
@@ -132,23 +136,29 @@
         </template>
       </el-table-column>
       <el-table-column label="标题" align="center" prop="titleZh" />
+      <el-table-column label="描述" align="center" prop="type">
+        <template slot-scope="{row}">
+          {{$l(row, 'content')}}
+        </template>
+      </el-table-column>
       <el-table-column label="发布人/发布时间" align="center" prop="startTime" width="180">
         <template slot-scope="scope">
           <div>{{ scope.row.creatorName }}</div>
-          <div>{{ parseTime(scope.row.createTime) }}</div>
+          <div>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</div>
         </template>
       </el-table-column>
       <el-table-column label="开始时间" align="center" prop="startTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startTime) }}</span>
+          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="结束时间" align="center" prop="endTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endTime) }}</span>
+        <template slot-scope="{row}">
+          <div :style="{red: row.overdueStatus ==0 ? 'red' : null}">{{ parseTime(row.endTime, '{y}-{m}-{d}') }}</div>
+          <div v-if="row.overdueStatus == 0" style="color: red">已过期</div>
         </template>
       </el-table-column>
-      
+      <!-- 
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -158,10 +168,10 @@
         <template slot-scope="{row}">
           <dict-tag :type="DICT_TYPE.ECW_IS_DRAFT" :value="row.status" />
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row, true)"
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row, true)"
                      v-hasPermi="['ecw:coupon:update']">查看</el-button>
           <el-button v-if="scope.row.status != 1" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['ecw:coupon:update']">编辑</el-button>
@@ -287,6 +297,9 @@ export default {
       }
       return this.$router.push(url)
     },
+    handleDetail(row){
+      this.$router.push('detail?id=' + row.couponId + '&readonly=1')
+    },
     handleCopy(row){
       this.$router.push('edit?action=copy&id=' + row.couponId)
     },

src/views/ecw/financial/creatCollection.vue

@@ -275,9 +275,9 @@
               {{ `${NP.minus(scope.row.receivableAmount, scope.row.discountTotal || 0)}${scope.row.discountTotal > 0 ? `(${scope.row.receivableAmount} - ${scope.row.discountTotal})` : ''}` }}
             </template>
           </el-table-column>
-          <el-table-column align="center" width="220">
+          <el-table-column align="center">
             <template #header>
-              {{ $t('核销基准币种') }}（{{getCurrencyLabel(showCurrencyId)}}）{{ $t('汇率') }}
+              {{ $t('核销基准币种')+'（'+getCurrencyLabel(showCurrencyId)+'）'+ $t('汇率') }}
             </template>
             <template slot-scope="scope">
               <template v-if="scope.row.type !== 'total'">
@@ -293,13 +293,13 @@
                 </el-form-item>
               </template>
               <template v-else>
-                {{ $t('应收总金额') }}（	{{getCurrencyLabel(showCurrencyId)}}）
+                {{ $t('应收总金额')+'（'+getCurrencyLabel(showCurrencyId)+'）'}}
               </template>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="writeOffAmount">
             <template #header>
-              {{ $t('核销基准金额') }}（	{{getCurrencyLabel(showCurrencyId)}}）
+              {{ $t('核销基准金额')+'（'+getCurrencyLabel(showCurrencyId)+'）'}}
             </template>
           </el-table-column>
           <el-table-column :label="$t('期望收款账户')" align="center">

src/views/ecw/financial/openInvoice.vue

@@ -30,12 +30,12 @@
           <el-descriptions-item :label="$t('开户行')">{{ invoiceData.accountBank }}</el-descriptions-item>
           <el-descriptions-item :label="$t('税率%')">
             <el-form-item label="">
-              <el-input v-model="invoiceData.taxRate"></el-input>  
+              <el-input v-model="invoiceData.taxRate"></el-input>
             </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item :label="$t('项目')">
             <el-form-item label="">
-              <el-input v-model="invoiceData.projectName"></el-input>  
+              <el-input v-model="invoiceData.projectName"></el-input>
             </el-form-item>
           </el-descriptions-item>
         </el-descriptions>
@@ -56,7 +56,11 @@
             </template>
           </el-table-column>
           <el-table-column :label="$t('箱数')" align="center" prop="num" />
-          <el-table-column :label="$t('体积/重量')" align="center" prop="weight"></el-table-column>
+          <el-table-column :label="$t('体积/重量')" align="center" prop="weight">
+            <template slot-scope="scope">
+              {{ scope.row.volume?(scope.row.volume + '/'+scope.row.weight):'' }}
+            </template>
+          </el-table-column>
           <el-table-column :label="$t('收入类型')" align="center" prop="feeType">
             <template slot-scope="scope">
               <dict-tag
@@ -76,6 +80,16 @@
             <span>{{ scope.row.totalAmount }}{{getCurrencyLabel(scope.row.currencyId)}}</span>
             <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
           </template>
+        </el-table-column>
+        <el-table-column :label="$t('优惠金额')" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.discountTotal ?scope.row.discountTotal : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('优惠后金额')" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.disCountAmount ?scope.row.disCountAmount :0 }}
+          </template>
         </el-table-column>
           <el-table-column :label="$t('税额')" align="center" prop="tax">
             <template slot-scope="scope">
@@ -157,14 +171,22 @@ export default {
         res.data.map(v => {
           v.tax = NP.times(v.totalAmount, this.invoiceData.taxRate/100)
           v.taxAndTotalAmount = NP.plus(v.totalAmount, NP.times(v.totalAmount, this.invoiceData.taxRate/100))
+          if(v.discountTotal){
+            v.disCountAmount = NP.minus(v.totalAmount,v.discountTotal)
+          }else{
+            v.disCountAmount = v.totalAmount
+          }
+
         })
         const t = {
           orderNo: this.$t('合计'),
           totalAmount: res.data.reduce((total, curr) => NP.plus(total, curr.totalAmount), 0),
+          disCountAmount:res.data.reduce((total, curr) => NP.plus(total, curr.disCountAmount), 0),
           tax: res.data.reduce((total, curr) => NP.plus(total, curr.tax), 0),
           taxAndTotalAmount: res.data.reduce((total, curr) => NP.plus(total, curr.taxAndTotalAmount), 0)
         }
         this.list = [...res.data, t]
+        console.log(this.list)
       })
     },
     submitForm() {
@@ -180,7 +202,7 @@ export default {
     },
     getSummaries(param) {
       const t = this.list[this.list.length - 1].taxAndTotalAmount
-      return [this.$t('收款人'), this.invoiceData.payeeName, this.$t('核销人'), this.invoiceData.writeOffName, this.$t('开票人'), this.invoiceData.issuerName, '', this.$t('价税合计大写'), this.convertCurrency(t)];
+      return [this.$t('收款人'), this.invoiceData.salesmanName, this.$t('核销人'), this.invoiceData.writeOffName, this.$t('开票人'), this.invoiceData.issuerName, '', this.$t('价税合计大写'), this.convertCurrency(t)];
     },
     convertCurrency(money) {
       //汉字的数字
@@ -205,7 +227,7 @@ export default {
       var chineseStr = '';
       //分离金额后用的数组，预定义
       var parts;
-      // 传入的参数为空情况 
+      // 传入的参数为空情况
       if(money === '') {
         return '';
       }
@@ -213,7 +235,7 @@ export default {
       if(money >= maxNum){
         return ''
       }
-      // 传入的参数为0情况 
+      // 传入的参数为0情况
       if (money === 0) {
         chineseStr = cnNums[0] + cnIntLast + cnInteger;
         return chineseStr
@@ -248,7 +270,7 @@ export default {
             chineseStr += cnNums[parseInt(n)] + cnIntRadice[m];
           }
           if(m == 0 && zeroCount < 4){
-            chineseStr += cnIntUnits[q]; 
+            chineseStr += cnIntUnits[q];
           }
         }
         // 最后+ 元

src/views/ecw/financial/receiptDetail.vue

@@ -508,7 +508,9 @@ export default {
     writeOffAmount(){
       let total = 0
       this.detailed.forEach(item => {
-        total = NP.plus(total, item.writeOffAmount)
+        if(item.status){
+          total = NP.plus(total, item.writeOffAmount)
+        }
       })
       return total.toFixed(2)
     },

src/views/ecw/financial/voucher.vue

@@ -52,9 +52,10 @@
           <el-col style="width: 592px">
             <el-form-item :label="$t('创建时间')">
               <el-date-picker
-                v-model="queryParams.beginCreateTime"
+                v-model="dateFilter"
                 type="datetimerange"
                 range-separator="-"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 :start-placeholder="$t('请选择日期')"
                 :end-placeholder="$t('请选择日期')"
               >
@@ -301,6 +302,7 @@ export default {
         productRecord: null,
         followUpSalesmanId: null,
       },
+      dateFilter:[],
       downloading: false, // 导出状态
     };
   },
@@ -368,7 +370,14 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      console.log(11)
+      if(this.dateFilter&&this.dateFilter.length>0){
+        this.queryParams.beginCreateTime = this.dateFilter[0]
+        this.queryParams.endCreateTime = this.dateFilter[1]
+      }else{
+        this.queryParams.beginCreateTime = ''
+        this.queryParams.endCreateTime = ''
+      }
+
       this.queryParams.pageNo = 1;
       this.getList();
     },

src/views/ecw/order/detail.vue

@@ -122,7 +122,8 @@
             <el-table-column prop="prodTitleEn" :label="$t('英文品名')" />
             <el-table-column prop="brand" :label="$t('品牌')"  width="90px">
               <template slot-scope="{row}">
-                <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
+                <template v-if="row.brandName">{{row.brandName}}</template>
+                <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
               </template>
             </el-table-column>
             <el-table-column prop="num" :label="$t('填单件数')"  width="90px"/>
@@ -169,16 +170,16 @@
 
                 <template v-if="row.charging ==1">
                   <template v-if="!row.seaFreight">未报价</template>
-                  <template v-else>{{$t('全包价')}} {{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</template>
+                  <el-link type="primary" @click="showFeeDetail(row, 'clearance')" v-else>{{$t('全包价')}} {{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</el-link>
                 </template>
                 <template v-else-if="!row.seaFreight && !row.clearanceFreight">未报价</template>
                 <template v-else>
-                  <div>
+                  <el-link type="primary" @click="showFeeDetail(row, 'freight')">
                       {{$t('运费')}}：{{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}
-                  </div>
-                  <div>
+                  </el-link>
+                  <el-link type="primary" @click="showFeeDetail(row, 'clearance')">
                       {{$t('清关费')}}：{{row.oneClearanceFreight}} {{currencyMap[row.clearanceFreightCurrency]}} / {{unitMap[row.clearanceFreightVolume]}}
-                  </div>
+                  </el-link >
                 </template>
               </template>
             </el-table-column>
@@ -252,20 +253,43 @@
     <print-warehouse-receipt v-if="showWarehouseReceipt" :order-id="order.orderId" @close="showWarehouseReceipt=false" />
     <print-lading-bill v-if="showLadingBill" :order-id="order.orderId" :transport-type="order.transportId" @close="showLadingBill=false" />
     <warehouse-detail :order="order" :orderItemId="showWarehouseInItemId" v-if="showWarehouseInItemId" @close="showWarehouseInItemId=null" />
-    <el-dialog title="付款人" :visible.sync="showDarweeDialog" v-if="order && order.customDraweeVOList">
+    <el-dialog :title="$t('付款人')" :visible.sync="showDarweeDialog" v-if="order && order.customDraweeVOList">
       <el-table :data="order.customDraweeVOList" v-if="order.drawee==3" >
-        <el-table-column label="费用类型" prop="label" width="200px">
+        <el-table-column :label="$t('费用类型')" prop="label" width="200px">
           <template slot-scope="{row}">
           <dict-tag :type="DICT_TYPE.ECW_CUSTOM_DRAWEE" :value="row.name"/>
           </template>
         </el-table-column>
-        <el-table-column label="付款人" width="300px">
+        <el-table-column :label="$t('付款人')" width="300px">
             <template slot-scope="{row}">
                 <dict-tag :type="DICT_TYPE.DRAWEE" :value="row.value" />
             </template>
         </el-table-column>
       </el-table>
     </el-dialog>
+
+    <el-dialog :title="$t('费用详情')" :visible="!!showFeeDetailDialog" :before-close="closeFeeDetail">
+      <el-row v-if="feeDetail">
+        <el-col :span="12">
+          <div>{{feeDetail.charging ? $t('全包价') : $t('运费')}}</div>
+          <div v-for="item in feeDetail.freight">
+            {{item.label}}: {{item.value}} 
+            <template v-if="item.currency">
+              {{currencyMap[item.currency]}} / {{unitMap[item.volume]}} <span v-if="item.remark">【{{item.remark}}】</span>
+            </template>
+          </div>
+        </el-col>
+        <el-col :span="12" v-if="feeDetail.charging != 1">
+          <div>{{$t('清关费')}}</div>
+          <div v-for="item in feeDetail.clearance">
+            {{item.label}}: {{item.value}}
+            <template v-if="item.currency">
+              {{currencyMap[item.currency]}} / {{unitMap[item.volume]}} <span v-if="item.remark">【{{item.remark}}】</span>
+            </template>
+          </div>
+        </el-col>
+      </el-row>
+    </el-dialog>
   </div>
 </template>
 
@@ -280,6 +304,8 @@ import {getReceivableListByOrderId} from '@/api/ecw/receipt'
 import { getChannel } from '@/api/ecw/channel';
 import {listByIds} from '@/api/ecw/region'
 import WarehouseDetail from './components/WarehouseDetail';
+import {getProductBrank} from '@/api/ecw/productBrank'
+import { parseTime } from '@/utils/ruoyi';
 
 export default {
   name: "detail",
@@ -319,6 +345,8 @@ export default {
       region: '',
       orderWarehouseIn: null, // 入仓详情
       showWarehouseInItemId: null, // 当前显示的入仓
+      showFeeDetailDialog: null, // 是否显示费用详情弹层
+      feeDetail: null, // 费用详情
     }
   },
   computed:{
@@ -380,6 +408,91 @@ export default {
     getUnitList().then(res => this.unitList = res.data)
   },
   methods: {
+    // 显示费用详情
+    showFeeDetail(row, type){
+      this.showFeeDetailDialog = true
+      const freight = [], clearance = []
+
+      let freightFields = []
+      let clearanceFields = []
+
+      const brandType = row.warehouseInInfoVO ? row.feeType : row.brandType
+      // 不是特价则显示其他字段
+      if(!row.specialPriceType){
+        freightFields = [
+          // {field: 'oneSeaFreight', label: '成交单价'},
+          {field: 'originalSeaFreight', label: this.$t('默认单价（无牌无液无电）')},
+          // {field: 'brandFreightPrice', label: this.$t('品牌加价')},
+          {field: 'liquidFreightPrice', label: this.$t('液体加价')},
+          {field: 'electrifiedFreightPrice', label: this.$t('带电加价')},
+          {field: 'discountFreightPrice', label: this.$t('优惠活动减免')},
+          {field: 'plainCommission', label: this.$t('明佣')}
+        ]
+
+        // 品牌加价
+        if(row['brandFreightPrice'] && row['brandFreightPrice'] > 0){
+          freightFields.push({field: 'brandFreightPrice', label: brandType == 1 ? this.$t('有品牌加价') : this.$t('中性品牌加价')})
+        }
+
+        // 有减免金额才显示优惠后单价
+        if(row['discountFreightPrice'] && row['discountFreightPrice'] > 0){
+          freightFields.push({field: 'afterDiscountSeaFreight', label: this.$t('优惠后单价')})
+        }
+        freightFields.push({field: 'oneSeaFreight', label: this.$t('成交单价')})
+        freightFields.forEach(item => {
+          if(row[item.field]){
+            freight.push({
+              label: item.label,
+              value: row[item.field],
+              currency: row.seaFreightCurrency,
+              volume: row.seaFreightVolume,
+              remark: row.specialPriceType && item.field == 'oneSeaFreight' ? this.$t('特价') : null
+            })
+          }
+        })
+
+        clearanceFields = [
+          {field: 'originalClearanceFreight', label: this.$t('默认单价（无牌无液无电）')},
+          // {field: 'brandClearanceFeePrice', label: this.$t('品牌加价')},
+          {field: 'liquidClearanceFeePrice', label: this.$t('液体加价')},
+          {field: 'electrifiedClearanceFeePrice', label: this.$t('带电加价')},
+          {field: 'discountClearanceFeePrice', label: this.$t('优惠活动减免')}
+        ]
+        // 品牌加价
+        if(row['brandClearanceFeePrice'] && row['brandClearanceFeePrice'] > 0){
+          freightFields.push({field: 'brandClearanceFeePrice', label: brandType == 1 ? this.$t('有品牌加价') : this.$t('中性品牌加价')})
+        }
+        if(row['discountClearanceFeePrice'] && row['discountClearanceFeePrice'] > 0){
+          clearanceFields.push({field: 'afterDiscountClearanceFreight', label: this.$t('优惠后单价')})
+        }
+        clearanceFields.push({field: 'oneClearanceFreight', label: this.$t('成交单价')})
+        clearanceFields.forEach(item => {
+          if(row[item.field]){
+            clearance.push({
+              label: item.label,
+              value: row[item.field],
+              currency: row.clearanceFreightCurrency,
+              volume: row.clearanceFreightVolume,
+              remark: row.specialPriceType && item.field == 'oneClearanceFreight' ? this.$t('特价') : null
+            })
+          }
+        })
+      }
+
+      freight.push({
+        label: '价格更新时间',
+        value: parseTime(row.updateTime)
+      })
+      clearance.push({
+        label: '价格更新时间',
+        value: parseTime(row.updateTime)
+      })
+      this.feeDetail = {freight, clearance, charging: row.charging}
+
+    },
+    closeFeeDetail(){
+      this.showFeeDetailDialog = null
+    },
     /** 查询列表 */
     getOrder() {
       let that = this
@@ -387,8 +500,23 @@ export default {
       // 执行查询
       getOrder(that.orderId).then(response => {
         that.order = response.data;
+        // this.loadBrand()
       });
     },
+    /* loadBrands(){
+      let brandIds = []
+      this.form.orderItemVOList.forEach(item => {
+        if(item.brand){
+          brandIds.push(item.brand)
+        }
+      })
+      if(!brandIds.length) return
+      Array.form(new Set(brandIds)).forEach(brandId => {
+        getProductBrank(brandId).then(res => {
+          this.brands.push(res.dat)
+        })
+      })
+    }, */
     getChannel(){
       if(!this.order || !this.order.channelId || this.order.transportId == 1 || this.order.transportId == 2) return
       getChannel(this.order.channelId).then(res => {

src/views/ecw/order/index.vue

@@ -131,7 +131,7 @@
           <router-link :to="{path: '/order/detail',query: {orderId: scope.row.orderId}}" class="link-type">
             <span>{{ scope.row.orderNo }}</span>
           </router-link>
-          <div style="display: flex;flex-wrap: wrap;">
+          <div style="display: flex;flex-wrap: wrap;" v-if="scope.row.advanceType">
             <el-button @click="deleteSpecial(item.value,scope.row.orderId)" size="mini" style="margin-left: 20px" type="danger" circle v-for="(item,index) in specialRendering(scope.row.advanceType)" :key="index">{{item.label[0]}}</el-button>
           </div>
         </template>
@@ -272,7 +272,7 @@
               </el-dropdown-menu>
             </el-dropdown>
 
-            <template v-if="scope.row.status != 0 && [204,205,206].indexOf(scope.row.inWarehouseState) < 0">
+            <template v-if="exclude(scope.row.status, [0, 11,12,13,14,15,17,18]) && exclude(scope.row.inWarehouseState, [204,205,206])">
               <!-- <el-divider direction="vertical"></el-divider> -->
               <!--仓库相关的-->
               <el-dropdown>
@@ -292,7 +292,8 @@
                   </template>
                   <!-- 入仓修改 -->
                   <template v-if="
-                      include(scope.row.inWarehouseState, [202, 207, 202, 209, 210, 202, 211, 212, 202, 213, 214, 215, 216, 204, 205])
+                      include(scope.row.inWarehouseState, [202, 207, 202, 209, 210, 202, 211, 212, 202, 213, 214, 215, 216, 204, 205]) &&
+                      scope.row.status != 11 && exclude(scope.row.shipmentState, [314,315,317,318])
                     ">
                     <el-dropdown-item @click.native="$router.push('/order/warehousing-update?id=' + scope.row.orderId)"  v-hasPermi="['ecw:order:update']">{{$t('入仓修改')}}</el-dropdown-item>
                   </template>

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -108,7 +108,7 @@
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.boxGauge1" :prop="!tableData[$index].id && $index + '.boxGauge1'">
                       <span v-if="tableData[$index].id && !edit">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[0] : '' }}</span>
-                      <el-input v-else v-model.number="tableData[$index].boxGauge1" placeholder="" @blur="handleVolume($index)"></el-input>
+                      <el-input v-else type="number" v-model="tableData[$index].boxGauge1" placeholder="" @blur="handleVolume($index)"></el-input>
                     </el-form-item>
                   </template>
                 </el-table-column>
@@ -116,7 +116,7 @@
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.boxGauge2" :prop="!tableData[$index].id && $index + '.boxGauge2'">
                       <span v-if="tableData[$index].id && !edit">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[1] : '' }}</span>
-                      <el-input v-else v-model.number="tableData[$index].boxGauge2" placeholder="" @blur="handleVolume($index)"></el-input>
+                      <el-input v-else type="number" v-model="tableData[$index].boxGauge2" placeholder="" @blur="handleVolume($index)"></el-input>
                     </el-form-item>
                   </template>
                 </el-table-column>
@@ -124,7 +124,7 @@
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.boxGauge3" :prop="!tableData[$index].id && $index + '.boxGauge3'">
                       <span v-if="tableData[$index].id && !edit">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[2] : '' }}</span>
-                      <el-input v-else v-model.number="tableData[$index].boxGauge3" placeholder="" @blur="handleVolume($index)"></el-input>
+                      <el-input v-else type="number" v-model="tableData[$index].boxGauge3" placeholder="" @blur="handleVolume($index)"></el-input>
                     </el-form-item>
                   </template>
                 </el-table-column>

src/views/ecw/productPrice/index.vue

@@ -178,7 +178,13 @@
             </div>
           </template>
       </el-table-column>
-
+      <el-table-column :label="$t('最后修改时间')">
+        <template slot-scope="{row}">
+          <div>
+              {{ row.updateTime|parseTime }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="140">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row, true)"
@@ -216,8 +222,10 @@ import { getChannelList } from '@/api/ecw/channel';
 import DictTag from '@/components/DictTag'
 import {arrryToKeyedObjectBy} from '@/utils/index'
 import { getProduct } from '@/api/ecw/product';
+import {parseTime} from '@/utils/ruoyi'
 export default {
   name: "ProductPrice",
+  filters: {parseTime},
   components: {
     DictTag
   },