修改禅道问题

src/router/views/index.js

@@ -4248,16 +4248,16 @@ export default [{
   }]
 },
 {
-  path: '/tirePartsMall/statisticAnalysis/statisticalAllocation/index',
+  path: '/tirePartsMall/financialManagement/statisticalAllocation/index',
   component: Layout,
   hidden: true,
   children: [{
-    path: '/tirePartsMall/statisticAnalysis/statisticalAllocation/index',
-    name: '统计调拨',
+    path: '/tirePartsMall/financialManagement/statisticalAllocation/index',
+    name: '统计调拨(L)',
     meta: {
       keepAlive: true,
     },
-    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/statisticAnalysis/statisticalAllocation/index')
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/financialManagement/statisticalAllocation/index')
   }]
 },
 ]

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -627,7 +627,7 @@
                 >删除
               </el-button>
               <el-button
-                v-if="isDisabled"
+                v-if="isDisabled&&tenantId!='681169'"
                 type="primary"
                 icon="el-icon-plus"
                 size="small"
@@ -1161,6 +1161,7 @@ export default {
   },
   data() {
     return {
+      tenantId:null,
       synchronizeDialog: false,
       synchronizeId: null,
       treeDataSynchronize: [],
@@ -2201,6 +2202,7 @@ export default {
   },
   //初始化查询
   async created() {
+    this.tenantId = this.$store.getters.userInfo.tenant_id;
     this.rowHeight = window.innerHeight - 130 + "px";
     this.customerContact = await this.getColumnData(this.getColumnName(15), customerContact);
     this.getWorkDicts("payment_term").then(res => {
@@ -4100,28 +4102,28 @@ export default {
         }
       });
     },
-      validateInventoryAndPrice() {
-          const data = this.goodsActives === "gift" ? this.contactsData : this.goodsShowData;
-          for (let i = 0; i < data.length; i++) {
-              const item = data[i];
-              if (Number(item.orderQuantity) > Number(item.storageQuantity)) {
-                  return this.$message.error(`商品信息第${i + 1}行订货数量大于库存数量`);
-              }
-              if (!Number(item.purchaseAmount)) {
-                  return this.$message.error(`商品信息第${i + 1}行采购价格不能为空`);
-              }
-              if (Number(item.purchaseAmount) === 0) {
-                  return this.$message.error(`商品信息第${i + 1}行采购价格不能为0`);
-              }
-          }
-      },
-      //修改提交触发
+    validateInventoryAndPrice() {
+      const data = this.goodsActives === "gift" ? this.contactsData : this.goodsShowData;
+      for (let i = 0; i < data.length; i++) {
+        const item = data[i];
+        if (Number(item.orderQuantity) > Number(item.storageQuantity)) {
+          return this.$message.error(`商品信息第${i + 1}行订货数量大于库存数量`);
+        }
+        if (!Number(item.purchaseAmount)) {
+          return this.$message.error(`商品信息第${i + 1}行采购价格不能为空`);
+        }
+        if (Number(item.purchaseAmount) === 0) {
+          return this.$message.error(`商品信息第${i + 1}行采购价格不能为0`);
+        }
+      }
+    },
+    //修改提交触发
     async editCustomer(isBack = false, type, other) {
       this.$refs["form"].validate(async valid => {
         if (valid) {
           console.log(this.contactsData);
           const length1 = this.goodsActives === "goods" ? this.giftData : this.goodsShowData;
-            const length = this.goodsActives === "gift" ? this.contactsData.length : this.goodsShowData.length;
+          const length = this.goodsActives === "gift" ? this.contactsData.length : this.goodsShowData.length;
           for (let i = 0; i < length; i++) {
             const data = this.goodsActives === "gift" ? this.contactsData : this.goodsShowData;
             if (Number(data[i].orderQuantity) > Number(data[i].storageQuantity)) {
@@ -4808,7 +4810,7 @@ export default {
       if (!this.form.id) {
         return this.editCustomer(false, "", "check");
       }
-/*      this.validateInventoryAndPrice()
+      /*      this.validateInventoryAndPrice()
         let goodsData = this.form.orderItemsList.filter(item => item.goodType == 0);
         for (let item in goodsData) {
             if (Number(goodsData[item].orderQuantity) > Number(goodsData[item].storageQuantity)) {

src/views/tirePartsMall/financialManagement/collectionSettlement/index.vue

@@ -79,9 +79,10 @@ export default {
         align: "center",
         size: "small",
         menuWidth: 50,
-        searchSpan: 8,
+        searchSpan: 6,
+        searchMenuSpan: 6,
         searchIcon: true,
-        searchIndex: 5,
+        searchIndex: 3,
         highlightCurrentRow: true,
         dialogWidth: "70%",
         column: [{
@@ -455,4 +456,7 @@ export default {
         margin-bottom: 0px;
     }
 }
+/deep/ .el-col-md-8 {
+  width: 24.33333%;
+}
 </style>

src/views/tirePartsMall/financialManagement/paymentSettlement/index.vue

@@ -69,9 +69,10 @@ export default {
         align: "center",
         size: "small",
         menuWidth: 50,
-        searchSpan: 8,
+        searchSpan: 6,
+        searchMenuSpan: 12,
         searchIcon: true,
-        searchIndex: 5,
+        searchIndex: 3,
         highlightCurrentRow: true,
         dialogWidth: "70%",
         column: [{
@@ -332,4 +333,8 @@ export default {
 }
 </script>
 
-<style scoped></style>
+<style scoped>
+/deep/ .el-col-md-8 {
+  width: 24.33333%;
+}
+</style>

src/views/tirePartsMall/statisticAnalysis/statisticalAllocation/index.vue → src/views/tirePartsMall/financialManagement/statisticalAllocation/index.vue

@@ -23,7 +23,7 @@
           </el-table>
         </template>
         <template slot="menuLeft">
-          <el-button type="info" size="small" @click="outExport" icon="el-icon-download">导出</el-button>
+          <el-button type="success" size="small" @click="outExport" icon="el-icon-download">导出</el-button>
         </template>
       </avue-crud>
     </basic-container>
@@ -59,7 +59,9 @@ export default {
       ],
       commodityData: [], // 合计数据
       form: {},
-      search: {},
+      query: {
+        statusName: "确认调拨"
+      },
       dataList: [],
       loading: false,
       page: {
@@ -79,16 +81,15 @@ export default {
         editBtn: false,
         delBtn: false,
         searchSpan: 6,
-        searchMenuSpan: 18,
+        searchMenuSpan: 24,
         searchIcon: true,
         searchIndex: 3,
-        emptyBtnText: "清空所有条件",
         menu: false,
         column: [
           {
             label: "业务编号",
             prop: "billno",
-            width: 100,
+            width: 140,
             search: true,
             overHidden: true
           },
@@ -114,7 +115,6 @@ export default {
             type: "select",
             filterable: true,
             remote: true,
-            type: "select",
             props: {
               label: "cname",
               value: "cname",
@@ -199,24 +199,25 @@ export default {
             width: 120,
             overHidden: true
           },
+          // {
+          //   label: "库管",
+          //   prop: "stockClerkId",
+          //   width: 100,
+          //   search: true,
+          //   type: "select",
+          //   props: {
+          //     label: "realName",
+          //     value: "id"
+          //   },
+          //   dicUrl: "/api/blade-user/stockClerkList",
+          //   hide:true,
+          //   overHidden: true
+          // },
           {
-            label: "库管",
-            prop: "stockClerkId",
-            width: 100,
-            search: true,
-            type: "select",
-            props: {
-              label: "realName",
-              value: "id"
-            },
-            dicUrl: "/api/blade-user/stockClerkList",
-            hide:true,
-            overHidden: true
-          },
-          {
-            label: "已出仓",
+            label: "调拨状态",
             prop: "statusName",
             search: true,
+            searchValue: "确认调拨",
             type: "select",
             dicData: [
               {
@@ -247,8 +248,8 @@ export default {
       return "padding:0;height:40px;";
     },
     searchReset() {
-      this.search = this.$options.data().search;
-      this.onLoad(this.page);
+      this.query = this.$options.data().query;
+      this.onLoad(this.page,this.query );
     },
     //点击搜索按钮触发
     searchChange(params, done) {
@@ -258,7 +259,7 @@ export default {
       done();
     },
     refreshChange() {
-      this.onLoad(this.page, this.search);
+      this.onLoad(this.page, this.query);
     },
     currentChange(val) {
       this.page.currentPage = val;
@@ -272,7 +273,7 @@ export default {
       obj = {
         ...Object.assign(params, this.query)
       };
-      this.loading=true
+      this.loading = true;
       transferDetail(page.currentPage, page.pageSize, obj)
         .then(res => {
           this.dataList = res.data.data.records;

src/views/tirePartsMall/inventory/index.vue

@@ -351,6 +351,7 @@ export default {
                 value: "1"
               }
             ],
+            hide:true,
             searchValue: "1"
           },
           {

src/views/tirePartsMall/purchasingManagement/financingProcurement/detailsPage.vue

@@ -124,18 +124,24 @@
               :remote="true"
               dataName="cname"
               @selectChange="dicChange('fundingPartyName', $event)"
-              :disabled="editButton"
+              :disabled="editButton || isContacts"
             ></dic-select>
           </tempalte>
           <tempalte slot="refno" slot-scope="{ row }">
-            <el-input placeholder="请输入 参考号" v-model="form.refno"> </el-input>
+            <el-input placeholder="请输入 参考号" v-model="form.refno" :disabled="editButton || isContacts"> </el-input>
           </tempalte>
           <tempalte slot="useAdvanceChargeAmount" slot-scope="{ row }">
-            <el-input-number style="width: 100%;" placeholder="请输入 预付款" v-model="form.useAdvanceChargeAmount" :controls="false">
+            <el-input-number
+              style="width: 100%;"
+              placeholder="请输入 预付款"
+              v-model="form.useAdvanceChargeAmount"
+              :controls="false"
+              :disabled="editButton || isContacts"
+            >
             </el-input-number>
           </tempalte>
           <tempalte slot="remarks" slot-scope="{ row }">
-            <el-input type="textarea" :rows="2" placeholder="请输入 备注" v-model="form.remarks"> </el-input>
+            <el-input type="textarea" :rows="2" placeholder="请输入 备注" v-model="form.remarks" :disabled="editButton || isContacts"> </el-input>
           </tempalte>
         </avue-form>
       </trade-card>
@@ -250,7 +256,7 @@
                 <el-button
                   v-else
                   :size="size"
-                  :disabled="disabled || isAdd||(row.id&&form.status!='录入')"
+                  :disabled="disabled || isAdd || (row.id && form.status != '录入')"
                   :type="type"
                   :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'"
                   @click="hangbaocun(row, index)"

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

@@ -32,7 +32,32 @@
     </div>
     <div style="margin-top: 50px">
       <trade-card title="基础信息">
-        <avue-form :option="optionForm" v-model="form" ref="form"></avue-form>
+        <avue-form :option="optionForm" v-model="form" ref="form">
+          <!-- <template slot="storageName">
+            <dic-select
+              v-model="form.storageName"
+              placeholder="仓库"
+              key="id"
+              label="cname"
+              url="/blade-sales-part/storageDesc/listAll"
+              :filterable="true"
+              @selectChange="dicChange('storageName', $event)"
+            ></dic-select>
+          </template>
+          <template slot="stockClerkName">
+            <dic-select
+              v-model="form.stockClerkName"
+              placeholder="库管"
+              key="id"
+              label="realName"
+              url="/blade-user/stockClerkList"
+              :filterable="true"
+              :remote="true"
+              dataName="realName"
+              @selectChange="dicChange('stockClerkName', $event)"
+            ></dic-select>
+          </template> -->
+        </avue-form>
       </trade-card>
       <trade-card title="明细信息">
         <el-tabs v-model="activeName" type="card">
@@ -187,6 +212,7 @@ import { dotList } from "@/api/tirePartsMall/purchasingManagement/warehouseEntry
 import { getParamservice } from "@/api/tirePartsMall/purchasingManagement/warehouseEntryOrder";
 import { isProcurement } from "@/api/basicData/configuration";
 import viewArea from "./components/viewArea.vue";
+import dicSelect from "@/components/dicSelect/main";
 export default {
   name: "detailsPage",
   data() {
@@ -250,8 +276,8 @@ export default {
           {
             label: "库管",
             prop: "stockClerkId",
-            type: "select",
             disabled: false,
+            type: "select",
             props: {
               label: "realName",
               value: "id"
@@ -589,7 +615,8 @@ export default {
   },
   components: {
     reportDialog,
-    viewArea
+    viewArea,
+    dicSelect
   },
   props: {
     detailData: Object
@@ -632,6 +659,24 @@ export default {
     });
   },
   methods: {
+    dicChange(name, row) {
+      if (name == "storageName") {
+        if (row) {
+          this.form.storageId = row.id;
+        } else {
+          this.form.storageId = null;
+          this.form.storageName = null;
+        }
+      }
+      if (name == "stockClerkName") {
+        if (row) {
+          this.form.stockClerkId = row.id;
+        } else {
+          this.form.stockClerkId = null;
+          this.form.stockClerkName = null;
+        }
+      }
+    },
     rowDelArea(row, index) {
       if (row.historyList.filter(item => item.id).length) {
         this.$confirm("是否撤销库区?", "提示", {