chenrui 8 mesiacov pred
rodič
commit
1a2a262bb3

+ 7 - 2
src/views/customerManagement/customerInfo/edit.vue

@@ -107,14 +107,19 @@
                 <custType id="customerManagementEdit-customerTypeSn" v-model="form.customerTypeSn" allowClear placeholder="请选择客户类型"></custType>
               </a-form-model-item>
             </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="采购范围" ref="priceType" prop="priceType">
+                <v-select code="PRICE_TYPE" id="customerManagementEdit-priceType" v-model="form.priceType" allowClear placeholder="请选择采购范围" ></v-select>
+              </a-form-model-item>
+            </a-col>
           </a-row>
-          <a-row :gutter="15">
+          <!-- <a-row :gutter="15">
             <a-col :span="8" v-if="form.relationType=='child'">
               <a-form-model-item label="采购范围" prop="scope">
                 <a-checkbox v-model="form.scope" :checked="form.scope" id="customerManagementEdit-scope">自建产品</a-checkbox>
               </a-form-model-item>
             </a-col>
-          </a-row>
+          </a-row> -->
           <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;margin-top: 30px;">
             <a-button type="primary" @click="handleSubmit" size="large" id="customerManagementEdit-btn-submit" style="padding: 0 60px;">保存</a-button>
           </a-form-model-item>

+ 2 - 1
src/views/productManagement/productInfo/list.vue

@@ -62,9 +62,10 @@
             <a-menu-item key="1" id="productInfoList-menus-1"> 批量启用</a-menu-item>
             <a-menu-item key="2" id="productInfoList-menus-2"> 批量禁用</a-menu-item>
           </a-menu>
-          <a-button id="productInfoList-menus-action" type="danger" ghost style="margin-left: 5px">批量操作 <a-icon type="down" /> </a-button>
+          <a-button id="productInfoList-menus-action" type="danger" ghost style="margin:0 15px 0 5px;">批量操作 <a-icon type="down" /> </a-button>
         </a-dropdown>
         <span v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys">已选 {{ rowSelectionInfo.selectedRowKeys.length }} 项</span>
+        <a-button class="button-primary" type="primary">导入</a-button>
       </div>
       <!-- 列表 -->
       <s-table

+ 18 - 0
src/views/salesManagement/salesQueryNew/edit.vue

@@ -875,6 +875,24 @@ export default {
       salesWriteSubmit({ id: this.orderId, submitTypes: submitTypes, ...params }).then(res => {
         console.log(res)
         if (res.status == 200) {
+          if (res.data.errorMsg && res.data.errorMsg.length > 0) {
+            this.$confirm({
+              title: '提示',
+              content: res.data.errorMsg.map((item, i) => { return <p>{i * 1 + 1}、{item}</p> }),
+              centered: true,
+              okText: '知道了',
+              cancelText: '取消', // 将cancelText设置为空字符串或去掉该属性可以隐藏取消按钮
+              cancelButtonProps: {
+                style: {
+                  display: 'none' // 通过设置样式隐藏取消按钮
+                }
+              },
+              onOk () {
+                console.log('知道了')
+              }
+            })
+            return
+          }
           this.handleBack()
           this.$message.success(res.message)
           this.spinning = false