소스 검색

样式修改

lilei 3 년 전
부모
커밋
91db6a05cf

+ 1 - 1
src/views/expenseManagement/expenseReimbursement/list.vue

@@ -81,7 +81,7 @@
         bordered>
         <!-- 单号 -->
         <template slot="expenseAccountNo" slot-scope="text, record">
-          <div v-if="$hasPermissions('B_eRdetail')" style="color: #00aaff;cursor: pointer;" @click="handleDetail(record)">{{ record.expenseAccountNo||'--' }}</div>
+          <a-button v-if="$hasPermissions('B_eRdetail')" size="small" type="link" class="button-info" @click="handleDetail(record)">{{ record.expenseAccountNo }}</a-button>
           <div v-else>{{ record.expenseAccountNo||'--' }}</div>
         </template>
         <!-- 总数量 -->

+ 2 - 1
src/views/financialManagement/allocateReturnConfirmation/list.vue

@@ -69,7 +69,8 @@
         bordered>
         <!-- 销退单号 -->
         <template slot="salesReturnBillNo" slot-scope="text, record">
-          <span :class="$hasPermissions('B_returnConfirmation_detail')?'active':'common'" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
+          <a-button v-if="$hasPermissions('B_returnConfirmation_detail')" size="small" type="link" class="button-info" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</a-button>
+          <span v-else>{{ record.salesReturnBillNo }}</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">

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

@@ -144,11 +144,14 @@
         bordered>
         <!-- 单号 -->
         <template slot="bizNo" slot-scope="text, record">
-          <span :class="$hasPermissions('B_salesDetail')?'active':'common'"v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record)">{{ record.bizNo }}</span>
+          <!-- <span :class="$hasPermissions('B_salesDetail')?'active':'common'"v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record)">{{ record.bizNo }}</span> -->
+          <a-button v-if="$hasPermissions('B_salesDetail')" size="small" type="link" class="button-info" @click="handleDetail(record)">{{ record.bizNo }}</a-button>
+          <span v-else>{{ record.bizNo }}</span>
         </template>
         <!-- 下推单号 -->
         <template slot="dispatchBillNo" slot-scope="text, record">
-          <span :class="$hasPermissions('B_dispatchDetail')?'active':'common'" v-if="$hasPermissions('B_dispatchDetail')" @click="handleBhDetail(record)">{{ record.dispatchBillNo || '--' }}</span>
+          <!-- <span :class="$hasPermissions('B_dispatchDetail')?'active':'common'" v-if="$hasPermissions('B_dispatchDetail')" @click="handleBhDetail(record)">{{ record.dispatchBillNo || '--' }}</span> -->
+          <a-button v-if="$hasPermissions('B_dispatchDetail')" size="small" type="link" class="button-info" @click="handleBhDetail(record)">{{ record.dispatchBillNo }}</a-button>
           <span v-else>{{ record.dispatchBillNo || '--' }}</span>
         </template>
         <!-- 操作 -->

+ 3 - 1
src/views/financialManagement/inventoryConfirmation/list.vue

@@ -37,7 +37,9 @@
         bordered>
         <!-- 单号 -->
         <template slot="checkWarehouseNo" slot-scope="text, record">
-          <span :class="$hasPermissions('B_inventoryConfirmationDetail')?'active':'common'" @click="handleDetail(record)">{{ record.checkWarehouseNo }}</span>
+          <!-- <span :class="$hasPermissions('B_inventoryConfirmationDetail')?'active':'common'" @click="handleDetail(record)">{{ record.checkWarehouseNo }}</span> -->
+          <a-button v-if="$hasPermissions('B_inventoryConfirmationDetail')" size="small" type="link" class="button-info" @click="handleDetail(record)">{{ record.checkWarehouseNo }}</a-button>
+          <span v-else>{{ record.checkWarehouseNo }}</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">

+ 3 - 1
src/views/financialManagement/returnConfirmation/list.vue

@@ -69,7 +69,9 @@
         bordered>
         <!-- 销退单号 -->
         <template slot="salesReturnBillNo" slot-scope="text, record">
-          <span :class="$hasPermissions('B_returnConfirmation_detail')?'active':'common'" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
+          <!-- <span :class="$hasPermissions('B_returnConfirmation_detail')?'active':'common'" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span> -->
+          <a-button v-if="$hasPermissions('B_returnConfirmation_detail')" size="small" type="link" class="button-info" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</a-button>
+          <span v-else>{{ record.salesReturnBillNo }}</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">

+ 4 - 3
src/views/financialManagement/warehousingConfirmation/list.vue

@@ -30,7 +30,7 @@
       </div>
       <!-- 列表 -->
       <div v-if="$hasPermissions('B_warehousingConfirmationpl')" style="margin-bottom: 10px">
-        <a-button type="primary" class="button-error" id="warehousingConfirmationList-export" :loading="loading" @click="handleBatchAudit">批量确认</a-button>
+        <a-button type="primary" class="button-info" id="warehousingConfirmationList-export" :loading="loading" @click="handleBatchAudit">批量确认</a-button>
         <span style="margin-left: 5px">
           <template v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys.length>0"> {{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }} </template>
         </span>
