Merge remote-tracking branch 'origin/dev' into dev

src/components/boxCost/index.vue

@@ -35,7 +35,7 @@
             class="el-icon-download"
             type="info"
             size="small"
-            :disabled="!id || listData.length === 0"
+            :disabled="(!id || listData.length === 0) && printingIsDisabled"
             @click="openReport">打印
         </el-button>
         <el-button
@@ -742,6 +742,10 @@ export default {
     },
     id: {
       type: String
+    },
+    printingIsDisabled: {
+      type: Boolean,
+      default: true
     }
   },
   async created() {

src/views/basicData/commodityType/detailsPageEdit.vue

@@ -25,12 +25,24 @@
                 <avue-input-tree v-if="item.prop === 'goodsTypeId'" leaf-only multiple style="width: 100%;"
                                  :props="{ label: 'title' }" v-model="form[item.prop]" placeholder=" " type="tree" size="small"
                                  dataType="string" :dic="dicData" tags/>
+
                 <el-input type="textarea" v-else-if="item.type === 'textarea'" v-model="form[item.prop]" size="small"
                           autocomplete="off" placeholder=" "></el-input>
+
                 <el-select v-else-if="item.type === 'select'" style="width: 100%" v-model="form[item.prop]" size="small"
                            placeholder="请选择" clearable filterable>
                   <!--                  <el-option v-for="(item,index) in selectData" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>-->
                 </el-select>
+
+                <el-select v-model="form[item.prop]" style="width: 300px;" size="medium" v-else-if="item.prop === 'supervisorUserIdList'" multiple placeholder="请选择">
+                  <el-option
+                    v-for="item in userList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id">
+                  </el-option>
+                </el-select>
+
                 <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]"
                                  :configuration="configuration" typeData="GYS" style="width: 100%" />
                 <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
@@ -223,6 +235,7 @@ import _ from "lodash";
 import partOption from "./configuration/partList.json";
 import { getPartTree, getGoodstype } from "@/api/basicData/customerInquiry";
 import { costCal } from "@/util/calculate";
+import { gainUser } from "@/api/basicData/customerInquiry";
 export default {
   name: "detailsPage",
   data() {
@@ -401,6 +414,12 @@ export default {
             ]
           },
           {
+            label: '分管员',
+            prop: 'supervisorUserIdList',
+            multiple:true,
+            dicData: [],
+          },
+          {
             label: "HS代码",
             prop: "hsCode",
             rules: [
@@ -674,6 +693,7 @@ export default {
         total: 0,
         pageSize: 10
       },
+      userList: [],
     };
   },
   props: {
@@ -748,6 +768,11 @@ export default {
             });
           }
         }
