Procházet zdrojové kódy

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

李磊 před 3 roky
rodič
revize
74925715ef

+ 3 - 2
src/libs/LodopFuncs.js

@@ -72,7 +72,7 @@ function getLodop (oOBJECT, oEMBED) {
   var strCLodopInstall_2 = "<br>(若此前已安装过,可<a href='CLodop.protocol:setup' target='_self'>点这里直接再次启动</a>)"
   var strCLodopInstall_3 = ',成功后请刷新本页面。</font>'
   var strCLodopUpdate = "<br><font color='#FF00FF'>Web打印服务CLodop需升级!点击这里<a href='http://www.lodop.net/demolist/CLodop_Setup_for_Win32NT.zip' target='_self'>执行升级</a>,升级后请刷新页面。</font>"
-  var msgHtml=''
+  var msgHtml = ''
   var LODOP
   try {
     var ua = navigator.userAgent
@@ -122,8 +122,9 @@ function getLodop (oOBJECT, oEMBED) {
       if (!needCLodop()) { msgHtml = (is64IE ? strHtm64_Update : strHtmUpdate) }
     }
     //= ==如下空白位置适合调用统一功能(如注册语句、语言选择等):==
-    LODOP.SET_LICENSES("","E89B8C436467D381F32C0B7F5674838FA59","","")
+    LODOP.SET_LICENSES('', 'E89B8C436467D381F32C0B7F5674838FA59', '', '')
     //= ==============================================.com//.com台级//.net
+    // alert('SET_LICENSES执行了')
     console.log(msgHtml)
     return LODOP
   } catch (err) {

+ 1 - 1
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -9,7 +9,7 @@
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="$hasPermissions('B_storeCallOutPrint')">
-          <Print :disabled="localDataSource.length==0" :showExport="false" @handlePrint="handlePrint"></Print>
+          <Print :disabled="chooseLoadDataSource.length==0" :showExport="false" @handlePrint="handlePrint"></Print>
         </template>
       </a-page-header>
       <!-- 选择产品 -->

+ 9 - 1
src/views/salesManagement/salesQuery/edit.vue

@@ -165,7 +165,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import queryPart from './queryPart.vue'
 import chooseCustomModal from './chooseCustomModal.vue'
@@ -377,6 +376,10 @@ export default {
           salesDetailDelAll({ salesBillSn: _this.detailData.salesBillSn }).then(res => {
             if (res.status == 200) {
               _this.resetSearchForm(true)
+              _this.productForm = {
+                productName: '',
+                productCode: ''
+              }
             }
             _this.$message.info(res.message)
             _this.delLoading = false
@@ -423,6 +426,11 @@ export default {
           }
           this.$refs.table.refresh(true)
           return
+        } else {
+          this.productForm = {
+            productName: '',
+            productCode: ''
+          }
         }
       }
       // 库存不足时

+ 2 - 2
vue.config.js

@@ -109,8 +109,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.16.151:80/qpls-md',
-        // target: 'http://qpls-md.360arrow.com.cn/qpls-md', //  Ô¤·¢²¼
+        // target: 'http://192.168.16.151:80/qpls-md',
+        target: 'http://qpls-md.360arrow.com.cn/qpls-md', //  Ô¤·¢²¼
         // target: 'http://qpls-md.360arrow.com/qpls-md', //  Éú²ú
         // ws: false,
         ws: true,