序列号增加单据点开，会员页面优化

jshERP-web/public/index.html

@@ -255,6 +255,7 @@
     ajax.send(null);
     window.SYS_TITLE = sysTitle;
     document.title = window.SYS_TITLE;
+    var _hmt = _hmt || [];
   </script>
 </head>
 
@@ -270,5 +271,14 @@
     </div>
   </div>
 </div>
+<script>
+  var _hmt = _hmt || [];
+  (function() {
+    var hm = document.createElement("script");
+    hm.src = "https://hm.baidu.com/hm.js?7007d53664243dc0e53bcf92791a712d";
+    var s = document.getElementsByTagName("script")[0];
+    s.parentNode.insertBefore(hm, s);
+  })();
+</script>
 </body>
 </html>

jshERP-web/src/main.js

@@ -67,4 +67,4 @@ new Vue({
     store.commit('SET_MULTI_PAGE',Vue.ls.get(DEFAULT_MULTI_PAGE,config.multipage))
   },
   render: h => h(App)
-}).$mount('#app')
+}).$mount('#app')
\ No newline at end of file

jshERP-web/src/mixins/JeecgListMixin.js

@@ -58,7 +58,7 @@ export const JeecgListMixin = {
   },
   created() {
       if(!this.disableMixinCreated){
-        console.log(' -- mixin created -- ')
+        //console.log(' -- mixin created -- ')
         this.loadData();
         //初始化字典配置 在自己页面定义
         this.initDictConfig();
@@ -90,7 +90,7 @@ export const JeecgListMixin = {
       })
     },
     initDictConfig(){
-      console.log("--这是一个假的方法!")
+      //console.log("--这是一个假的方法!")
     },
     handleSuperQuery(params, matchType) {
       //高级查询方法

jshERP-web/src/permission.js

@@ -46,6 +46,11 @@ router.beforeEach((to, from, next) => {
           })
         })
       } else {
+        if (to.path) {
+          if (window._hmt) {
+            window._hmt.push(['_trackPageview', '/#' + to.fullPath])
+          }
+        }
         next()
       }
     }
@@ -59,7 +64,6 @@ router.beforeEach((to, from, next) => {
     }
   }
 })
-
 router.afterEach(() => {
   NProgress.done() // finish progress bar
 })

jshERP-web/src/views/bill/SaleBackList.vue

