Browse Source

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

chenrui 2 năm trước cách đây
mục cha
commit
f899271528

+ 1 - 1
public/version.json

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

+ 7 - 7
src/views/numsGoodsShelves/settlementManagement/list.vue

@@ -4,24 +4,24 @@
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
-            <a-col :md="4" :sm="24">
+          <a-row type="flex" :gutter="15">
+            <a-col flex="350px">
               <a-form-item label="货架名称">
-                <shelfList v-model="queryParam.shelfSn"></shelfList>
+                <shelfList style="max-width:300px;" v-model="queryParam.shelfSn"></shelfList>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col flex="300px">
               <a-form-item label="关联客户">
                 <custList ref="custList" @change="custChange" v-model="queryParam.customerName"></custList>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col flex="200px">
               <a-form-item label="结算方式">
                 <v-select code="SHELF_SETTLE_TYPE" v-model="queryParam.settleType" allowClear placeholder="请选择状态"></v-select>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
+              <a-col flex="300px">
                 <a-form-item label="待结金额">
                   <a-input-group>
                     <a-row>
@@ -49,7 +49,7 @@
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24">
+            <a-col flex="200px">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="outboundOrderList-refresh" >查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="outboundOrderList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">

+ 27 - 19
src/views/salesManagement/salesQuery/edit.vue

@@ -583,25 +583,24 @@ export default {
       if (this.isInster) { return }
       const _this = this
       // 判断是否已添加此产品
-      if (this.dataSource && this.dataSource.length > 0) {
-        const hasRow = this.dataSource.find(item => item.productSn == row.productSn)
-        if (hasRow) {
-          this.$message.info('该产品已在当前销售单中存在!')
-          this.productForm = {
-            productName: '',
-            productCode: hasRow.dealerProductEntity && hasRow.dealerProductEntity.code || '',
-            orderBy: 'sales_bill_detail.CREATE_DATE desc'
-          }
-          this.$refs.table.refresh(true)
-          return
-        } else {
-          this.productForm = {
-            productName: '',
-            productCode: '',
-            orderBy: 'sales_bill_detail.CREATE_DATE desc'
-          }
-        }
-      }
+      // if (this.dataSource && this.dataSource.length > 0) {
+      //   const hasRow = this.dataSource.find(item => item.productSn == row.productSn)
+      //   if (hasRow) {
+      //     this.$message.info('该产品已在当前销售单中存在!')
+      //     this.productForm = {
+      //       productName: '',
+      //       productCode: hasRow.dealerProductEntity && hasRow.dealerProductEntity.code || '',
+      //       orderBy: 'sales_bill_detail.CREATE_DATE desc'
+      //     }
+      //     this.$refs.table.refresh(true)
+      //   } else {
+      //     this.productForm = {
+      //       productName: '',
+      //       productCode: '',
+      //       orderBy: 'sales_bill_detail.CREATE_DATE desc'
+      //     }
+      //   }
+      // }
       // 自建的单据显示库存不足时
       if (row.currentQty < row.salesNums && this.isOwerEdit) {
         _this.$confirm({
@@ -661,6 +660,15 @@ export default {
           if (this.showShelfModal) {
             this.$refs.chooseShelfProduct.reload()
           }
+        }else{
+          if(res.errCode == 'VALID_F_00001'){
+            this.productForm = {
+              productName: '',
+              productCode: row.productCode || '',
+              orderBy: 'sales_bill_detail.CREATE_DATE desc'
+            }
+            this.$refs.table.refresh(true)
+          }
         }
         this.isInster = false
         // this.spinning = false

+ 1 - 1
src/views/salesManagement/salesQuery/queryPart.vue

@@ -67,7 +67,7 @@
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
           </a-col>
-          <a-col flex="240px" style="margin-bottom: 15px;display:flex;align-items:center;">
+          <a-col flex="auto" style="margin-bottom: 15px;display:flex;align-items:center;">
             <a-checkbox v-model="cost" v-if="$hasPermissions('M_ShowAllCost')" id="salesQuery-cost">成本价</a-checkbox>
             <a-checkbox v-model="cityPrice" id="salesQuery-cityPrice">市级价</a-checkbox>
             <a-checkbox v-model="tyuePrice" v-if="$store.state.user.isShowSpecialPrice==1" id="salesQuery-tyuePrice">特约价</a-checkbox>

+ 3 - 3
src/views/salesManagement/salesman/editModal.vue

@@ -44,13 +44,13 @@
               placeholder="请输入手机号码(最多11个字符)"
               allowClear />
           </a-form-model-item>
-          <a-form-model-item label="入职时间" prop="entryDate">
+          <a-form-model-item label="入职日期" prop="entryDate">
             <a-date-picker
               v-model="form.entryDate"
               type="date"
               :disabled-date="disabledDate"
               :defaultValue="null"
-              placeholder="请选择入职时间"
+              placeholder="请选择入职日期"
               style="width: 100%;"
             />
           </a-form-model-item>
@@ -83,7 +83,7 @@
         <a-descriptions-item label="姓名">{{ this.form.name || '--' }}</a-descriptions-item>
         <a-descriptions-item label="身份证号">{{ this.form.idCard || '--' }}</a-descriptions-item>
         <a-descriptions-item label="联系电话">{{ this.form.mobile || '--' || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="入职时间">{{ this.form.entryDate || '--' || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="入职日期">{{ this.form.entryDate || '--' || '--' }}</a-descriptions-item>
         <a-descriptions-item label="性别">{{ this.form.sexDictValue || '--' || '--' }}</a-descriptions-item>
         <a-descriptions-item label="状态">{{ this.form.enableFlagDictValue || '--' || '--' }}</a-descriptions-item>
       </a-descriptions>