Browse Source

Merge branch 'develop_yh15' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh15

chenrui 2 years ago
parent
commit
64f3f1b595

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1677806531611
+  "version": 1677831484666
 }

+ 4 - 0
src/views/allocationManagement/storeTransferOut/detail.vue

@@ -278,6 +278,10 @@ export default {
       this.$router.push({ path: `/allocationManagement/storeTransferOut/edit/${this.basicInfoData.id}/${this.basicInfoData.storeCallOutSn}` })
     }
   },
+  mounted () {
+    this.printCostChecked = true
+    this.getDetail()
+  },
   activated () {
     this.printCostChecked = true
     this.getDetail()

+ 5 - 3
src/views/customerManagement/customerInfo/edit.vue

@@ -228,10 +228,12 @@ export default {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          const form = _this.form
-          form.id = this.$route.params.id && this.model == 'page' ? this.$route.params.id : null
+          const form = JSON.stringify(_this.form)
+          const formInfo = JSON.parse(form)
+          delete formInfo.satelliteFlag
+          formInfo.id = this.$route.params.id && this.model == 'page' ? this.$route.params.id : null
           _this.spinning = true
-          custSave(form).then(res => {
+          custSave(formInfo).then(res => {
             if (res.status == 200) {
               _this.$message.success(res.message)
               if (_this.model == 'page') {

+ 2 - 1
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -402,8 +402,9 @@ export default {
       this.chooseLoadData = selectedRows.sort((a, b) => {
         const at = new Date(a.auditTime).getTime()
         const bt = new Date(b.auditTime).getTime()
-        return bt - at
+        return at - bt
       })
+      // this.chooseLoadData = selectedRows.reverse()
       this.amountSettledChange()
     },
     // 返回列表

+ 2 - 3
src/views/financialManagement/financialCollection/list.vue

@@ -122,11 +122,10 @@
             type="link"
             :loading="loading"
             class="button-error"
-            v-if="(record.settleState == 'UNSETTLE' || record.settleState == 'PART_SETTLED')&&record.satelliteFlag!=1 && $hasPermissions('B_financialCollectionSing')"
+            v-if="(record.settleState == 'UNSETTLE' || record.settleState == 'PART_SETTLED') && $hasPermissions('B_financialCollectionSing')"
             @click="enableFundAccount ? handleSettleAcountPay(record,0) : handleCollectionSing(record)"
             id="financialCollectionList-pay-btn">收款</a-button>
-          <span v-if="!(record.settleState == 'SETTLED' && $hasPermissions('B_financialCollectionDetail')) && !((record.settleState == 'UNSETTLE' || record.settleState == 'PART_SETTLED')&&record.satelliteFlag!=1 && $hasPermissions('B_financialCollectionSing'))">--</span>
-          <!-- satelliteFlag为1,是卫星仓 -->
+          <span v-if="!(record.settleState == 'SETTLED' && $hasPermissions('B_financialCollectionDetail')) && !((record.settleState == 'UNSETTLE' || record.settleState == 'PART_SETTLED') && $hasPermissions('B_financialCollectionSing'))">--</span>
         </template>
       </s-table>
     </a-spin>

+ 9 - 4
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -54,7 +54,7 @@
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="单位名称">
-                    <a-input id="inventoryQueryWarehouseDetail-unitName" v-model.trim="queryParam.unitName" allowClear placeholder="请输入单位名称"/>
+                    <a-input id="inventoryQueryWarehouseDetail-unitName" v-model.trim="queryParam.unitNameCurrent" allowClear placeholder="请输入单位名称"/>
                   </a-form-item>
                 </a-col>
                 <a-col :md="4" :sm="24">
@@ -105,6 +105,11 @@
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           bordered>
+          <!-- 单位名称 -->
+          <template slot="newUnitName" slot-scope="text, record">
+            <span v-if="record.unitType&&record.unitType=='CUSTOMER'">{{ record.unitNameCurrent||'--' }}</span>
+            <span v-else>{{ record.unitName||'--' }}</span>
+          </template>
           <!-- 数量 -->
           <template slot="qty" slot-scope="text, record">
             <p :class="record.flowType=='PUT' ? 'green':'red'" style="margin: 0;">
@@ -140,7 +145,7 @@ export default {
         bizType: undefined,
         bizNo: '',
         flowType: undefined,
-        unitName: '',
+        unitNameCurrent: '',
         warehouseSn: undefined,
         state: undefined
       },
@@ -186,7 +191,7 @@ export default {
         { title: '关联单据号', dataIndex: 'bizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据类型', dataIndex: 'bizTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据审核时间', dataIndex: 'auditTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单位名称', dataIndex: 'unitName', width: '9%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '单位名称', scopedSlots: { customRender: 'newUnitName' }, width: '9%', align: 'center', ellipsis: true },
         { title: '仓库', dataIndex: 'warehouseName', width: '9%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '9%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '数量', scopedSlots: { customRender: 'qty' }, width: '5%', align: 'center' },
@@ -226,7 +231,7 @@ export default {
       this.queryParam.bizType = undefined
       this.queryParam.bizNo = ''
       this.queryParam.flowType = undefined
-      this.queryParam.unitName = ''
+      this.queryParam.unitNameCurrent = ''
       this.queryParam.warehouseSn = undefined
       this.queryParam.state = undefined
       this.$refs.table.refresh(true)

+ 2 - 2
src/views/salesManagement/productPricing/list.vue

@@ -124,7 +124,7 @@ export default {
         productTypeSn2: '',
         productTypeSn3: '',
         onlineFalg: undefined,
-        putStockFlag: false
+        putStockFlag: true
       },
       productType: [],
       disabled: false, //  查询、重置按钮是否可操作
@@ -204,7 +204,7 @@ export default {
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
       this.queryParam.onlineFalg = undefined
-      this.queryParam.putStockFlag = false
+      this.queryParam.putStockFlag = true
       this.productType = []
       this.$refs.table.refresh(true)
     },