3254194295 2 жил өмнө
parent
commit
cb2cee8b1f

+ 68 - 72
public/ueditor/dialogs/internal.js

@@ -1,81 +1,77 @@
 (function () {
-    var parent = window.parent;
-    //dialog对象
-    dialog = parent.$EDITORUI[window.frameElement.id.replace( /_iframe$/, '' )];
-    //当前打开dialog的编辑器实例
-    editor = dialog.editor;
+  var parent = window.parent
+  // dialog对象
+  dialog = parent.$EDITORUI[window.frameElement.id.replace(/_iframe$/, '')]
+  // 当前打开dialog的编辑器实例
+  editor = dialog.editor
 
-    UE = parent.UE;
+  UE = parent.UE
 
-    domUtils = UE.dom.domUtils;
+  domUtils = UE.dom.domUtils
 
-    utils = UE.utils;
+  utils = UE.utils
 
-    browser = UE.browser;
+  browser = UE.browser
 
-    ajax = UE.ajax;
+  ajax = UE.ajax
 
-    $G = function ( id ) {
-        return document.getElementById( id )
-    };
-    //focus元素
-    $focus = function ( node ) {
-        setTimeout( function () {
-            if ( browser.ie ) {
-                var r = node.createTextRange();
-                r.collapse( false );
-                r.select();
-            } else {
-                node.focus()
+  $G = function (id) {
+    return document.getElementById(id)
+  }
+  // focus元素
+  $focus = function (node) {
+    setTimeout(function () {
+      if (browser.ie) {
+        var r = node.createTextRange()
+        r.collapse(false)
+        r.select()
+      } else {
+        node.focus()
+      }
+    }, 0)
+  }
+  utils.loadFile(document, {
+    href: '../../themes/default/dialogbase.css?cache=' + Math.random(),
+    tag: 'link',
+    type: 'text/css',
+    rel: 'stylesheet'
+  })
+  lang = editor.getLang(dialog.className.split('-')[2])
+  if (lang) {
+    domUtils.on(window, 'load', function () {
+      var langImgPath = editor.options.langPath + editor.options.lang + '/images/'
+      // 针对静态资源
+      for (var i in lang['static']) {
+        var dom = $G(i)
+        if (!dom) continue
+        var tagName = dom.tagName
+        var content = lang['static'][i]
+        if (content.src) {
+          // clone
+          content = utils.extend({}, content, false)
+          content.src = langImgPath + content.src
+        }
+        if (content.style) {
+          content = utils.extend({}, content, false)
+          content.style = content.style.replace(/url\s*\(/g, 'url(' + langImgPath)
+        }
+        switch (tagName.toLowerCase()) {
+          case 'var':
+            dom.parentNode.replaceChild(document.createTextNode(content), dom)
+            break
+          case 'select':
+            var ops = dom.options
+            for (var j = 0, oj; oj = ops[j];) {
+              oj.innerHTML = content.options[j++]
             }
-        }, 0 )
-    };
-    utils.loadFile(document,{
-        href: "../../themes/default/dialogbase.css?cache="+Math.random(),
-        tag:"link",
-        type:"text/css",
-        rel:"stylesheet"
-    });
-    lang = editor.getLang(dialog.className.split( "-" )[2]);
-    if(lang){
-        domUtils.on(window,'load',function () {
-
-            var langImgPath = editor.options.langPath + editor.options.lang + "/images/";
-            //针对静态资源
-            for ( var i in lang["static"] ) {
-                var dom = $G( i );
-                if(!dom) continue;
-                var tagName = dom.tagName,
-                    content = lang["static"][i];
-                if(content.src){
-                    //clone
-                    content = utils.extend({},content,false);
-                    content.src = langImgPath + content.src;
-                }
-                if(content.style){
-                    content = utils.extend({},content,false);
-                    content.style = content.style.replace(/url\s*\(/g,"url(" + langImgPath)
-                }
-                switch ( tagName.toLowerCase() ) {
-                    case "var":
-                        dom.parentNode.replaceChild( document.createTextNode( content ), dom );
-                        break;
-                    case "select":
-                        var ops = dom.options;
-                        for ( var j = 0, oj; oj = ops[j]; ) {
-                            oj.innerHTML = content.options[j++];
-                        }
-                        for ( var p in content ) {
-                            p != "options" && dom.setAttribute( p, content[p] );
-                        }
-                        break;
-                    default :
-                        domUtils.setAttributes( dom, content);
-                }
+            for (var p in content) {
+              p != 'options' && dom.setAttribute(p, content[p])
             }
-        } );
-    }
-
-
-})();
-
+            break
+          default :
+            domUtils.setAttributes(dom, content)
+        }
+      }
+    })
+  }
+})()

+ 68 - 72
src/assets/static/ueditor/dialogs/internal.js

@@ -1,81 +1,77 @@
 (function () {
-    var parent = window.parent;
-    //dialog对象
-    dialog = parent.$EDITORUI[window.frameElement.id.replace( /_iframe$/, '' )];
-    //当前打开dialog的编辑器实例
-    editor = dialog.editor;
+  var parent = window.parent
+  // dialog对象
+  dialog = parent.$EDITORUI[window.frameElement.id.replace(/_iframe$/, '')]
+  // 当前打开dialog的编辑器实例
+  editor = dialog.editor
 
-    UE = parent.UE;
+  UE = parent.UE
 
-    domUtils = UE.dom.domUtils;
+  domUtils = UE.dom.domUtils
 
-    utils = UE.utils;
+  utils = UE.utils
 
-    browser = UE.browser;
+  browser = UE.browser
 
-    ajax = UE.ajax;
+  ajax = UE.ajax
 
-    $G = function ( id ) {
-        return document.getElementById( id )
-    };
-    //focus元素
-    $focus = function ( node ) {
-        setTimeout( function () {
-            if ( browser.ie ) {
-                var r = node.createTextRange();
-                r.collapse( false );
-                r.select();
-            } else {
-                node.focus()
+  $G = function (id) {
+    return document.getElementById(id)
+  }
+  // focus元素
+  $focus = function (node) {
+    setTimeout(function () {
+      if (browser.ie) {
+        var r = node.createTextRange()
+        r.collapse(false)
+        r.select()
+      } else {
+        node.focus()
+      }
+    }, 0)
+  }
+  utils.loadFile(document, {
+    href: '../../themes/default/dialogbase.css?cache=' + Math.random(),
+    tag: 'link',
+    type: 'text/css',
+    rel: 'stylesheet'
+  })
+  lang = editor.getLang(dialog.className.split('-')[2])
+  if (lang) {
+    domUtils.on(window, 'load', function () {
+      var langImgPath = editor.options.langPath + editor.options.lang + '/images/'
+      // 针对静态资源
+      for (var i in lang['static']) {
+        var dom = $G(i)
+        if (!dom) continue
+        var tagName = dom.tagName
+        var content = lang['static'][i]
+        if (content.src) {
+          // clone
+          content = utils.extend({}, content, false)
+          content.src = langImgPath + content.src
+        }
+        if (content.style) {
+          content = utils.extend({}, content, false)
+          content.style = content.style.replace(/url\s*\(/g, 'url(' + langImgPath)
+        }
+        switch (tagName.toLowerCase()) {
+          case 'var':
+            dom.parentNode.replaceChild(document.createTextNode(content), dom)
+            break
+          case 'select':
+            var ops = dom.options
+            for (var j = 0, oj; oj = ops[j];) {
+              oj.innerHTML = content.options[j++]
             }
-        }, 0 )
-    };
-    utils.loadFile(document,{
-        href: "../../themes/default/dialogbase.css?cache="+Math.random(),
-        tag:"link",
-        type:"text/css",
-        rel:"stylesheet"
-    });
-    lang = editor.getLang(dialog.className.split( "-" )[2]);
-    if(lang){
-        domUtils.on(window,'load',function () {
-
-            var langImgPath = editor.options.langPath + editor.options.lang + "/images/";
-            //针对静态资源
-            for ( var i in lang["static"] ) {
-                var dom = $G( i );
-                if(!dom) continue;
-                var tagName = dom.tagName,
-                    content = lang["static"][i];
-                if(content.src){
-                    //clone
-                    content = utils.extend({},content,false);
-                    content.src = langImgPath + content.src;
-                }
-                if(content.style){
-                    content = utils.extend({},content,false);
-                    content.style = content.style.replace(/url\s*\(/g,"url(" + langImgPath)
-                }
-                switch ( tagName.toLowerCase() ) {
-                    case "var":
-                        dom.parentNode.replaceChild( document.createTextNode( content ), dom );
-                        break;
-                    case "select":
-                        var ops = dom.options;
-                        for ( var j = 0, oj; oj = ops[j]; ) {
-                            oj.innerHTML = content.options[j++];
-                        }
-                        for ( var p in content ) {
-                            p != "options" && dom.setAttribute( p, content[p] );
-                        }
-                        break;
-                    default :
-                        domUtils.setAttributes( dom, content);
-                }
+            for (var p in content) {
+              p != 'options' && dom.setAttribute(p, content[p])
             }
-        } );
-    }
-
-
-})();
-
+            break
+          default :
+            domUtils.setAttributes(dom, content)
+        }
+      }
+    })
+  }
+})()

+ 2 - 0
src/views/repair/application-form/RepairForm.vue

@@ -311,6 +311,8 @@ export default {
         }
         return getRepairApplicationFormPage(Object.assign(parameter, this.queryParam))
           .then(res => {
+            console.log(res.data.model)
+            console.log(res.data)
             return res.data
           })
       },

+ 7 - 6
src/views/repair/application-form/modules/DetailRepair.vue

@@ -31,9 +31,9 @@
             <detail-list-item term="预留维修时间">{{ model.limitHours }}</detail-list-item>
             <detail-list-item term="使用位置">{{ model.sbCph }}</detail-list-item>
             <detail-list-item term="工单类别">{{ BaseTool.Object.getField(planFlagMap,model.category) }}</detail-list-item>
-<!--            <detail-list-item term="是否停机">{{ BaseTool.Object.getField(needStopMap,model.needStop) }}</detail-list-item>-->
+            <!--            <detail-list-item term="是否停机">{{ BaseTool.Object.getField(needStopMap,model.needStop) }}</detail-list-item>-->
             <detail-list-item term="报修人">{{ model.actualUser }}</detail-list-item>
-<!--            <detail-list-item term="报修来源">{{ BaseTool.Object.getField(this.sourceMap, model.source) }}</detail-list-item>
+            <!--            <detail-list-item term="报修来源">{{ BaseTool.Object.getField(this.sourceMap, model.source) }}</detail-list-item>
             <detail-list-item term="紧急等级"><badge :text="BaseTool.Object.getField(levelMap,model.level)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_LEVEL[model.applicationLevel]"/></detail-list-item>-->
             <detail-list-item term="报修时间">{{ model.applyTime }}</detail-list-item>
             <detail-list-item term="报修状态"><badge :text="BaseTool.Object.getField(statusMap,model.status)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_STATUS[model.status]"/></detail-list-item>
@@ -57,7 +57,7 @@
           </detail-list>
           <a-divider orientation="left">维修详情</a-divider>
           <detail-list title="" :col="3">
-<!--            <detail-list-item term="故障类别">{{ model.repairErrorTypeName }}</detail-list-item>-->
+            <!--            <detail-list-item term="故障类别">{{ model.repairErrorTypeName }}</detail-list-item>-->
             <detail-list-item term="维修开始时间">{{ model.repairStartTime }}</detail-list-item>
             <detail-list-item term="维修结束时间">{{ model.repairEndTime }}</detail-list-item>
             <detail-list-item term="维修耗时">{{ model.repairMinutes }}小时</detail-list-item>
@@ -177,7 +177,7 @@
                 <a @click="handleViewReason(record)">查看</a>
                 <operation-button
                   @click="handleEditReason(record)" >修改</operation-button>
-<!--                <operation-button
+                <!--                <operation-button
                   v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)"
                   @click="handleCopyReason(record)" >复制</operation-button>-->
                 <operation-button
@@ -510,6 +510,7 @@ export default {
       this.showSbFlag = false
       this.modalTitle = '详情'
       this.model = record
+      console.log(record)
       this.activeKey = 'a'
       this.dispatchList = JSON.parse(record.repairDispatchList)
       const sbId = record.sbId
@@ -764,7 +765,7 @@ export default {
       modal.base(record)
     },
     handleSpareStoreSelect (isSpecial) {
-      this.$refs.spareStoreSelectModal.base({}, { storeId: this.storeId, isSpecial })
+      this.$refs.spareStoreSelectModal.base({}, { storeId: this.storeId, isSpecial: isSpecial, sbId: this.model.sbId })
     },
     handleSpareStoreSelected (record, keys, rows) {
       const data = []
@@ -812,4 +813,4 @@ export default {
   margin: 5px;
   display: inline-block;
 }
-</style>
+</style>

+ 4 - 4
src/views/sb/modelbom/modules/Detail.vue

@@ -21,7 +21,7 @@
     </detail-list>
     <title-divider title="BOM信息" width="90px"></title-divider>
     <div class="table-operator" style="margin-bottom: 8px;">
-      <a-button type="primary" @click="handleAdd">
+      <a-button type="primary" @click="handleAdd()">
         <a-icon type="plus"/>
         单条添加
       </a-button>
@@ -86,7 +86,8 @@ export default {
         'nameModel': null,
         'unit': null,
         'level': null,
-        'useType': null
+        'useType': null,
+        'sbId': null
       },
       modalTitle: null,
       visible: false,
@@ -186,7 +187,6 @@ export default {
       }
       addSbModelBomBatch(addData)
         .then((response) => {
-          this.$message.info('批量添加成功')
           this.handleOk()
         }).catch(() => {
           this.confirmLoading = false
@@ -194,7 +194,7 @@ export default {
     },
     handleAdd () {
       const modal = this.$refs.baseModal
-      modal.base({ modelId: this.model.id })
+      modal.base({ id: this.model.id })
     },
     handleEdit (record) {
       const modal = this.$refs.baseModal

+ 11 - 11
src/views/sqarepartmanage/sparetype/SpareType.vue

@@ -144,23 +144,23 @@ export default {
             return record.modelTypeName
           }
         },
-        //{
+        // {
         //  title: '排序',
         //  dataIndex: 'sort'
-        //},
-        //{
-         // title: '备注',
-         // dataIndex: 'remark'
-       // },
+        // },
+        // {
+        // title: '备注',
+        // dataIndex: 'remark'
+        // },
         {
           title: '创建日期',
           dataIndex: 'createdTime'
         },
-        //{
-         // title: '是否删除',
-         // dataIndex: 'delFlag',
-         // scopedSlots: { customRender: 'delFlag' }
-        //},
+        // {
+        // title: '是否删除',
+        // dataIndex: 'delFlag',
+        // scopedSlots: { customRender: 'delFlag' }
+        // },
         {
           title: '操作',
           key: 'action',

+ 1 - 1
src/views/store/store/modules/StoreSelectModal.vue

@@ -263,7 +263,7 @@ export default {
       this.queryParam = queryParam
       this.extraQueryParam = extraQueryParam
       this.record = record
-
+      console.log(this.record)
       if (this.isCreated) {
         this.$refs.table.clearSelected()
         console.log(this.options.rowSelection, 9999)

+ 1 - 0
src/views/workplace/backlog/StoreWorkplaceBacklog.vue

@@ -371,6 +371,7 @@ export default {
       this.typeDetailDict = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.WORKPLACE_BACKLOG_DETAIL_TYPE)
       getWorkplaceBacklogTopData(this.role).then(res => {
         this.topData = res.data
+        console.log(this.topData)
       })
     },
     getInfo () {