@@ -103,6 +103,14 @@
           subType: "销售退货",
           roleType: Vue.ls.get('roleType')
         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 8 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
         // 表头
         columns: [
           {

jshERP-web/src/views/system/CustomerList.vue

@@ -35,7 +35,7 @@
       <a-upload v-if="btnEnableList.indexOf(1)>-1" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-popover title="导入注意点">
           <template slot="content">
-            <p>预收款、期初应收、期初应付、税率均为数值且要大于0；<br/>另外期初应收、期初应付不能同时输入</p>
+            <p>期初应收、期初应付、税率均为数值且要大于0；<br/>另外期初应收、期初应付不能同时输入</p>
           </template>
           <a-button type="primary" icon="import">导入</a-button>
         </a-popover>
@@ -120,7 +120,6 @@
           { title: '联系人', dataIndex: 'contacts',width:70,align:"center"},
           { title: '手机号码', dataIndex: 'telephone',width:100,align:"center"},
           { title: '联系电话', dataIndex: 'phoneNum',width:100,align:"center"},
-          { title: '预付款',dataIndex: 'advanceIn',width:70,align:"center"},
           { title: '期初应收',dataIndex: 'beginNeedGet',width:80,align:"center"},
           { title: '期初应付',dataIndex: 'beginNeedPay',width:80,align:"center"},
           { title: '期末应收',dataIndex: 'allNeedGet',width:80,align:"center"},

jshERP-web/src/views/system/MemberList.vue

@@ -35,7 +35,7 @@
       <a-upload v-if="btnEnableList.indexOf(1)>-1" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-popover title="导入注意点">
           <template slot="content">
-            <p>预收款、期初应收、期初应付、税率均为数值且要大于0；<br/>另外期初应收、期初应付不能同时输入</p>
+            <p>预收款为数值且要大于0</p>
           </template>
           <a-button type="primary" icon="import">导入</a-button>
         </a-popover>
@@ -121,11 +121,6 @@
           { title: '手机号码', dataIndex: 'telephone',width:110,align:"center"},
           { title: '联系电话', dataIndex: 'phoneNum',width:100,align:"center"},
           { title: '预付款',dataIndex: 'advanceIn',width:70,align:"center"},
-          { title: '期初应收',dataIndex: 'beginNeedGet',width:80,align:"center"},
-          { title: '期初应付',dataIndex: 'beginNeedPay',width:80,align:"center"},
-          { title: '期末应收',dataIndex: 'allNeedGet',width:80,align:"center"},
-          { title: '期末应付',dataIndex: 'allNeedPay',width:80,align:"center"},
-          { title: '税率(%)', dataIndex: 'taxRate',width:80,align:"center"},
           { title: '状态',dataIndex: 'enabled',width:70,align:"center",
             scopedSlots: { customRender: 'customRenderFlag' }
           },

jshERP-web/src/views/system/SerialNumberList.vue

@@ -57,6 +57,9 @@
             <a>删除</a>
           </a-popconfirm>
         </span>
+        <span slot="numberCustomRender" slot-scope="text, record">
+          <a @click="myHandleDetail(record)">{{record.depotHeadNumber}}</a>
+        </span>
         <!-- 状态渲染模板 -->
         <template slot="customRenderFlag" slot-scope="isSell">
           <a-tag v-if="isSell==1" color="green">是</a-tag>
@@ -71,13 +74,16 @@
     <!-- 表单区域 -->
     <serial-number-modal ref="modalForm" @ok="modalFormOk"></serial-number-modal>
     <serial-number-batch-modal ref="serialNumberBatchModel" @ok="modalFormOk"></serial-number-batch-modal>
+    <bill-detail ref="modalDetail"></bill-detail>
   </a-card>
 </template>
 <script>
   import SerialNumberModal from './modules/SerialNumberModal'
   import SerialNumberBatchModal from './modules/SerialNumberBatchModal'
+  import BillDetail from '../bill/dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { formatDate } from "@/utils/util"
+  import {findBillDetailByNumber} from '@/api/api'
   import JDate from '@/components/jeecg/JDate'
   export default {
     name: "SerialNumberList",
@@ -85,6 +91,7 @@
     components: {
       SerialNumberModal,
       SerialNumberBatchModal,
+      BillDetail,
       JDate
     },
     data () {
@@ -106,17 +113,19 @@
           {title: '序列号',align: "left", dataIndex: 'serialNumber', width: 180},
           {title: '商品条码', align: "center",dataIndex: 'materialCode', width: 120},
           {title: '商品名称', align: "center",dataIndex: 'materialName', width: 120},
-          {title: '单据编号', align: "center", dataIndex: 'depotHeadNumber', width: 140},
+          {
+            title: '单据编号', align: "center", dataIndex: 'depotHeadNumber', width: 150,
+            scopedSlots: { customRender: 'numberCustomRender' },
+          },
           {title: '已卖出', align: "center", dataIndex: 'isSell', width: 60,
             scopedSlots: { customRender: 'customRenderFlag' }
           },
-          {title: '创建时间',align: "center",  dataIndex: 'createTime', width: 150,
+          {title: '创建时间',align: "center",  dataIndex: 'createTime', width: 180,
             scopedSlots: { customRender: 'customRenderTime' }
           },
-          {title: '更新时间', align: "center", dataIndex: 'updateTime', width: 150,
+          {title: '更新时间', align: "center", dataIndex: 'updateTime', width: 180,
             scopedSlots: { customRender: 'customRenderTime' }
           },
-          {title: '备注',align: "center",  dataIndex: 'remark',width: 140},
           {
             title: '操作',
             dataIndex: 'action',
@@ -151,6 +160,13 @@
         if(this.btnEnableList.indexOf(1)===-1) {
           this.$refs.modalForm.isReadOnly = true
         }
+      },
+      myHandleDetail(record) {
+        findBillDetailByNumber({ number: record.depotHeadNumber }).then((res) => {
+          if (res && res.code === 200) {
+            this.handleDetail(res.data, record.depotHeadType);
+          }
+        })
       }
     }
   }

jshERP-web/src/views/system/VendorList.vue

@@ -35,7 +35,7 @@
       <a-upload v-if="btnEnableList.indexOf(1)>-1" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-popover title="导入注意点">
           <template slot="content">
-            <p>预收款、期初应收、期初应付、税率均为数值且要大于0；<br/>另外期初应收、期初应付不能同时输入</p>
+            <p>期初应收、期初应付、税率均为数值且要大于0；<br/>另外期初应收、期初应付不能同时输入</p>
           </template>
           <a-button type="primary" icon="import">导入</a-button>
         </a-popover>
@@ -120,7 +120,6 @@
           { title: '联系人', dataIndex: 'contacts',width:70,align:"center"},
           { title: '手机号码', dataIndex: 'telephone',width:110,align:"center"},
           { title: '联系电话', dataIndex: 'phoneNum',width:100,align:"center"},
-          { title: '预付款',dataIndex: 'advanceIn',width:70,align:"center"},
           { title: '期初应收',dataIndex: 'beginNeedGet',width:80,align:"center"},
           { title: '期初应付',dataIndex: 'beginNeedPay',width:80,align:"center"},
           { title: '期末应收',dataIndex: 'allNeedGet',width:80,align:"center"},

jshERP-web/src/views/system/modules/MemberModal.vue

@@ -41,56 +41,6 @@
             <a-input placeholder="请输入联系电话" v-decorator.trim="[ 'phoneNum' ]" />
           </a-form-item>
         </a-col>
-        <a-col :span="24/2">
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="传真">
-            <a-input placeholder="请输入传真" v-decorator.trim="[ 'fax' ]" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="24/2">
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期初应收">
-            <a-input placeholder="请输入期初应收" v-decorator.trim="[ 'beginNeedGet' ]" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="24/2">
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期初应付">
-            <a-input placeholder="请输入期初应付" v-decorator.trim="[ 'beginNeedPay' ]" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="24/2">
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期末应收">
-            <a-input v-decorator.trim="[ 'AllNeedGet' ]" :readOnly="true" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="24/2">
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期末应付">
-            <a-input v-decorator.trim="[ 'AllNeedPay' ]" :readOnly="true" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="24/2">
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="纳税人识别号">
-            <a-input placeholder="请输入纳税人识别号" v-decorator.trim="[ 'taxNum' ]" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="24/2">
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="税率(%)">
-            <a-input placeholder="请输入税率(%)" v-decorator.trim="[ 'taxRate' ]" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="24/2">
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开户行">
-            <a-input placeholder="请输入开户行" v-decorator.trim="[ 'bankName' ]" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="24/2">
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="账号">
-            <a-input placeholder="请输入账号" v-decorator.trim="[ 'accountNumber' ]" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="24/2">
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="地址">
-            <a-input placeholder="请输入地址" v-decorator.trim="[ 'address' ]" />
-          </a-form-item>
-        </a-col>
         <a-col :span="24/2">
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
             <a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" />
@@ -144,8 +94,7 @@
         this.visible = true;
         this.$nextTick(() => {
           this.form.setFieldsValue(pick(this.model,'supplier', 'contacts', 'telephone', 'email', 'telephone',
-            'phoneNum', 'fax', 'beginNeedGet', 'beginNeedPay', 'AllNeedGet', 'AllNeedPay', 'taxNum', 'taxRate',
-            'bankName', 'accountNumber', 'address', 'description'))
+            'phoneNum', 'description'))
         });
       },
       close () {