Parcourir la source

Merge branch 'develop_cuxiao' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_cuxiao

lilei il y a 1 an
Parent
commit
5fb0d723bb

+ 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>