lilei %!s(int64=2) %!d(string=hai) anos
pai
achega
d981af4b7c

+ 2 - 0
src/views/purchasingManagement/bulkWarehousingOrder/productModal.vue

@@ -53,6 +53,7 @@
           <a-input-number
             id="bulkWarehousingOrder-product-productCost"
             v-model="form.productCost"
+            :disabled="!!form.productCost"
             :precision="2"
             :min="0"
             :max="999999"
@@ -180,6 +181,7 @@ export default {
       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()
+      this.$refs.ruleForm.validate()
     },
     // 详情
     getDetail () {

+ 6 - 6
src/views/salesManagement/receiptPrint/list.vue

@@ -14,22 +14,22 @@
         <div ref="tableSearch" class="table-page-search-wrapper">
           <a-form layout="inline">
             <a-row :gutter="15">
-              <a-col :md="8" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="允许打印时间">
                   <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
                 </a-form-item>
               </a-col>
-              <a-col :md="8" :sm="24">
+              <a-col :md="5" :sm="24">
                 <a-form-item label="收款单号">
                   <a-input id="salesCollectionList-bookNo" v-model.trim="queryParam.bookNo" allowClear placeholder="请输入备货单号"/>
                 </a-form-item>
               </a-col>
-              <a-col :md="8" :sm="24">
+              <a-col :md="5" :sm="24">
                 <a-form-item label="客户名称">
                   <dealerSubareaScopeList ref="payerName" id="salesCollectionList-payerName" @change="custChange" />
                 </a-form-item>
               </a-col>
-              <a-col :md="8" :sm="24" v-if="currentTab == 1">
+              <a-col :md="4" :sm="24" v-if="currentTab == 1">
                 <a-form-item label="收款打印状态">
                   <v-select
                     v-model="queryParam.printStatus"
@@ -41,8 +41,8 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :offset="currentTab==2?8:0" :md="16" :sm="24">
-                <span style="float: right;" class="table-page-search-submitButtons">
+              <a-col :md="4" :sm="24">
+                <span class="table-page-search-submitButtons">
                   <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                   <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 </span>

+ 14 - 20
src/views/supplierManagement/associatedProduct/add.vue

@@ -14,35 +14,29 @@
         <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="6" :sm="24">
+              <a-col :md="5" :sm="24">
                 <a-form-item label="产品名称">
                   <a-input id="associatedProduct-name" v-model.trim="queryParam.product.name" allowClear placeholder="请输入产品名称"/>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <a-col :md="5" :sm="24">
                 <a-form-item label="产品编码/原厂编码">
                   <a-input id="associatedProduct-queryWord" v-model.trim="queryParam.product.queryWord" allowClear placeholder="请输入产品编码/原厂编码"/>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <a-col :md="5" :sm="24">
                 <a-form-item label="品牌">
                   <ProductBrand id="associatedProduct-productBrandSn" v-model="queryParam.product.productBrandSn"></ProductBrand>
                 </a-form-item>
               </a-col>
-              <template v-if="advanced">
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="产品分类">
-                    <ProductType id="associatedProduct-productType" v-model="productType" @change="changeProductType"></ProductType>
-                  </a-form-item>
-                </a-col>
-              </template>
-              <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+              <a-col :md="5" :sm="24">
+                <a-form-item label="产品分类">
+                  <ProductType id="associatedProduct-productType" v-model="productType" @change="changeProductType"></ProductType>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="associatedProduct-refresh">查询</a-button>
                 <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="associatedProduct-reset">重置</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 5px">
-                  {{ advanced ? '收起' : '展开' }}
-                  <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a>
               </a-col>
             </a-row>
           </a-form>
@@ -77,12 +71,12 @@
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
-            <a-button
+            <!-- <a-button
               size="small"
               type="link"
               class="button-info"
               @click="handleSetPrice(record)"
-              id="associatedProduct-setCostPrice-btn">设置成本价</a-button>
+              id="associatedProduct-setCostPrice-btn">设置成本价</a-button> -->
             <a-button
               size="small"
               type="link"
@@ -169,9 +163,9 @@ export default {
         // { title: '成本价', dataIndex: 'cost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '13%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
-        arr.splice(6, 0, { title: '成本价', dataIndex: 'cost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-      }
+      // if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
+      //   arr.splice(6, 0, { title: '成本价', dataIndex: 'cost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+      // }
       return arr
     }
   },

+ 4 - 4
src/views/supplierManagement/associatedProduct/chooseImportModal.vue

@@ -88,15 +88,15 @@ export default {
       nowColumns: [ //  可导入
         { title: '序号', dataIndex: 'no', width: '10%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '30%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'product.name', width: '30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '成本', dataIndex: 'costText', width: '20%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '产品名称', dataIndex: 'product.name', width: '50%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        // { title: '成本', dataIndex: 'costText', width: '20%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'product.unit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       nowUnColumns: [ //  不可导入
         { title: '序号', dataIndex: 'no', width: '10%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'product.name', width: '25%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '成本', dataIndex: 'costText', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '产品名称', dataIndex: 'product.name', width: '40%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        // { title: '成本', dataIndex: 'costText', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'product.unit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '备注', dataIndex: 'errorDesc', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
       ],

+ 2 - 2
src/views/supplierManagement/associatedProduct/importGuideModal.vue

@@ -15,8 +15,8 @@
             <span>1</span>准备导入
           </div>
           <ul>
-            <li>1) 导入的Excel文件中必须包含名为“产品编码”、“成本”的列,且名称必须相同</li>
-            <li>2) 除了“产品编码”、“成本”两列,其他列可自定义,不影响数据导入</li>
+            <li>1) 导入的Excel文件中必须包含名为“产品编码”的列,且名称必须相同</li>
+            <li>2) 除了“产品编码”列,其他列可自定义,不影响数据导入</li>
             <li>3) 如果导入的产品已经存在,则不会导入该行</li>
           </ul>
           <a-button type="link" icon="download" style="padding: 0 0 0 23px;" @click="handleExport">下载导入模板</a-button>