@@ -51,7 +51,8 @@
         bordered>
         <!-- 入库单号 -->
         <template slot="stockPutNo" slot-scope="text, record">
-          <span :class="$hasPermissions('B_warehousingConfirmationDetail')?'active':'common'" @click="handleDetail(record)">{{ record.stockPutNo }}</span>
+          <a-button v-if="$hasPermissions('B_warehousingConfirmationDetail')" size="small" type="link" class="button-info" @click="handleDetail(record)">{{ record.stockPutNo }}</a-button>
+          <span v-else>{{ record.stockPutNo }}</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
@@ -59,7 +60,7 @@
             size="small"
             type="link"
             v-if="record.auditState=='WAIT' && $hasPermissions('B_warehousingConfirmationAlone')"
-            class="button-warning"
+            class="button-info"
             @click="handleAudit(record)"
             id="warehousingConfirmationList-audit-btn">入库确认</a-button>
           <span v-else>--</span>

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

@@ -92,7 +92,7 @@
             v-if="$hasPermissions('B_inventoryQuery_detail')"
             size="small"
             type="link"
-            class="button-success"
+            class="button-info"
             @click="goDetail(record)"
             id="inventoryQueryList-detail-btn">库存详情</a-button>
           <a-button

+ 20 - 13
src/views/purchasingManagement/bulkWarehousingOrder/productModal.vue

@@ -15,16 +15,19 @@
         :model="form"
         :rules="rules"
         :label-col="formItemLayout.labelCol"
-        :wrapper-col="formItemLayout.wrapperCol" >
+        :wrapper-col="formItemLayout.wrapperCol"
+        @keyup.enter.native="handleSave">
         <a-form-model-item label="供应商" prop="supplierSn">{{ (nowData&&nowData.supplierName) || '--' }}</a-form-model-item>
         <a-form-model-item label="产品编码" prop="productSn">
           <a-select
             show-search
             id="bulkWarehousingOrder-product-productSn"
+            ref="productSn"
             v-model="form.productSn"
             placeholder="请选择"
             :filter-option="false"
             :not-found-content="fetching ? undefined : null"
+            :autoFocus="true"
             @search="fetchUser"
             @change="handleChange"
           >
@@ -59,6 +62,7 @@
         <a-form-model-item label="数量" prop="productQty">
           <a-input-number
             id="bulkWarehousingOrder-product-productQty"
+            ref="productQty"
             v-model="form.productQty"
             :precision="0"
             :min="1"
@@ -66,11 +70,11 @@
             placeholder="请输入"
             style="width: 80%;" /><span>个</span>
         </a-form-model-item>
+        <div class="btn-cont">
+          <a-button type="primary" id="bulkWarehousingOrder-product-modal-save" @click="handleSave">{{ itemSn?'保存':'保存并新增' }}</a-button>
+          <a-button id="bulkWarehousingOrder-product-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
+        </div>
       </a-form-model>
-      <div class="btn-cont">
-        <a-button type="primary" id="bulkWarehousingOrder-product-modal-save" @click="handleSave">保存并新增</a-button>
-        <a-button id="bulkWarehousingOrder-product-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
-      </div>
     </a-spin>
   </a-modal>
 </template>
@@ -173,6 +177,7 @@ export default {
       this.form.productCode = this.productData[ind].product.code
       this.form.productOrigCode = this.productData[ind].product.origCode
       this.form.productCost = (this.productData[ind].cost && this.productData[ind].cost != 0) ? this.productData[ind].cost : ''
+      this.$refs.productQty.focus()
     },
     // 详情
     getDetail () {
@@ -207,13 +212,10 @@ export default {
               setTimeout(() => {
                 _this.$emit('ok', res.data)
                 _this.spinning = false
-                _this.form.productSn = undefined
-                _this.form.productName = ''
-                _this.form.productCode = ''
-                _this.form.productOrigCode = ''
-                _this.form.productCost = ''
-                _this.form.productQty = ''
-              }, 1000)
+                _this.resetData()
+                _this.$refs.productQty.blur()
+                _this.$refs.productSn.focus()
+              })
             } else {
               _this.spinning = false
             }
@@ -240,6 +242,7 @@ export default {
         this.warehouseSnBackups = this.form.warehouseSn
         this.warehouseLocationSnBackups = this.form.warehouseLocationSn
       }
+      this.$refs.productQty.focus()
     },
     //  仓库仓位  级联  列表
     getWarehouseCascade () {
@@ -278,6 +281,7 @@ export default {
       })
     },
     resetData () {
+      this.$refs.ruleForm.resetFields()
       this.form = {
         supplierSn: '', // 供应商
         productSn: undefined,
@@ -290,6 +294,7 @@ export default {
         productCost: '',
         productQty: ''
       }
+      // this.$refs.productSn.focus()
     }
   },
   watch: {
@@ -301,11 +306,13 @@ export default {
     isShow (newValue, oldValue) {
       if (!newValue) {
         this.$emit('close')
-        this.$refs.ruleForm.resetFields()
         this.resetData()
         this.warehouseSnBackups = ''
         this.warehouseLocationSnBackups = ''
       } else {
+        this.$nextTick(() => {
+          this.resetData()
+        })
         this.getWarehouseCascade()
       }
     },