Pārlūkot izejas kodu

【生成进度表】抽屉大小微调

liangyan0105 3 gadi atpakaļ
vecāks
revīzija
28709d99c8

+ 16 - 12
src/views/reportForms/pro-progress-report.vue

@@ -93,19 +93,19 @@
         :scroll="{ x: 1500 }"
         @change="handleTableChange"
       >
-        <!--字符串超长截取省略号显示 订单备注 -->
-        <span slot="**" slot-scope="text">
-          <j-ellipsis :value="text" :length="25" />
-        </span>
-
         <!-- 销售订单号  链接-->
         <span slot="salesOrderNo" slot-scope="text">
           <a>{{ text }}</a>
         </span>
+
+        <!-- 图片 -->
+        <span slot="imageslot" slot-scope="text, record">
+          <img style="width:50px;heigth:50px" :src="record.image" />
+        </span>
       </a-table>
     </div>
 
-    <!-- 订单数据明细 抽屉 -->
+    <!-- 单个订单报表 抽屉 -->
     <singleOrderReport-drawer ref="singleOrderReportDrawer" :father="aa" @ok="modalFormOk"></singleOrderReport-drawer>
   </a-card>
 </template>
@@ -181,7 +181,14 @@ export default {
         { title: '实际发票成本', width: 120, dataIndex: 'actualInvoiceCost', className: 'replacecolor' },
         { title: '已出库数量', width: 120, dataIndex: 'quantityDelivered', className: 'replacecolor' },
         { title: '累计开票数量', width: 120, dataIndex: 'invoicesCumulativeNum', className: 'replacecolor' },
-        { title: '图片', width: 120, dataIndex: 'image', fixed: 'right', className: 'replacecolor' },
+        {
+          title: '图片',
+          width: 120,
+          dataIndex: 'image',
+          scopedSlots: { customRender: 'imageslot' },
+          fixed: 'right',
+          className: 'replacecolor'
+        },
         { title: '附件', width: 120, dataIndex: 'accessory', fixed: 'right', className: 'replacecolor' }
       ],
       proProgressData: [
@@ -240,10 +247,7 @@ export default {
     // 渲染订单销售列表
   },
   methods: {
-    // 同步
-    // synchronization() {},
-
-    // 查询按钮
+    // 查询
     searchQuery() {
       // 渲染订单销售列表
     },
@@ -265,7 +269,7 @@ export default {
       }
     },
 
-    // father 抽屉方法
+    // father
     aa() {}
 
     // 分页、排序、筛选变化时触发

+ 3 - 2
src/views/reportForms/pro-progress-report/outInDetailDataDrawer.vue

@@ -1,12 +1,13 @@
 <template>
-  <!-- 出入库详细数据 -->
+  <!--点击【物料编号】 出入库详细数据 -->
   <a-drawer
     title="出入库详细数据"
-    width="70%"
+    width="67%"
     placement="right"
     :closable="true"
     :visible="visible"
     @close="onClose">
+
     <!-- 查询  -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">

+ 8 - 7
src/views/reportForms/pro-progress-report/singleOrderReportDrawer.vue

@@ -1,14 +1,15 @@
 <template>
-  <!-- 单个订单报表 -->
+  <!-- 详情-----点击【销售订单号】后 -->
   <a-card :bordered="false">
     <a-drawer
-      title="单个订单报表"
+      title="详情"
       width="89%"
       placement="right"
       :closable="true"
       :visible="visible"
       @close="onClose">
-      <!--主表信息  -->
+
+      <!--展示 主表  -->
       <div class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="24">
@@ -120,7 +121,7 @@
         </a-form>
       </div>
 
-      <!-- 子表 采购 -->
+      <!-- 展示 子表 采购 -->
       <div style="marginTop:30px;">
         <h6 class="table-title">采购</h6>
         <a-table
@@ -139,7 +140,7 @@
         </a-table>
       </div>
 
-      <!-- 子表 委外 -->
+      <!-- 委外 -->
       <div style="margin:60px 0;">
         <h6 class="table-title">委外</h6>
         <a-table
@@ -158,7 +159,7 @@
         </a-table>
       </div>
 
-      <!-- 子表 物料卡开始 -->
+      <!-- 物料卡开始 -->
       <div>
         <h6 class="table-title">物料卡</h6>
         <!-- 查询区域 -->
@@ -215,7 +216,7 @@
       <!-- 物料卡结束 -->
     </a-drawer>
 
-    <!-- 出入库详细数据 抽屉 -->
+    <!-- 点击【物料编号】----出入库详细数据 抽屉 -->
     <outInDetailData-drawer ref="outInDetailDataDrawer" :father="aa" @ok="modalFormOk"></outInDetailData-drawer>
   </a-card>
 </template>

+ 81 - 77
src/views/system/UserList.vue

@@ -23,7 +23,6 @@
             </a-form-item>
           </a-col>
 
-
           <template v-if="toggleSearchStatus">
             <a-col :md="6" :sm="8">
               <a-form-item label="真实名字">
@@ -66,8 +65,14 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator" style="border-top: 5px">
       <a-button @click="handleAdd" type="primary" icon="plus" >添加用户</a-button>
-      <a-button type="primary" icon="download"  @click="handleExportXls('用户信息')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+      <a-button type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button>
+      <a-upload
+        name="file"
+        :showUploadList="false"
+        :multiple="false"
+        :headers="tokenHeader"
+        :action="importExcelUrl"
+        @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <j-third-app-button biz-type="user" :selected-row-keys="selectedRowKeys" syncToApp syncToLocal @sync-finally="onSyncFinally"/>
@@ -164,7 +169,6 @@
           </a-dropdown>
         </span>
 
-
       </a-table>
     </div>
     <!-- table区域-end -->
@@ -184,17 +188,17 @@
 <script>
   import UserModal from './modules/UserModal'
   import PasswordModal from './modules/PasswordModal'
-  import {putAction,getFileAccessHttpUrl} from '@/api/manage';
-  import {frozenBatch} from '@/api/api'
-  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-  import SysUserAgentModal from "./modules/SysUserAgentModal";
+  import { putAction, getFileAccessHttpUrl } from '@/api/manage'
+  import { frozenBatch } from '@/api/api'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import SysUserAgentModal from './modules/SysUserAgentModal'
   import JInput from '@/components/jeecg/JInput'
   import UserRecycleBinModal from './modules/UserRecycleBinModal'
   import JSuperQuery from '@/components/jeecg/JSuperQuery'
   import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
 
   export default {
-    name: "UserList",
+    name: 'UserList',
     mixins: [JeecgListMixin],
     components: {
       JThirdAppButton,
@@ -211,7 +215,7 @@
         queryParam: {},
         recycleBinVisible: false,
         columns: [
-          /*{
+          /* {
             title: '#',
             dataIndex: '',
             key:'rowIndex',
@@ -220,92 +224,92 @@
             customRender:function (t,r,index) {
               return parseInt(index)+1;
             }
-          },*/
+          }, */
           {
             title: '用户账号',
-            align: "center",
+            align: 'center',
             dataIndex: 'username',
             width: 120,
             sorter: true
           },
           {
             title: '用户姓名',
-            align: "center",
+            align: 'center',
             width: 100,
-            dataIndex: 'realname',
+            dataIndex: 'realname'
           },
           {
             title: '头像',
-            align: "center",
+            align: 'center',
             width: 120,
             dataIndex: 'avatar',
-            scopedSlots: {customRender: "avatarslot"}
+            scopedSlots: { customRender: 'avatarslot' }
           },
 
           {
             title: '性别',
-            align: "center",
+            align: 'center',
             width: 80,
             dataIndex: 'sex_dictText',
             sorter: true
           },
           {
             title: '生日',
-            align: "center",
+            align: 'center',
             width: 100,
             dataIndex: 'birthday'
           },
           {
             title: '手机号码',
-            align: "center",
+            align: 'center',
             width: 100,
             dataIndex: 'phone'
           },
           {
             title: '部门',
-            align: "center",
+            align: 'center',
             width: 180,
             dataIndex: 'orgCodeTxt'
           },
           {
             title: '负责部门',
-            align: "center",
+            align: 'center',
             width: 180,
             dataIndex: 'departIds_dictText'
           },
           {
             title: '状态',
-            align: "center",
+            align: 'center',
             width: 80,
             dataIndex: 'status_dictText'
           },
           {
             title: '操作',
             dataIndex: 'action',
-            scopedSlots: {customRender: 'action'},
-            align: "center",
+            scopedSlots: { customRender: 'action' },
+            align: 'center',
             width: 170
           }
 
         ],
         superQueryFieldList: [
-          { type: 'input', value: 'username', text: '用户账号', },
-          { type: 'input', value: 'realname', text: '用户姓名', },
-          { type: 'select', value: 'sex', dbType: 'int', text: '性别', dictCode: 'sex' },
+          { type: 'input', value: 'username', text: '用户账号' },
+          { type: 'input', value: 'realname', text: '用户姓名' },
+          { type: 'select', value: 'sex', dbType: 'int', text: '性别', dictCode: 'sex' }
         ],
         url: {
-          syncUser: "/act/process/extActProcess/doSyncUser",
-          list: "/sys/user/list",
-          delete: "/sys/user/delete",
-          deleteBatch: "/sys/user/deleteBatch",
-          exportXlsUrl: "/sys/user/exportXls",
-          importExcelUrl: "sys/user/importExcel",
-        },
+          syncUser: '/act/process/extActProcess/doSyncUser',
+          list: '/sys/user/list',
+          delete: '/sys/user/delete',
+          deleteBatch: '/sys/user/deleteBatch',
+          exportXlsUrl: '/sys/user/exportXls',
+          importExcelUrl: 'sys/user/importExcel'
+        }
       }
     },
     computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      importExcelUrl: function() {
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
       }
     },
     methods: {
@@ -315,86 +319,86 @@
 
       batchFrozen: function (status) {
         if (this.selectedRowKeys.length <= 0) {
-          this.$message.warning('请选择一条记录!');
-          return false;
+          this.$message.warning('请选择一条记录!')
+          return false
         } else {
-          let ids = "";
-          let that = this;
-          let isAdmin = false;
+          let ids = ''
+          let that = this
+          let isAdmin = false
           that.selectionRows.forEach(function (row) {
             if (row.username == 'admin') {
-              isAdmin = true;
+              isAdmin = true
             }
-          });
+          })
           if (isAdmin) {
-            that.$message.warning('管理员账号不允许此操作,请重新选择!');
-            return;
+            that.$message.warning('管理员账号不允许此操作,请重新选择!')
+            return
           }
           that.selectedRowKeys.forEach(function (val) {
-            ids += val + ",";
-          });
+            ids += val + ','
+          })
           that.$confirm({
-            title: "确认操作",
-            content: "是否" + (status == 1 ? "解冻" : "冻结") + "选中账号?",
+            title: '确认操作',
+            content: '是否' + (status == 1 ? '解冻' : '冻结') + '选中账号?',
             onOk: function () {
-              frozenBatch({ids: ids, status: status}).then((res) => {
+              frozenBatch({ ids: ids, status: status }).then((res) => {
                 if (res.success) {
-                  that.$message.success(res.message);
-                  that.loadData();
-                  that.onClearSelected();
+                  that.$message.success(res.message)
+                  that.loadData()
+                  that.onClearSelected()
                 } else {
-                  that.$message.warning(res.message);
+                  that.$message.warning(res.message)
                 }
-              });
+              })
             }
-          });
+          })
         }
       },
       handleMenuClick(e) {
         if (e.key == 1) {
-          this.batchDel();
+          this.batchDel()
         } else if (e.key == 2) {
-          this.batchFrozen(2);
+          this.batchFrozen(2)
         } else if (e.key == 3) {
-          this.batchFrozen(1);
+          this.batchFrozen(1)
         }
       },
       handleFrozen: function (id, status, username) {
-        let that = this;
-        //TODO 后台校验管理员角色
-        if ('admin' == username) {
-          that.$message.warning('管理员账号不允许此操作!');
-          return;
+        let that = this
+        // TODO 后台校验管理员角色
+        if (username == 'admin') {
+          that.$message.warning('管理员账号不允许此操作!')
+          return
         }
-        frozenBatch({ids: id, status: status}).then((res) => {
+        frozenBatch({ ids: id, status: status }).then((res) => {
           if (res.success) {
-            that.$message.success(res.message);
-            that.loadData();
+            that.$message.success(res.message)
+            that.loadData()
           } else {
-            that.$message.warning(res.message);
+            that.$message.warning(res.message)
           }
-        });
+        })
       },
       handleChangePassword(username) {
-        this.$refs.passwordmodal.show(username);
+        this.$refs.passwordmodal.show(username)
       },
-      handleAgentSettings(username){
-        this.$refs.sysUserAgentModal.agentSettings(username);
-        this.$refs.sysUserAgentModal.title = "用户代理人设置";
+      handleAgentSettings(username) {
+        this.$refs.sysUserAgentModal.agentSettings(username)
+        this.$refs.sysUserAgentModal.title = '用户代理人设置'
       },
       passwordModalOk() {
-        //TODO 密码修改完成 不需要刷新页面,可以把datasource中的数据更新一下
+        // TODO 密码修改完成 不需要刷新页面,可以把datasource中的数据更新一下
       },
-      onSyncFinally({isToLocal}) {
+      onSyncFinally({ isToLocal }) {
         // 同步到本地时刷新下数据
         if (isToLocal) {
           this.loadData()
         }
-      },
+      }
     }
 
   }
 </script>
 <style scoped>
   @import '~@assets/less/common.less'
-</style>
+</style>