Merge branch 'pre-production'

src/option/factory/mt/factoryOrderMain.js

@@ -46,6 +46,7 @@ export default {
     {
       label: "仓库类型",
       prop: "warehouseType",
+      search:true,
       type: "input",
     },
     {
@@ -141,10 +142,34 @@ export default {
       viewDisplay: false,
       hide: true,
     },
+
+
     {
       label: "推送状态",
       prop: "pushStatusName",
+      search: true,
+      type: 'select',
+      dicData: [
+       
+        {
+          label: '已推送',
+          value: 1,
+        },
+        {
+          label: '未推送',
+          value: 2,
+        }
+    
+      ],
+    },
+    {
+      label: "推送时间",
+      prop: "pushTime",
       type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: false,
     },
   ]
 }

src/option/factory/mt/packageInfo.js

@@ -32,6 +32,7 @@ export default {
     {
       label: "订单自编码",
       prop: "orderCode",
+      search: true,
       type: "input",
     },
     {
@@ -52,6 +53,8 @@ export default {
     {
       label: "包装编号",
       prop: "packageCode",
+      search: true,
+
       type: "input",
     },
     {
@@ -88,8 +91,31 @@ export default {
     {
       label: "推送状态",
       prop: "pushStatusName",
+      search: true,
+      type: 'select',
+      dicData: [
+       
+        {
+          label: '已推送',
+          value: 1,
+        },
+        {
+          label: '未推送',
+          value: 2,
+        }
+    
+      ],
+    },
+    {
+      label: "推送时间",
+      prop: "pushTime",
       type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay:true,
+      hide: false,
     },
+ 
     {
       label: "创建人",
       prop: "createUser",

src/page/login/index.vue

@@ -6,32 +6,15 @@
           {{ time }}
         </div>
         <p class="title">{{ $t('login.info') }}</p>
-        <!-- <div style="font-size: 15px">
-          <span>----------------------------------------------</span>
-          <br />
-          <span>管理租户编号：000000</span>
-          <br />
-          <span>超级管理员账号: admin / admin</span>
-          <br />
-          <span>人事账号: hr / hr</span>
-          <br />
-          <span>经理账号: manager / manager</span>
-          <br />
-          <span>老板账号: boss / boss</span>
-          <br />
-          <span>----------------------------------------------</span>
-          <br />
-          <span>普通租户编号：详见租户管理模块</span>
-          <br />
-          <span>租户管理员账号: admin / admin</span>
-          <br />
-          <span>----------------------------------------------</span>
-        </div> -->
-        <!--<img class="img" src="/img/logo.png" alt="">-->
+   
+        <!-- <img class="img" src="/img/logo.png" alt=""> -->
       </div>
       <div class="login-border">
+      
+
         <div class="login-main">
           <h4 class="login-title">
+            
             {{ $t('login.title') }}{{ website.title }}
             <top-lang></top-lang>
           </h4>

src/views/distribution/inventory/distributionStockListDetails.vue

@@ -87,7 +87,7 @@
           <template #default="slotProps">
           </template>
         </tablecmt>
-            
+
             <div class="avue-crud__pagination" style="width:100%">
               <!-- 分页模块 -->
               <el-pagination align="right"
@@ -106,7 +106,7 @@
           <el-tab-pane label="出库明细" name="outbound">
             <tablecmt
           :columnList="columnListarrs.columnDetails"
-          :tableData="data"
+          :tableData="data1"
           :loading="loading"
           @inputTxt="inputsc"
           @timeCheck="timesc"
@@ -134,7 +134,7 @@
           <el-tab-pane label="入库明细" name="enter">
             <tablecmt
           :columnList="columnListarrs.columnWarehousing"
-          :tableData="data"
+          :tableData="data2"
           :loading="loading"
           @inputTxt="inputsc"
           @timeCheck="timesc"
@@ -261,8 +261,8 @@ export default {
           head: false,
         },
         {
-          prop: 'cargoNumber',
-          label: '运单编号',
+          prop: 'brandName',
+          label: '品牌',
           type: 2,
           values: '',
           width: '150',
@@ -273,7 +273,7 @@ export default {
         },
         {
           prop: 'despatch',
-          label: '物流车次',
+          label: '运单号',
           type: 2,
           values: '',
           width: '150',
@@ -472,7 +472,7 @@ export default {
         },
       ],
       },
-      
+
       height: 0,
       activeName: 'library',
       // 弹框标题

src/views/factory/mt/factoryOrderMain.vue

@@ -321,10 +321,13 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
 
-      const {invoiceOrderCode} = this.query;
+      const {invoiceOrderCode,pushStatusName,warehouseType} = this.query;
+
 
       let values = {
-        invoiceOrderCode:invoiceOrderCode
+        invoiceOrderCode:invoiceOrderCode,
+        pushStatus:pushStatusName,
+        warehouseType:warehouseType
       };
 
       getList(page.currentPage, page.pageSize, values).then(res => {

src/views/factory/mt/packageInfo.vue

@@ -30,9 +30,9 @@
           @click="handleDelete"
           >删 除
         </el-button> -->
-        <el-button type="warning" plain icon="el-icon-download" @click="handleExport"
+        <!-- <el-button type="warning" plain icon="el-icon-download" @click="handleExport"
           >导 出
-        </el-button>
+        </el-button> -->
 
         <el-button type="warning"  @click="handlePush">推送 </el-button>
       </template>
@@ -360,10 +360,13 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
 
-      const { invoiceOrderCode } = this.query;
-
+      const { invoiceOrderCode,pushStatusName,orderCode,packageCode } = this.query;
+      
       let values = {
         invoiceOrderCode: invoiceOrderCode,
+        pushStatus:pushStatusName,
+        orderCode:orderCode,
+        packageCode:packageCode,
       };
 
       getList(page.currentPage, page.pageSize, values).then(res => {

src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue

@@ -67,9 +67,9 @@
                 clearable
               >
                 <el-option
-                  v-for="item in optionCodes"
+                  v-for="item in options"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.code"
                   :value="item.value"
                 />
               </el-select>
@@ -522,6 +522,7 @@ export default {
         packagingSpecifications: [{ required: true, message: '请输入包装规格', trigger: 'change' }],
         createInventory: [{ required: true, message: '请输入入库数量', trigger: 'change' }],
         productUnit: [{ required: true, message: '请选择物品单位', trigger: 'change' }],
+        actualReceipt: [{ required: true, message: '请选择产品品牌', trigger: 'blur' }],
         brandId: [{ required: true, message: '请选择品牌', trigger: 'change' }],
 
         receiptBatch: [{ required: true, message: '请填写入库批次', trigger: 'blur' }],
@@ -596,6 +597,7 @@ export default {
 
         this.options.push({
           label: da.customerName,
+          code: da.customerCode,
           value: da.clientId,
         });
         this.optionCodes.push({
@@ -726,10 +728,12 @@ export default {
       if (query) {
         console.log('客户ID', this.form.clientId);
         if (!!this.form.clientId) {
+          this.brandList = [];
           let si = !!this.form.storeId ? this.form.storeId : this.form.clientId;
           let cl = await getListIdsName(this.page.currentPage, this.page.pageSize, {
             brandName: query,
             ids: si,
+            type: !!this.form.storeId ? 2 : 1
           });
           console.log('>>>>', cl.data.data);
           cl.data.data.forEach(i => {
@@ -770,22 +774,24 @@ export default {
       if (num == 1) {
         const obj = this.options.find(item => item.value === row);
         console.log('obj>>>>>>>>>>>', obj);
-        this.optionCodes = [
+        this.options = [
           {
             key: obj.value,
             value: obj.value,
-            label: obj.code,
+            label: obj.label,
+            code: obj.code,
           },
         ];
-        this.form.clientCode = obj.value;
+        this.form.customerCode = obj.code;
       } else {
-        const obj = this.optionCodes.find(item => item.value === row);
+        const obj = this.options.find(item => item.value === row);
         console.log('obj>>>>>>>>>>>', obj);
         this.options = [
           {
             key: obj.value,
             value: obj.value,
-            label: obj.code,
+            label: obj.label,
+            code: obj.code,
           },
         ];
         this.form.clientId = obj.value;
@@ -796,14 +802,7 @@ export default {
         // console.log(">><><><<>",i);
         if (i.value == row) {
           this.form.customerName = i.label;
-          //查询客户服务类型
-          aa = i.value;
-        }
-      });
-      this.optionCodes.some(i => {
-        console.log('>><><><<>', i);
-        if (i.value == row) {
-          this.form.clientCode = i.label;
+          this.form.clientCode = i.code;
           //查询客户服务类型
           aa = i.value;
         }
@@ -862,6 +861,7 @@ export default {
       if (query) {
         // this.loading = true;
         this.options = [];
+        this.form.customerCode = null;
         let cl = await getListClient(this.page.currentPage, this.page.pageSize, {
           clientName: query,
         });
@@ -888,18 +888,19 @@ export default {
     async remoteCodeMethod(query) {
       if (query) {
         // this.loading = true;
-        this.optionCodes = [];
+        this.options = [];
+        this.form.clientId = null;
         let cl = await getListClient(this.page.currentPage, this.page.pageSize, {
           clientCode: query,
         });
         console.log('客户信息1234>>>>', cl.data.data.records);
         cl.data.data.records.forEach(i => {
           let st = {
-            label: i.clientCode,
+            label: i.clientName,
             value: i.id,
-            code: i.clientName,
+            code: i.clientCode,
           };
-          this.optionCodes.push(st);
+          this.options.push(st);
         });
         // setTimeout(() => {
         //   this.loading = false
@@ -908,7 +909,7 @@ export default {
         //   })
         // }, 200)
       } else {
-        this.optionCodes = [];
+        this.options = [];
       }
     },
     handleEditOwn(row) {
@@ -1088,7 +1089,29 @@ export default {
       this.title = '新增';
       // this.form = {}
       this.box = true;
-      //查询物料
+      //查询品牌
+     this.getBingPai();
+    },
+    async getBingPai(){
+      console.log('客户ID', this.form.clientId);
+      this.brandList = [];
+      if (!!this.form.clientId) {
+        let si = !!this.form.storeId ? this.form.storeId : this.form.clientId;
+        let cl = await getListIdsName(this.page.currentPage, this.page.pageSize, {
+          ids: si,
+          type: !!this.form.storeId ? 2 : 1
+        });
+        console.log('>>>>', cl.data.data);
+        cl.data.data.forEach(i => {
+          let st = {
+            label: i.brandName,
+            value: i.id,
+          };
+          this.brandList.push(st);
+        });
+      } else {
+        this.$message.warning('请先填写客户信息，产品品牌信息才能带出！！');
+      }
     },
     handleEdit(row) {
       this.title = '编辑';