+        console.log(res.data.data.supervisorUserIdGroup)
+        if (res.data.data.supervisorUserIdGroup != null && res.data.data.supervisorUserIdGroup != '') {
+          res.data.data.supervisorUserIdList = res.data.data.supervisorUserIdGroup.split(',')
+        }
+
         this.form = res.data.data;
         if (res.data.data.saleGoodsPrice) {
           this.contactsData = res.data.data.saleGoodsPrice;
@@ -770,6 +795,9 @@ export default {
     this.getWorkDicts("goods_Props").then(res => {
       this.goodsProps = res.data.data;
     });
+    gainUser().then(res => {
+      this.userList = res.data.data;
+    });
   },
   methods: {
     copyDoc() {
@@ -942,11 +970,28 @@ export default {
           this.partList.forEach((e, index) => {
             e.sort = Number(index + 1)
           })
+
+          var userName = null
+          if (this.form.supervisorUserIdList != null) {
+            userName = ''
+            for (const userId of this.form.supervisorUserIdList) {
+              for (const user of this.userList) {
+                if (user.id == userId) {
+                  userName += user.name + ','
+                }
+              }
+            }
+            userName = userName.substring(0, userName.length - 1);
+          }
+
+
           const params = {
             ...this.form,
             type: 0,
             saleGoodsPrice: this.contactsData,
             buyGoodsPrice: this.purchaseData,
+            supervisorUserIdGroup: this.form.supervisorUserIdList == null || this.form.supervisorUserIdList == [] ? '' : this.form.supervisorUserIdList.toString(),
+            supervisorUserNameGroup: userName,
             goodsSpecificationList: this.sftData.concat(this.partList),
           };
           updateDetail(params).then(res => {

src/views/boxManagement/buyContainer/detailsPage.vue

@@ -98,7 +98,7 @@
         @onClose="onClose()"
     />
 <!--    费用信息组件-->
-    <box-cost v-model="dataListTwo" :id="form.id" type="BUY" activeName="second" ref="boxCost" @resetTrigger="resetTrigger"></box-cost>
+    <box-cost v-model="dataListTwo" :id="form.id" :printingIsDisabled="false" type="BUY" activeName="second" ref="boxCost" @resetTrigger="resetTrigger"></box-cost>
     <trade-card title="附件明细">
       <c-upload
           basic

src/views/boxManagement/exportShipment/detailsPage.vue

@@ -132,7 +132,7 @@
         @onClose="onClose()"
     />
     <!--    费用信息组件-->
-    <box-cost v-model="dataListTwo" :id="form.id" :codeValue="237.2" type="CK" activeName="first" ref="boxCost"
+    <box-cost v-model="dataListTwo" :id="form.id" :printingIsDisabled="false" :codeValue="237.2" type="CK" activeName="first" ref="boxCost"
               url="/api/blade-box-tube/transportItemFees/remove" @resetTrigger="resetTrigger"></box-cost>
     <trade-card title="附件明细">
       <c-upload

src/views/boxManagement/importReturnTrip/detailsPage.vue

@@ -131,7 +131,7 @@
         @onClose="onClose()"
     />
     <!--    费用信息组件-->
-    <box-cost v-model="dataListTwo" :id="form.id" :codeValue="237.92" type="JK" activeName="first" ref="boxCost"
+    <box-cost v-model="dataListTwo" :id="form.id" :printingIsDisabled="false" :codeValue="237.92" type="JK" activeName="first" ref="boxCost"
               url="/api/blade-box-tube/transportItemFees/remove" @resetTrigger="resetTrigger"></box-cost>
     <trade-card title="附件明细">
       <c-upload

src/views/boxManagement/leaseIn/detailsPage.vue

@@ -125,7 +125,7 @@
         @onClose="onClose()"
     />
 <!--    费用信息组件-->
-    <box-cost v-model="dataListTwo" :id="form.id" type="ZR" activeName="second" :codeValue="245.2" ref="boxCost"
+    <box-cost v-model="dataListTwo" :id="form.id" :printingIsDisabled="false" type="ZR" activeName="second" :codeValue="245.2" ref="boxCost"
               @resetTrigger="resetTrigger"></box-cost>
     <trade-card title="附件明细">
       <c-upload

src/views/boxManagement/leaseOut/detailsPage.vue

@@ -121,7 +121,7 @@
         @onClose="onClose()"
     />
 <!--    费用信息组件-->
-    <box-cost v-model="dataListTwo" :id="form.id" type="ZC" activeName="first" :codeValue="248.2" ref="boxCost"
+    <box-cost v-model="dataListTwo" :id="form.id" :printingIsDisabled="false" type="ZC" activeName="first" :codeValue="248.2" ref="boxCost"
               @resetTrigger="resetTrigger"></box-cost>
     <trade-card title="附件明细">
       <c-upload

src/views/boxManagement/sellingContainers/detailsPage.vue

@@ -98,7 +98,7 @@
         @onClose="onClose()"
     />
     <!--    费用信息组件-->
-    <box-cost v-model="dataListTwo" :id="form.id" type="SELL" ref="boxCost" @resetTrigger="resetTrigger"></box-cost>
+    <box-cost v-model="dataListTwo" :id="form.id" :printingIsDisabled="false" type="SELL" ref="boxCost" @resetTrigger="resetTrigger"></box-cost>
     <trade-card title="附件明细">
       <c-upload
           basic

src/views/boxManagement/stockpilingManage/detailsPage.vue

@@ -107,7 +107,7 @@
         @onClose="onClose()"
     />
 <!--    费用信息组件-->
-    <box-cost v-model="dataListTwo" :id="form.id" type="DCF" activeName="second" :tabShow="3" :codeValue="252.2" ref="boxCost"
+    <box-cost v-model="dataListTwo" :id="form.id" :printingIsDisabled="false" type="DCF" activeName="second" :tabShow="3" :codeValue="252.2" ref="boxCost"
               @resetTrigger="resetTrigger"></box-cost>
     <trade-card title="附件明细">
       <c-upload

src/views/client/detailsInfo.vue

@@ -181,7 +181,7 @@
                                @search-criteria-switch="searchCriteriaSwitch">
                     </avue-crud>
                 </el-tab-pane>
-                <el-tab-pane label="会员卡金额消费记录" name="jexfjl">
+                <el-tab-pane label="会员卡消费记录" name="jexfjl">
                     <avue-crud :option="hykoption"
                                :data="hykdataList"
                                ref="crudhyk"
@@ -218,7 +218,7 @@
                         </template>
                     </avue-crud>
                 </el-tab-pane>
-                <el-tab-pane label="积分总换明细" name="jfzhmx">
+                <el-tab-pane label="积分兑换明细" name="jfzhmx">
                     <avue-crud :option="jfzhmxoption"
                                :data="jfzhmxdataList"
                                ref="crudjfzhmx"

src/views/exportTrade/purchaseInquiry/config/commodity.json

@@ -50,6 +50,15 @@
       "overHidden": true
     },
     {
+      "label": "分管员",
+      "prop": "supervisorUserNameGroup",
+      "index": 4,
+      "width": 100,
+      "search": true,
+      "searchSpan": 8,
+      "overHidden": true
+    },
+    {
       "label": "中文规格",
       "prop": "typeno",
       "index": 5,

src/views/exportTrade/purchaseInquiry/config/customerContact.json

@@ -33,6 +33,12 @@
       "overHidden": true
     },
     {
+      "label": "分管员",
+      "prop": "supervisorUserNameGroup",
+      "index": 6,
+      "width": 100
+    },
+    {
       "label": "产品属性",
       "prop": "itemProp",
       "index": 4,

src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -527,6 +527,8 @@ export default {
                 item.corpId = this.reData.corpId;
                 item.priorityReferrer = this.reData.priorityReferrer;
                 item.$cellEdit = true;
+                item.supervisorUserIdGroup = e.supervisorUserIdGroup;
+                item.supervisorUserNameGroup = e.supervisorUserNameGroup;
               }
             });
           });
@@ -558,7 +560,9 @@ export default {
             taxRate: 0,
             unit: e.unit,
             remarks: null,
-            $cellEdit: false
+            $cellEdit: false,
+            supervisorUserIdGroup: e.supervisorUserIdGroup,
+            supervisorUserNameGroup: e.supervisorUserNameGroup,
           });
         });
       }

