Browse Source

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

lilei 9 months ago
parent
commit
2a2bf3086a

+ 7 - 0
src/views/productManagement/productInfo/edit.vue

@@ -354,6 +354,10 @@ export default {
         }
         }
       })
       })
     },
     },
+    // 去除产品编码、产品名称、原厂编码  文字中间2个以上连续空格转化为一个空格
+    mergeSpaces (text) {
+      return text.replace(/\s+/g, ' ')
+    },
     //  保存
     //  保存
     handleSubmit (e) {
     handleSubmit (e) {
       e.preventDefault()
       e.preventDefault()
@@ -375,6 +379,9 @@ export default {
           form.carOwnersPrice = !form.carOwnersPrice ? '' : form.carOwnersPrice
           form.carOwnersPrice = !form.carOwnersPrice ? '' : form.carOwnersPrice
           form.specialPrice = !form.specialPrice ? '' : form.specialPrice
           form.specialPrice = !form.specialPrice ? '' : form.specialPrice
           form.terminalPrice = !form.terminalPrice ? '' : form.terminalPrice
           form.terminalPrice = !form.terminalPrice ? '' : form.terminalPrice
+          form.name = _this.mergeSpaces(form.name)
+          form.code = _this.mergeSpaces(form.code)
+          form.origCode = _this.mergeSpaces(form.origCode)
           dealerProductSave(form).then(res => {
           dealerProductSave(form).then(res => {
             if (res.status == 200) {
             if (res.status == 200) {
               _this.$message.success(res.message)
               _this.$message.success(res.message)

+ 8 - 8
src/views/purchasingManagement/purchaseReturnApplyForm/list.vue

@@ -101,14 +101,6 @@
               v-if="record.billStatus == 'WAIT_SUBMIT'&&$hasPermissions('B_purchaseReturnApplyEdit')"
               v-if="record.billStatus == 'WAIT_SUBMIT'&&$hasPermissions('B_purchaseReturnApplyEdit')"
               @click="handleEdit(record)"
               @click="handleEdit(record)"
             >编辑</a-button>
             >编辑</a-button>
-            <a-button
-              size="small"
-              type="link"
-              class="button-error"
-              :id="'purchaseReturnList-del-'+record.id"
-              v-if="(record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'CANCEL')&&$hasPermissions('B_purchaseReturnApplyDel')"
-              @click="handleDel(record)"
-            >删除</a-button>
             <a-button
             <a-button
               size="small"
               size="small"
               type="link"
               type="link"
@@ -125,6 +117,14 @@
               @click="handleFinishBill(record)"
               @click="handleFinishBill(record)"
               class="button-primary"
               class="button-primary"
             >再次编辑</a-button>
             >再次编辑</a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-error"
+              :id="'purchaseReturnList-del-'+record.id"
+              v-if="(record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'CANCEL')&&$hasPermissions('B_purchaseReturnApplyDel')"
+              @click="handleDel(record)"
+            >删除</a-button>
           </div>
           </div>
         </template>
         </template>
       </s-table>
       </s-table>