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

src/views/repair/application-form/modules/BaseForm.vue

@@ -101,7 +101,7 @@
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
-              disabled='disabled'
+              disabled="disabled"
               v-decorator="['actualUser', {initialValue: userInfo.realName, rules: [{required: true, message: '报修人不能为空'}]}]"/>
           </a-form-item>
         </row-item>
@@ -174,14 +174,14 @@
             </a-upload>
           </a-form-item>
         </row-item>
-        <row-item v-show='refusedFlag'>
+        <row-item v-show="refusedFlag">
           <a-form-item
             label="驳回原因"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
-              disabled='disabled'
+              disabled="disabled"
               v-decorator="['remark']"/>
           </a-form-item>
         </row-item>
@@ -408,6 +408,10 @@ export default {
         if (this.BaseTool.String.isBlank(values.id)) {
           addRepairApplicationForm(values)
             .then(() => {
+              this.$notification.success({
+                message: '报修成功！',
+                duration: 3
+              })
               this.handleCancel(values)
             }).catch(() => {
               this.confirmLoading = false

src/views/workplace/backlog/NewWorkplaceBacklog.vue

@@ -199,7 +199,7 @@
 <script>
 import { STable } from '@/components'
 import Detail from '@/views/operate/article/modules/Detail.vue'
-import RepairForm from './modules/RepairBaseForm'
+import RepairForm from '@/views/repair/application-form/modules/BaseForm.vue'
 import SpareBackForm from '@/views/store/sparebackform/modules/BaseForm'
 import SparePickForm from '@/views/store/sparepickform/modules/BaseForm'
 import { getArticlePage, fetchArticle } from '@/api/operate/article'
@@ -525,6 +525,13 @@ justify-content: space-around;
 .demo-infinite-container {
   overflow: auto;
   height: 400px;
+}
+ /deep/ .ant-table-placeholder{
+  height:360px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
 }
 ::-webkit-scrollbar { width: 0; height: 0; color: transparent; }
 </style>

src/views/workplace/backlog/SbInfoWorkplaceBacklog.vue

@@ -565,6 +565,13 @@ justify-content: space-around;
 .demo-infinite-container {
   overflow: auto;
   height: 400px;
+}
+ /deep/ .ant-table-placeholder{
+  height:360px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
 }
 ::-webkit-scrollbar { width: 0; height: 0; color: transparent; }
 </style>

src/views/workplace/backlog/StoreWorkplaceBacklog.vue

@@ -583,6 +583,13 @@ justify-content: space-around;
 .demo-infinite-container {
   overflow: auto;
   height: 400px;
+}
+ /deep/ .ant-table-placeholder{
+  height:360px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
 }
 ::-webkit-scrollbar { width: 0; height: 0; color: transparent; }
 </style>