Browse Source

Merge branch 'develop_cuxiao' of jianguan-web/jg-ocs-html into pre-release

李磊 1 year ago
parent
commit
df9099f640

+ 9 - 7
src/views/productManagement/productPricing/editModal.vue

@@ -97,9 +97,6 @@
             ></v-select>
           </a-form-model-item>
         </a-form-model>
-        <div style="margin-left: 40px;">
-          <a-icon type="exclamation-circle" style="margin-right: 10px;" />说明:各个价格至少有1个填写后才能保存成功。
-        </div>
         <div class="btn-cont">
           <a-button type="primary" id="productPricingEdit-save" @click="handleSave">保存</a-button>
           <a-button id="productPricingEdit-cancel" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
@@ -144,6 +141,15 @@ export default {
       rules: {
         changeReason: [
           { required: true, message: '请选择变更原因', trigger: 'change' }
+        ],
+        afterProvincePrice: [
+          { required: true, message: '请输入省级价', trigger: 'blur' }
+        ],
+        afterCityPrice: [
+          { required: true, message: '请输入市级价', trigger: 'blur' }
+        ],
+        afterSpecialPrice: [
+          { required: true, message: '请输入特约价', trigger: 'blur' }
         ]
       },
       detailData: null //  数据详情
@@ -170,10 +176,6 @@ export default {
     // 保存
     handleSave () {
       const _this = this
-      if (!this.form.afterProvincePrice && !this.form.afterCityPrice && !this.form.afterSpecialPrice && !this.form.afterTerminalPrice && !this.form.afterCarOwnersPrice) {
-        this.$message.warning('需至少填写1个价格,请修改后再提交!')
-        return
-      }
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const form = JSON.parse(JSON.stringify(_this.form))

+ 1 - 1
src/views/productManagement/productPricing/importGuideModal.vue

@@ -17,7 +17,7 @@
           <ul>
             <li>1) 导入的Excel文件中必须包含名为“产品编码”的列,且名称必须相同</li>
             <li>2) “产品编码”必须是列表中已存在的产品</li>
-            <li>3) 省级价、市级价、特约价、终端价、车主价均可为空,为空表示不对原有价格做改变</li>
+            <li>3) 产品首次定价,省级价、市级价、特约价不可为空,再次定价导入时可为空,为空表示不对原有价格做改变</li>
           </ul>
           <a-button type="link" icon="download" style="padding: 0 0 0 23px;" :loading="exportLoading" @click="handleExport">下载导入模板</a-button>
         </div>

+ 12 - 11
src/views/salesManagement/waitDispatchNew/detailProductList.vue

@@ -26,7 +26,6 @@
                 row-key-field-name="id"
                 :cell-style-option="cellStyleOption"
                 :cell-span-option="cellSpanOption"
-                :column-width-resize-option="columnWidthResizeOption"
                 :checkbox-option="checkboxOption"
               />
           <div v-show="showEmpty" class="empty-data"><a-empty description="暂无产品" :image="simpleImage"/></div>
@@ -174,19 +173,21 @@
         }
 
         let arr= [
-              { title: "", field: "", key: "acheck", type: "checkbox", align: "center" },
-              { title: '序号', field: 'no',key: "a", width: 50, align: 'center', operationColumn: false },
-              { title: '产品编码', field: 'productCode',key: "b", width: 100, align: 'center',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return codeFormat(row,row[column.field],h)} },
-              { title: '产品名称', field: 'productName',key: "c", width: 200, align: 'center',operationColumn: false , ellipsis: { showTitle: true },renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},
-              { title: '出库仓库', field: 'warehouseName',key: "e", width: 100, align: 'center',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},
-              { title: '待下推数量', field: 'surplusQty', width: 80,key: "o", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} },
-              { title: '本次下推数', field: 'qty', width: 80,key: "r", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return inputFormat(row,row[column.field],h)} },
-              { title: '单位', field: 'productOrigUnit',key: "i", width: 80, align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},
-              { title: '操作', field: 'action', width: 80,key: "s", align: 'center',fixed: 'right',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return actionFormat(row,row[column.field],h)} }
+              { title: "", field: "", key: "acheck", width: 60, type: "checkbox", align: "center" },
+              { title: '序号', field: 'no',key: "a", width: 60, align: 'center', operationColumn: false },
+              { title: '产品编码', field: 'productCode',key: "b", align: 'center',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return codeFormat(row,row[column.field],h)} },
+              { title: '出库仓库', field: 'warehouseName',key: "e",width: 150, align: 'center',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},
+              { title: '待下推数量', field: 'surplusQty', key: "o",width: 150, align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} },
+              { title: '本次下推数', field: 'qty', key: "r",width: 150, align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return inputFormat(row,row[column.field],h)} },
+              { title: '单位', field: 'productOrigUnit',width: 100,key: "i", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},
+              { title: '操作', field: 'action', width: 100, key: "s", align: 'center',fixed: 'right',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return actionFormat(row,row[column.field],h)} }
           ]
         
         if(this.detailData && this.detailData.promoFlag==1){
-          arr.splice(2,0,{ title: '活动规则', field: 'prompName',key: "m", width: 100, align: 'center',operationColumn: false },)
+          arr.splice(2,0,{ title: '活动规则', field: 'prompName',key: "m", align: 'center',operationColumn: false },)
+          arr.splice(3,0,{ title: '产品名称', field: 'productName',key: "c", align: 'center',operationColumn: false , ellipsis: { showTitle: true },renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}})
+        }else{
+          arr.splice(2,0,{ title: '产品名称', field: 'productName',key: "c", align: 'center',operationColumn: false , ellipsis: { showTitle: true },renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}})
         }
 
         return arr

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

@@ -305,7 +305,7 @@ export default {
       }
        
       let arr= [
-            { title: "", field: "", key: "acheck", type: "checkbox", align: "center" },
+            { title: "", field: "", key: "acheck", width: 50, type: "checkbox", align: "center" },
             { title: '序号', field: 'no',key: "a", width: 50, align: 'center', operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return noFormat(row,row[column.field],h)} },
             { title: '产品编码', field: 'productCode',key: "b", width: 150, align: 'center',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return codeFormat(row,row[column.field],h)} },
             { title: '产品名称', field: 'productName',key: "c", width: 250, align: 'center',operationColumn: false , ellipsis: { showTitle: true },renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},