chenrui před 2 roky
rodič
revize
d51518c9a8

+ 4 - 0
src/views/dealerManagement/businessOwnerSettings/addModal.vue

@@ -111,6 +111,10 @@ export default {
         if (valid) {
           _this.spinning = true
           _this.form.id = _this.itemId ? _this.itemId : ''
+          if (_this.form.bizUserType != 'cg') {
+            this.warehouseList = []
+            _this.form.bizUserScopeList = []
+          }
           bizuserSave(_this.form).then(res => {
             _this.spinning = false
             if (res.status == 200) {

+ 16 - 16
src/views/dealerManagement/businessOwnerSettings/list.vue

@@ -46,21 +46,21 @@
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           bordered>
-         <template slot="showWarehouse" slot-scope="text, record">
-          <div v-if="record.warehouseList &&record.warehouseList.length>0 ">
-            <a-tooltip placement="bottom" class="warehouseBox">
-                    <template slot="title">
-                     <span v-for="con in record.warehouseList" :key="con.id">
-                       {{con.name}}
-                     </span>
-                    </template>
-                   <span v-for="con in record.warehouseList" :key="con.id">
-                     {{con.name}}
-                   </span>
-            </a-tooltip>
-          </div>
-          <div v-else>--</div>
-         </template>
+          <template slot="showWarehouse" slot-scope="text, record">
+            <div v-if="record.warehouseList&&record.warehouseList.length>0 ">
+              <a-tooltip placement="bottom" class="warehouseBox">
+                <template slot="title">
+                  <span v-for="con in record.warehouseList" :key="con.id">
+                    {{ con.name }}
+                  </span>
+                </template>
+                <span v-for="con in record.warehouseList" :key="con.id">
+                  {{ con.name }}
+                </span>
+              </a-tooltip>
+            </div>
+            <div v-else>--</div>
+          </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
             <a-button size="small" type="link" class="button-warning" v-if="record.allDealerFlag!=1 || record.allProductFlag!=1" @click="handleSetCategory(record)">设置管辖范围</a-button>
@@ -99,7 +99,7 @@ export default {
         { title: '人员类型', dataIndex: 'bizUserTypeDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '管辖经销商', dataIndex: 'allDealerFlagDictValue', width: '18%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '管辖品类', dataIndex: 'allProductFlagDictValue', width: '18%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '管辖仓库',scopedSlots: { customRender: 'showWarehouse' },  width: '22%', align: 'center'},
+        { title: '管辖仓库', scopedSlots: { customRender: 'showWarehouse' }, width: '22%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '20%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 5 - 0
src/views/salesReturnManagement/billOfLading/detail.vue

@@ -112,6 +112,11 @@
                 <div style="word-break: break-all;line-height:normal;padding-top:10px;">{{ form.remarks||'--' }}</div>
               </a-form-model-item>
             </a-col>
+            <a-col :spna="24">
+              <a-form-model-item style="margin-bottom:0" label="退货仓库" prop="warehouseName" :label-col="{span:2}" :wrapper-col="{span:20}">
+                {{ form.warehouseName||'--' }}
+              </a-form-model-item>
+            </a-col>
             <a-col :spna="24">
               <a-form-model-item style="margin-bottom:10px" label="附件" :label-col="{span:2}" :wrapper-col="{span:20}">
                 <div style="line-height:26px;">

+ 3 - 3
src/views/salesReturnManagement/pickUp/list.vue

@@ -49,7 +49,7 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24" v-show="isShowWarehouse">
-                <a-form-model-item label="出库仓库">
+                <a-form-model-item label="退货仓库">
                   <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
@@ -191,11 +191,11 @@ export default {
         { title: '发货方', dataIndex: 'dealerEntity.dealerName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收货人', dataIndex: 'receiverName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        // { title: '出库仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        // { title: '退货仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
       if (this.isShowWarehouse) {
-        arr.splice(11, 0, { title: '出库仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
+        arr.splice(11, 0, { title: '退货仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
       }
       return arr
     }