Merge branch 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

src/page/index/tags.vue

@@ -375,6 +375,9 @@ export default {
         if (tag.label == "报销") {
           this.$store.commit('BX_OUT_DETAIL');
         }
+        if (tag.label == "销售订单(D)") {
+          this.$store.commit('JXSSALE_OUT_DETAIL');
+        }
         this.$store.commit("DEL_TAG", tag);
         if (tag.value === this.tag.value) {
           tag = this.tagList[key === 0 ? key : key - 1]; //如果关闭本标签让前推一个

src/router/views/index.js

@@ -1319,4 +1319,19 @@ export default [{
       component: () => import( /* webpackChunkName: "views" */ '@/views/workManagement/handoverSheet/index')
     }]
   },
+  //经销商产品调拨
+  {
+    path: '/dealer/allocation/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/dealer/allocation/index',
+      name: '产品调拨',
+      meta: {
+        i18n: '/dealer/allocation/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/dealer/allocation/index')
+    }]
+  },
 ]

src/store/getters.js

@@ -50,5 +50,6 @@ const getters = {
   officeLyStatus: state => state.ifdetail.officeLyStatus,
   handOverStatus: state => state.ifdetail.handOverStatus,
   reimbursementStatus: state => state.ifdetail.reimbursementStatus,
+  dealerSaleStatus: state => state.ifdetail.dealerSaleStatus,
 }
 export default getters

src/store/modules/ifdetail.js