src/views/supplier/detailsInfo.vue

@@ -164,7 +164,7 @@
         </basic-container>
     </div>
 </template>
-  
+
 <script>
 import { optionList, sellOption, capitalOption } from "./js/optionList";
 import { getList, getCorpsAll, gainUser, getCorpType, getAllgoods } from "@/api/basicData/salesOrder";
@@ -285,6 +285,13 @@ export default {
         }
     },
     async created() {
+        this.getWorkDicts("payment_status").then(res => {
+          const arr = res.data.data.map(item => {
+            item.dictKey = Number(item.dictKey)
+            return item
+          })
+          this.findObject(this.sellOption.column, "status").dicData = arr
+        });
         this.sellOption = await this.getColumnData(
             this.getColumnName(210.1),
             sellOption
@@ -512,7 +519,7 @@ export default {
     }
 };
 </script>
-  
+
 <style lang="scss" scoped>
 .page-crad ::v-deep .basic-container__card {
     height: 94.2vh;
@@ -555,4 +562,3 @@ export default {
     margin-bottom: 10px;
 }
 </style>
-  

src/views/supplier/js/optionList.js

@@ -398,19 +398,30 @@ export const sellOption = {
       search: true,
       index: 8
     },
+    // {
+    //   label: "付款状态",
+    //   prop: "status",
+    //   type: 'select',
+    //   index: 9
+    // },
     {
       label: "付款状态",
       prop: "status",
       type: 'select',
+      dicData:[],
+      props: {
+        label: "dictValue",
+        value: "dictKey"
+      },
       index: 9
     },
-    {
-      label: "送货状态",
-      prop: "status",
-      type: 'select',
-      search: true,
-      index: 10
-    },
+    // {
+    //   label: "送货状态",
+    //   prop: "status",
+    //   type: 'select',
+    //   search: true,
+    //   index: 10
+    // },
     {
       label: "产品",
       prop: "cname",
@@ -524,4 +535,4 @@ export const capitalOption = {
       overHidden: true
     }
   ]
-}
+}

src/views/system/user.vue

@@ -90,6 +90,13 @@
                     slot="userTypeName">
             <el-tag>{{row.userTypeName}}</el-tag>
           </template>
+
+
+          <template slot-scope="{row}"
+                    slot="workingStatus">
+            <div :style="row.workingStatus == 1 ? 'color: red;' : ''">{{row.workingStatus == 0 ? '启用' : '禁用'}}</div>
+          </template>
+
         </avue-crud>
         <el-dialog title="用户角色配置"
                    append-to-body
@@ -345,6 +352,24 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "用户状态",
+              prop: "workingStatus",
+              type: "select",
+              dicData: [
+                {
+                  label: "启用",
+                  value: '0'
+                },
+                {
+                  label: "禁用",
+                  value: '1'
+                }
+              ],
+              hide: false,
+              slot: true,
+              display: false
+            },
           ],
           group: [
             {
@@ -495,6 +520,22 @@
                   hide: true
                 },
                 {
+                  label: "用户状态",
+                  prop: "workingStatus",
+                  type: "select",
+                  dicData: [
+                    {
+                      label: "启用",
+                      value: '0'
+                    },
+                    {
+                      label: "禁用",
+                      value: '1'
+                    }
+                  ],
+                  hide: true
+                },
+                {
                   label: "账号状态",
                   prop: "statusName",
                   hide: true,
@@ -1008,6 +1049,9 @@
       },
       beforeOpen(done, type) {
         if (["edit", "view"].includes(type)) {
+          if (localStorage.getItem('roleName').indexOf('admin') == -1) {
+            this.findObject(this.option.group, "workingStatus").disabled = true;
+          }
           getUser(this.form.id).then(res => {
             this.form = res.data.data;
             if(this.form.hasOwnProperty("deptId")){

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -1695,6 +1695,9 @@ export default {
                                 done();
                             } else {
                                 this.$message.error('请选择仓库')
+                                this.$set(this.optionForm, 'disabled', false)
+                                this.$set(this.optionContactsBack, 'disabled', false)
+                                loading.close();
                             }
                         })
                     }