Browse Source

Merge branch 'deploy_0804' of jianguan-web/qpls-md-html into master

陈瑞 3 years ago
parent
commit
371901bacf

+ 2 - 2
.env.preview

@@ -1,7 +1,7 @@
 NODE_ENV=production
 VUE_APP_PREVIEW=true
-VUE_APP_API_BASE_URL=http://qpls-md.360arrow.com.cn/qpls-md
-VUE_APP_WX_BASE_URL=//qpls-md.360arrow.com.cn/qpls-md/websocket/
+VUE_APP_API_BASE_URL=http://p.iscm.360arrow.com/qpls-md
+VUE_APP_WX_BASE_URL=//p.iscm.360arrow.com/qpls-md/websocket/
 VUE_APP_VERSION=V1.0.1
 VUE_APP_ENVTIPS=预发布环境
 VUE_APP_PRO_NAME=iSCM智慧供应链系统

+ 1 - 1
src/api/sales.js

@@ -138,7 +138,7 @@ export const salesDetailPrint = params => {
     method: 'get'
   }
   // 喷墨打印
-  if(params.type=='INK'){
+  if (params.type == 'INK') {
     data.responseType = 'blob'
   }
   return axios.request(data)

+ 58 - 18
src/libs/JGPrint.js

@@ -3,14 +3,13 @@ import notification from 'ant-design-vue/es/notification'
 import { getLodop } from '@/libs/LodopFuncs'
 import moment from 'moment'
 // 打印控件
-export const JGPrint = function(data, type, printerType){
+export const JGPrint = function (data, type, printerType) {
   if (!data) {
     return
   }
   // 针式打印
   if (printerType == 'NEEDLE') {
     const LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'))
-    console.log(LODOP)
     if (!LODOP) {
       confirm({
         title: '提示?',
@@ -24,13 +23,17 @@ export const JGPrint = function(data, type, printerType){
       })
       return
     }
+    console.log('+++data', data)
     const rx = /<body[^>]*>([\s\S]+?)<\/body>/i///
     let m = rx.exec(data)
     if (m) m = m[1]
     LODOP.SET_SHOW_MODE('HIDE_PAPER_BOARD', 1) //  隐藏底图上有模拟走纸板的条纹线
-    LODOP.SET_PRINT_PAGESIZE(3, '2140', '60', '') // 这里3表示纵向打印且纸高“按内容的高度”;2140表示纸宽214.0mm;45表示页底空白4.5mm
-    LODOP.ADD_PRINT_HTM("0","0","RightMargin:0.5cm","BottomMargin:0.5cm",m)
+    LODOP.SET_PRINT_PAGESIZE(3, '2100', '60', '') // 这里3表示纵向打印且纸高“按内容的高度”;2140表示纸宽214.0mm;60表示页底空白6.0mm
+    LODOP.ADD_PRINT_HTM('0', '0', 'RightMargin:0.1cm', 'BottomMargin:0.1cm', m)
     // LODOP.ADD_PRINT_TABLE(0, 0, '100%', '100%', m)
+    // LODOP.ADD_PRINT_PDF(0, 0, '100%', '100%', data)
+    // LODOP.SET_PRINT_STYLEA(0, 'PDFScalMode', 1)
+    // LODOP.SET_PRINT_PAGESIZE(3, 0, 0, '')
     if (type == 'preview') {
       LODOP.PREVIEW()
     }
@@ -50,18 +53,55 @@ export const JGPrint = function(data, type, printerType){
   }
 }
 
+export const demoGetBASE64 = function (dataArray) {
+  var digits = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
+  var strData = ''
+  for (var i = 0, ii = dataArray.length; i < ii; i += 3) {
+    if (isNaN(dataArray[i])) break
+    var b1 = dataArray[i] & 0xFF; var b2 = dataArray[i + 1] & 0xFF; var b3 = dataArray[i + 2] & 0xFF
+    var d1 = b1 >> 2; var d2 = ((b1 & 3) << 4) | (b2 >> 4)
+    var d3 = i + 1 < ii ? ((b2 & 0xF) << 2) | (b3 >> 6) : 64
+    var d4 = i + 2 < ii ? (b3 & 0x3F) : 64
+    strData += digits.substring(d1, d1 + 1) + digits.substring(d2, d2 + 1) + digits.substring(d3, d3 + 1) + digits.substring(d4, d4 + 1)
+  }
+  return strData
+}
+// 下载pdf
+export const demoDownloadPDF = function (url) {
+  if (!(/^https?:/i.test(url))) return
+  if (window.XMLHttpRequest) var xhr = new XMLHttpRequest(); else var xhr = new ActiveXObject('MSXML2.XMLHTTP')
+  xhr.open('GET', url, false) // 同步方式
+  if (xhr.overrideMimeType) {
+    try {
+      xhr.responseType = 'arraybuffer'
+      var arrybuffer = true
+    } catch (err) {
+      xhr.overrideMimeType('text/plain; charset=x-user-defined')
+    }
+  }
+  xhr.send(null)
+  var data = xhr.response || xhr.responseBody
+  if (typeof Uint8Array !== 'undefined') {
+    if (arrybuffer) var dataArray = new Uint8Array(data); else {
+      var dataArray = new Uint8Array(data.length)
+      for (var i = 0; i < dataArray.length; i++) { dataArray[i] = data.charCodeAt(i) }
+    }
+  }
+  return demoGetBASE64(dataArray)
+}
+
 // 导出下载excel
-export const downloadExcel = function (data,fileName){
-   if (!data) { return }
-   const url = window.URL.createObjectURL(new Blob([data]))
-   const link = document.createElement('a')
-   link.style.display = 'none'
-   link.href = url
-   const a = moment().format('YYYYMMDDHHmmss')
-   const fname = fileName + a
-   link.setAttribute('download', fname + '.xlsx')
-   document.body.appendChild(link)
-   link.click()
+export const downloadExcel = function (data, fileName) {
+  if (!data) { return }
+  const url = window.URL.createObjectURL(new Blob([data]))
+  const link = document.createElement('a')
+  link.style.display = 'none'
+  link.href = url
+  const a = moment().format('YYYYMMDDHHmmss')
+  const fname = fileName + a
+  link.setAttribute('download', fname + '.xlsx')
+  document.body.appendChild(link)
+  link.click()
 }
 
 /*
@@ -72,9 +112,9 @@ export const downloadExcel = function (data,fileName){
   *fileName: 导出文件名称
   *callback: 回调函数
 */
-export const hdPrint = function (printerType,type,url,params,fileName,callback){
+export const hdPrint = function (printerType, type, url, params, fileName, callback) {
   // 打印时需要传打印机类型
-  if(type !== 'export'){
+  if (type !== 'export') {
     params.type = printerType
   }
   url(params).then(res => {
@@ -97,4 +137,4 @@ export const hdPrint = function (printerType,type,url,params,fileName,callback){
     }
     callback()
   })
-}
+}

+ 1 - 0
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -40,6 +40,7 @@
                   <a-cascader
                     :options="typeData"
                     expand-trigger="hover"
+                    change-on-select
                     :field-names="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
                     placeholder="请选择产品分类"
                     allowClear

+ 27 - 27
src/views/reportData/chainSalesDetailReport/list.vue

@@ -47,33 +47,6 @@
                   </a-select>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="12" :sm="24">
-                <a-row>
-                  <a-form-model-item label="客户所在区" :labelCol="{span: 4}" :wrapperCol="{ span: 20 }">
-                    <a-col span="7">
-                      <a-form-model-item prop="provinceSn" style="margin: 0;">
-                        <a-select v-model="queryParam.provinceSn" @change="getCityList" placeholder="请选择省" allowClear>
-                          <a-select-option v-for="item in addrProvinceList" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
-                    </a-col>
-                    <a-col span="7" offset="1">
-                      <a-form-model-item prop="citySn" style="margin: 0;">
-                        <a-select v-model="queryParam.citySn" @change="getAreaList" placeholder="请选择市" allowClear>
-                          <a-select-option v-for="item in addrCityList" :value="item.areaSn" :key="item.areaSn + 'b'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
-                    </a-col>
-                    <a-col span="7" offset="1">
-                      <a-form-model-item prop="countySn" style="margin: 0;">
-                        <a-select v-model="queryParam.countySn" placeholder="请选择区/县" allowClear>
-                          <a-select-option v-for="item in addrDistrictList" :value="item.areaSn" :key="item.areaSn + 'c'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
-                    </a-col>
-                  </a-form-model-item>
-                </a-row>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="收款方式">
                   <a-select id="chainSalesDetailReportList-settleStyleSn" v-model="queryParam.settleStyleSn" allowClear placeholder="请选择收款方式">
@@ -143,6 +116,33 @@
                   <a-input id="chainSalesDetailReportList-salesManName" v-model.trim="queryParam.salesManName" allowClear placeholder="请输入业务员"/>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="12" :sm="24">
+                <a-row>
+                  <a-form-model-item label="客户所在区" :labelCol="{span: 4}" :wrapperCol="{ span: 20 }">
+                    <a-col span="7">
+                      <a-form-model-item prop="provinceSn" style="margin: 0;">
+                        <a-select v-model="queryParam.provinceSn" @change="getCityList" placeholder="请选择省" allowClear>
+                          <a-select-option v-for="item in addrProvinceList" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
+                        </a-select>
+                      </a-form-model-item>
+                    </a-col>
+                    <a-col span="7" offset="1">
+                      <a-form-model-item prop="citySn" style="margin: 0;">
+                        <a-select v-model="queryParam.citySn" @change="getAreaList" placeholder="请选择市" allowClear>
+                          <a-select-option v-for="item in addrCityList" :value="item.areaSn" :key="item.areaSn + 'b'">{{ item.name }}</a-select-option>
+                        </a-select>
+                      </a-form-model-item>
+                    </a-col>
+                    <a-col span="7" offset="1">
+                      <a-form-model-item prop="countySn" style="margin: 0;">
+                        <a-select v-model="queryParam.countySn" placeholder="请选择区/县" allowClear>
+                          <a-select-option v-for="item in addrDistrictList" :value="item.areaSn" :key="item.areaSn + 'c'">{{ item.name }}</a-select-option>
+                        </a-select>
+                      </a-form-model-item>
+                    </a-col>
+                  </a-form-model-item>
+                </a-row>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainSalesDetailReportList-refresh">查询</a-button>

+ 18 - 18
src/views/reportData/chainSalesReport/list.vue

@@ -47,10 +47,27 @@
                   </a-select>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="收款方式">
+                  <a-select id="chainSalesReportList-settleStyleSn" v-model="queryParam.settleStyleSn" allowClear placeholder="请选择收款方式">
+                    <a-select-option v-for="item in settleStyleList" :value="item.settleStyleSn" :key="item.settleStyleSn">{{ item.name }}</a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="单号">
+                  <a-input id="chainSalesReportList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入单号"/>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="业务员">
+                  <a-input id="chainSalesReportList-salesManName" v-model.trim="queryParam.salesManName" allowClear placeholder="请输入业务员"/>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="12" :sm="24">
                 <a-row>
                   <a-form-model-item label="客户所在区" :labelCol="{span: 4}" :wrapperCol="{ span: 20 }">
-                    <a-col span="7">
+                    <a-col span="8">
                       <a-form-model-item prop="provinceSn" style="margin: 0;">
                         <a-select v-model="queryParam.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
                           <a-select-option v-for="item in addrProvinceList" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
@@ -74,23 +91,6 @@
                   </a-form-model-item>
                 </a-row>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="收款方式">
-                  <a-select id="chainSalesReportList-settleStyleSn" v-model="queryParam.settleStyleSn" allowClear placeholder="请选择收款方式">
-                    <a-select-option v-for="item in settleStyleList" :value="item.settleStyleSn" :key="item.settleStyleSn">{{ item.name }}</a-select-option>
-                  </a-select>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="单号">
-                  <a-input id="chainSalesReportList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入单号"/>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="业务员">
-                  <a-input id="chainSalesReportList-salesManName" v-model.trim="queryParam.salesManName" allowClear placeholder="请输入业务员"/>
-                </a-form-model-item>
-              </a-col>
             </template>
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainSalesReportList-refresh">查询</a-button>

+ 2 - 2
src/views/salesManagement/salesQuery/edit.vue

@@ -463,7 +463,7 @@ export default {
     saveNewProduct (row) {
       this.$message.loading('正在添加产品...', 1)
       this.isInster = true
-      this.spinning = true
+      // this.spinning = true
       salesDetailInsert({
         buyerSn: this.detailData.buyerSn,
         productSn: row.productSn,
@@ -483,7 +483,7 @@ export default {
           this.$message.success('产品添加成功', 2.5)
         }
         this.isInster = false
-        this.spinning = false
+        // this.spinning = false
       })
     },
     //  销售单详情

+ 1 - 1
vue.config.js

@@ -110,7 +110,7 @@ const vueConfig = {
     proxy: {
       '/api': {
         // target: 'http://192.168.16.151:80/qpls-md',
-        target: 'http://qpls-md.360arrow.com.cn/qpls-md', //  Ô¤·¢²¼
+        target: 'http://p.iscm.360arrow.com/qpls-md', //  Ô¤·¢²¼
         // target: 'http://qpls-md.360arrow.com/qpls-md', //  Éú²ú
         // ws: false,
         ws: true,