@@ -24,6 +24,7 @@ const ifdetail = {
     officeLyStatus: false, //办公领用
     handOverStatus: false, // 交接单
     reimbursementStatus: false, // 报销
+    dealerSaleStatus: false, //经销商销售
   },
   actions: {},
   mutations: {
@@ -212,6 +213,13 @@ const ifdetail = {
     BX_OUT_DETAIL(state) {
       state.reimbursementStatus = false;
     },
+    // 经销商销售
+    JXSSALE_IN_DETAIL(state) {
+      state.dealerSaleStatus = true;
+    },
+    JXSSALE_OUT_DETAIL(state) {
+      state.dealerSaleStatus = false;
+    },
     //关闭所有
     DEL_ALL_DETAIL(state) {
       for (let item in state) {
@@ -286,6 +294,18 @@ const ifdetail = {
       if (tag.label == '采购申请') {
         state.officePurchaseStatus = true
       }
+      if (tag.label == '领用') {
+        state.officeLyStatus = true
+      }
+      if (tag.label == '交接单') {
+        state.handOverStatus = true
+      }
+      if (tag.label == '报销') {
+        state.reimbursementStatus = true
+      }
+      if (tag.label == '销售订单(D)') {
+        state.dealerSaleStatus = true
+      }
     }
   }
 

src/views/dealer/allocation/config/mainList.json

@@ -34,7 +34,7 @@
       "search": true
     },
     {
-      "label": "调拨仓库",
+      "label": "现仓库",
       "prop": "allotStorageName",
       "overHidden": true,
       "minWidth": 120,

src/views/dealer/allocation/detail.vue

@@ -73,6 +73,23 @@
           v-model="form"
           :option="option"
         >
+          <template slot="freightUser">
+            <el-select
+              v-model="form.freightUser"
+              filterable
+              clearable
+              size="small"
+              placeholder="请选择"
+              :disabled="disabled || confirmDisabled"
+            >
+              <el-option
+                v-for="(item,index) in userList"
+                :key="index"
+                :label="item.realName"
+                :value="item.realName"
+              ></el-option>
+            </el-select>
+          </template>
           <template slot="createUser">
             <el-select
               v-model="form.createUser"
@@ -281,7 +298,7 @@
     <report-dialog
       :switchDialog="switchDialog"
       :reportId="form.id"
-      reportName="事务-报销单"
+      reportName=""
       @onClose="onClose()"
     />
     <!--    商品弹窗-->
@@ -450,14 +467,15 @@ export default {
             span: 8,
             type: "date",
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
             rules: [
               {
                 required: true,
                 message: " ",
                 trigger: "blur"
               }
-            ]
+            ],
+            disabled: false
           },
           {
             label: "仓管员",
@@ -639,13 +657,13 @@ export default {
     } else {
       getUserInfo().then(res => {
         this.$set(this.form, 'createUser', res.data.data.id);
-        this.$set(this.form, 'userName', res.data.data.realName);
+        // this.$set(this.form, 'userName', res.data.data.realName);
         this.$set(this.form, 'createDept', res.data.data.deptId);
-        this.$set(this.form, 'deptName', res.data.data.deptName);
-        this.$set(this.form, 'postId', res.data.data.postId.split(',')[0]);
-        this.$set(this.form, 'postName', res.data.data.postName.split(',')[0]);
+        // this.$set(this.form, 'deptName', res.data.data.deptName);
+        // this.$set(this.form, 'postId', res.data.data.postId.split(',')[0]);
+        // this.$set(this.form, 'postName', res.data.data.postName.split(',')[0]);
         this.loginUser = res.data.data.realName;
-        this.oldForm = Object.assign({}, this.form);
+        this.oldForm = this.deepClone(this.form);
         this.oldDataList = this.deepClone(this.dataList);
       })
     }
@@ -663,17 +681,11 @@ export default {
     queryData(id) {
       this.pageLoading = true;
       dataDetail(id).then(res => {
-        this.form = res.data.data;
+        this.$set(this,'form',res.data.data)
         this.confirmDisabled = this.form.deliveryStatus === '确认调拨'? true: false;
         this.dataList = this.form.deliveryItemsList? this.form.deliveryItemsList: [];
-        // delete this.form.deliveryItemsList;
-        this.oldForm = {...this.form};
-        this.oldDataList = [...this.dataList];
-        if (this.form.status > 0) {
-          this.option.column.map(e => {
-            this.$set(e, 'disabled', true)
-          })
-        }
+        this.oldForm = this.deepClone(this.form);
+        this.oldDataList = this.deepClone(this.dataList);
       }).finally(() => {
         this.pageLoading = false;
       })
@@ -1099,6 +1111,9 @@ export default {
         confirmAllot(this.form).then(res => {
           this.queryData(this.form.id);
           this.$message.success('调拨成功');
+          this.option.column.map(e => {
+            this.$set(e, 'disabled', true);
+          })
         }).finally(() => {
           this.btnLoading = false;
         })
@@ -1111,6 +1126,11 @@ export default {
       repealAllot(this.form).then(res => {
         this.queryData(this.form.id);
         this.$message.success('撤销成功');
+        this.option.column.map(e => {
+          if (e.prop != 'sysNo' && e.prop != 'createTime' && e.prop != 'deliveryStatus') {
+            this.$set(e, 'disabled', false);
+          }
+        })
       }).finally(() => {
         this.btnLoading = false;
       })

src/views/dealer/stock/index.vue

@@ -63,7 +63,7 @@
           </el-button>
         </template>
       </avue-crud>
-      <el-dialog title="导入价格"
+      <el-dialog title="导入库存"
                  append-to-body
                  :visible.sync="excelBox"
                  width="555px">
@@ -166,7 +166,6 @@ export default {
       });
     },
     uploadAfter(res, done, loading, column) {
-      console.log(res)
       window.console.log(column);
       this.excelBox = false;
       this.page.currentPage = 1;
@@ -267,10 +266,12 @@ export default {
       // this.show = false;
     },
     statement() {
-      this.statementData = {...this.search}
-      this.statementData.createStartTime = this.statementData.createTime[0]+ " " + "00:00:00"
-      this.statementData.createEndTime = this.statementData.createTime[1]+ " " + "23:59:59"
-      delete this.statementData.createTime
+      this.statementData = {...this.search};
+      if (this.statementData.createTime && this.statementData.createTime.length > 0) {
+        this.statementData.createStartTime = this.statementData.createTime[0]+ " " + "00:00:00"
+        this.statementData.createEndTime = this.statementData.createTime[1]+ " " + "23:59:59"
+        delete this.statementData.createTime
+      }
       this.switchDialog = !this.switchDialog;
     },
     onClose(val) {

src/views/reimbursement/detail.vue

@@ -343,7 +343,7 @@ export default {
             span: 8,
             type: "date",
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
             rules: [
               {
                 required: true,

src/views/saleLeads/detail.vue

@@ -283,7 +283,7 @@ export default {
             span: 8,
             type: "date",
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
             rules: [
               {
                 required: true,

src/views/workManagement/handoverSheet/detail.vue

@@ -305,7 +305,7 @@ export default {
             span: 8,
             type: "date",
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
             rules: [
               {
                 required: true,

src/views/workManagement/purchaseApply/detail.vue

@@ -464,7 +464,7 @@ export default {
             span: 6,
             type: "date",
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
             rules: [
               {
                 required: true,

src/views/workManagement/requisition/detail.vue

@@ -458,7 +458,7 @@ export default {
             span: 8,
             type: "date",
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
             rules: [
               {
                 required: true,

src/views/workManagement/warehousing/detail.vue

@@ -435,7 +435,7 @@ export default {
             span: 8,
             type: "date",
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
             rules: [
               {
                 required: true,