仓储模块修改

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -430,7 +430,21 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="仓库" prop="fWarehouseid">
-              <treeselect style="width:80%" v-model="form.fWarehouseid" :options="warehousesOptions" :show-count="true" placeholder="请选择归属库区" />
+              <el-select
+                v-model="form.fWarehouseid"
+                filterable
+                :disabled="notChange || formBrowseStatus"
+                remote
+                style="width: 80%"
+                :remote-method="warehouseRemoteMethod"
+                placeholder="请选择仓库">
+                <el-option
+                  v-for="(dict, index) in warehouseOptions"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -562,8 +576,13 @@
         <el-button type="primary" :disabled="browseStatus" @click="saveForm">保 存</el-button>
         <el-button type="primary" :disabled="notChange" @click="submitForm">请 核</el-button>
       </el-form>
+
+      <el-collapse v-model="activeNames">
+        <el-collapse-item name="1">
+        <template slot="title">
+          <i class="el-icon-s-home"></i>货转明细
+        </template>
       <div class="dialogTableTitle flex a-center jlr">
-        <h3>货转明细</h3>
         <el-button :disabled="browseStatus" @click.prevent="addRelevant()"
         >新增
         </el-button
@@ -602,6 +621,31 @@
           label="品名"
         >
         </el-table-column>
+
+        <el-table-column
+          prop="fBsdate"
+          header-align="center"
+          align="center"
+          width="150px"
+          label="货转日期"
+        >
+          <template slot-scope="scope">
+            <el-date-picker
+              v-model="scope.row.fBsdate"
+              style="width: 138px"
+              :disabled="
+                    browseStatus ||
+                    scope.row.fBillstatus === 20 ||
+                    scope.row.fBillstatus === 30 ||
+                    scope.row.fBillstatus === 40
+                  "
+              type="date"
+              value-format="timestamp"
+              placeholder="货转日期"
+            >
+            </el-date-picker>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="fMarks"
           header-align="center"
@@ -845,8 +889,14 @@
           </template>
         </el-table-column>
       </el-table>
+      </el-collapse-item>
+
+
+      <el-collapse-item>
+        <template slot="title">
+          <i class="el-icon-s-order"></i>附件上传
+        </template>
       <div class="dialogTableTitle flex a-center jlr">
-        <h3>附件上传</h3>
         <el-button :disabled="browseStatus" @click.prevent="addRelevt()"
         >新增
         </el-button>
@@ -939,8 +989,14 @@
           </template>
         </el-table-column>
       </el-table>
+      </el-collapse-item>
+
+
+      <el-collapse-item>
+        <template slot="title">
+          <i class="el-icon-circle-plus"></i>收款信息
+        </template>
       <div class="dialogTableTitle flex a-center jlr">
-        <h3>收款信息</h3>
         <el-button :disabled="browseStatus" @click.prevent="addCollection()"
         >新增
         </el-button>
@@ -1217,8 +1273,14 @@
           </template>
         </el-table-column>
       </el-table>
+      </el-collapse-item>
+
+
+      <el-collapse-item>
+        <template slot="title">
+          <i class="el-icon-remove"></i>付款信息
+        </template>
       <div class="dialogTableTitle flex a-center jlr">
-        <h3>付款信息</h3>
         <el-button :disabled="browseStatus" @click.prevent="addpayment()"
         >新增
         </el-button>
@@ -1497,6 +1559,9 @@
           </template>
         </el-table-column>
       </el-table>
+      </el-collapse-item>
+      </el-collapse>
+
       <div slot="footer" class="dialog-footer">
         <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
         <approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"></approval-comments>
@@ -1636,8 +1701,9 @@
     },
     data() {
       return {
+        activeNames:['1'],
         //仓库树状图
-        warehousesOptions:undefined,
+        warehousesOptions:[],
         Lander:'',
         Operator:'',
         colseButton:true,
@@ -2095,6 +2161,7 @@
         setTimeout(() => {
           for (let whgen in this.dialogWhgenlegList) {
             this.dataList.push({
+              fBsdate:this.form.fBsdate,
               fId: null,
               fQty: 0,
               fCntqty: 1,
@@ -2745,6 +2812,7 @@
               this.$set(this.form, 'fChargedate', Date.parse(this.form.fChargedate))
               this.dataList = response.data.warehousebillsitems
               for (let li in this.dataList) {
+                this.$set(this.dataList[li], 'fBsdate', Date.parse(this.dataList[li].fBsdate))
                 this.$set(this.dataList[li], 'fBusinessType', this.dataList[li].fBusinessType + '')
               }
             })
@@ -3044,4 +3112,14 @@
   .el-form-item__label {
     font-size: 12px !important;
   }
+
+  .el-collapse-item__header{
+    font-size: 16px;
+    font-weight: bolder;
+    padding-left: 5px;
+  }
+
+  .el-icon-s-home,.el-icon-s-order,.el-icon-circle-plus,.el-icon-remove{
+    padding-right: 5px;
+  }
 </style>

src/views/warehouseBusiness/inStock/index.vue

@@ -374,7 +374,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="货权方" prop="fCorpid">
+            <el-form-item label="货1权方" prop="fCorpid">
               <el-select
                 v-model="form.fCorpid"
                 filterable
@@ -461,7 +461,17 @@
 
           <el-col :span="8">
             <el-form-item label="仓库" prop="fWarehouseid">
-              <treeselect style="width:80%" v-model="form.fWarehouseid" :options="warehousesOptions" :show-count="true" placeholder="请选择归属库区" />
+              <el-select
+                v-model="form.fWarehouseid"
+                placeholder="请输入模糊查找"
+              >
+                <el-option
+                  v-for="(dict, index) in Options"
+                  :key="index.userName"
+                  :label="dict.nickName"
+                  :value="dict.userName"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -621,31 +631,48 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="劳务公司" prop="labour">
-              <el-input
+            <el-form-item label="劳务公司" prop="fLabour">
+              <el-select
                 style="width: 80%"
-                v-model="form.labour"
-
+                v-model="form.fLabour"
+                @keyup.enter.native="handleQuery"
+                :remote-method="flabourRemoteMethod"
+                filterable
                 :disabled="browseStatus"
-                placeholder="请输入劳务公司"
-              />
+                placeholder="请输入劳务公司">
+                <el-option
+                  v-for="(dict, index) in fMblnoOptions"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="车队" prop="fleet"
+            <el-form-item label="车队" prop="fFleet"
                 :rules="{
               required: isrequired === 1 ? true : false,
            message: '请选择',
            trigger: ['blur', 'change']
             }"
             >
-              <el-input
+              <el-select
                 style="width: 80%"
-                v-model="form.fleet"
-
+                v-model="form.fFleet"
+                filterable
+                @keyup.enter.native="handleQuery"
+                :remote-method="fleetRemoteMethod"
                 :disabled="browseStatus"
-                placeholder="请输入车队"
-              />
+                placeholder="请输入车队">
+
+                <el-option
+                  v-for="(dict, index) in fMblnoOptions"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -1104,27 +1131,29 @@
                 align="center"
                 label="*库位"
               >
-                <template slot-scope="scope">
-                  <el-select
-                    v-model="scope.row.fWarehouselocid"
-                    filterable
-                    remote
-                    :disabled="
-                    browseStatus ||
-                    scope.row.fBillstatus === 20 ||
-                    scope.row.fBillstatus === 30 ||
-                    scope.row.fBillstatus === 40
-                  "
-                    placeholder="请选择库位"
-                  >
-                    <el-option
-                      v-for="(dict, index) in kqhouseOptions"
-                      :key="index.fId"
-                      :label="dict.fName"
-                      :value="dict.fId"
-                    ></el-option>
-                  </el-select>
-                </template>
+                <treeselect :disabled="browseStatus" style="width:80%" v-model="form.fWarehouselocid" :options="warehousesOptions" :show-count="true" placeholder="请选择归属库区" />
+
+                <!--                <template slot-scope="scope">-->
+<!--                  <el-select-->
+<!--                    v-model="scope.row.fWarehouselocid"-->
+<!--                    filterable-->
+<!--                    remote-->
+<!--                    :disabled="-->
+<!--                    browseStatus ||-->
+<!--                    scope.row.fBillstatus === 20 ||-->
+<!--                    scope.row.fBillstatus === 30 ||-->
+<!--                    scope.row.fBillstatus === 40-->
+<!--                  "-->
+<!--                    placeholder="请选择库位"-->
+<!--                  >-->
+<!--                    <el-option-->
+<!--                      v-for="(dict, index) in kqhouseOptions"-->
+<!--                      :key="index.fId"-->
+<!--                      :label="dict.fName"-->
+<!--                      :value="dict.fId"-->
+<!--                    ></el-option>-->
+<!--                  </el-select>-->
+<!--                </template>-->
               </el-table-column>
               <el-table-column
                 prop="fcntrtype"
@@ -2870,7 +2899,7 @@ export default {
   data() {
     return {
       // 部门树选项
-      warehousesOptions: undefined,
+      warehousesOptions:[],
       activeNames:['1'],
       isrequired:2,
       isrequired_s:2,
@@ -3098,6 +3127,8 @@ export default {
       approVal:false,
       // 表单参数
       form: {
+        fLabour:null,
+        fFleet:null,
         fBusinessType:null,
         fItemsStatus: null,
         fFeetunit: '2'
@@ -3123,6 +3154,7 @@ export default {
         fBsdate: [{ required: true, message: " ", trigger: "blur" }],
         fTrademodeid: [{ required: true, message: " ", trigger: "blur" }],
         fSbu: [{ required: true, message: " ", trigger: "blur" }],
+        fBusinessType:[{ required: true, message: " ", trigger: "blur" }],
         fStorekeeper: {
           required: true,
           message: " ",
@@ -3192,6 +3224,9 @@ export default {
   activated() {
     this.adoPt()
   },
+  watch:{
+    'form.fWarehouseid' : 'warehouseMethod'
+  },
   methods: {
     /** 查询部门下拉树结构 */
     getTreeselect() {
@@ -3549,7 +3584,7 @@ export default {
           return false
         }
         if (!this.form.fBusinessType) {
-          this.$message.error('请选择货物属性!')
+          this.$message.error('请选择作业类型!')
           return false
         }
         for (let li in this.Printinglist) {
@@ -3774,7 +3809,7 @@ export default {
       this.weightList = false;
       // this.contrOl = true
       // 查询库区下 所有库位
-      this.warehouseMethod();
+      // this.warehouseMethod();
     },
     /* 所有库位信息 */
     warehouseMethod() {
@@ -3786,8 +3821,6 @@ export default {
     },
 
 
-
-
     // 导入付款信息
     whgenlegData() {
       if (this.dialogWhgenlegList.length === 0) {
@@ -4810,6 +4843,26 @@ export default {
         this.fWbuOptions = response.rows;
       });
     },
+    /* 远程模糊查询劳务公司 */
+    flabourRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      let queryParams = { pageNum: 1, pageSize: 10, fName: name, fTypeid: 6};
+      listCorps(queryParams).then((response) => {
+        this.fSbuOptions = response.rows;
+      });
+    },
+    /* 远程模糊查询车队 */
+    fleetRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      let queryParams = { pageNum: 1, pageSize: 10, fName: name, fTypeid: 2};
+      listCorps(queryParams).then((response) => {
+        this.fSbuOptions = response.rows;
+      });
+    },
     /* 远程模糊查询经营单位 */
     fSbuRemoteMethod(name) {
       if (name == null || name === "") {

src/views/warehouseBusiness/outStock/index.vue

@@ -446,7 +446,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="仓库" prop="fWarehouseid">
-              <treeselect style="width:80%" v-model="form.fWarehouseid" :options="warehousesOptions" :show-count="true" placeholder="请选择归属库区" />
+              <treeselect :disabled="browseStatus" style="width:80%" v-model="form.fWarehouseid" :options="warehousesOptions" :show-count="true" placeholder="请选择归属库区" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -586,35 +586,51 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="劳务公司" prop="labour" :rules="{
+            <el-form-item label="劳务公司" prop="fLabour" :rules="{
               required: isrequired_l === 1 ? true : false,
            message: '请选择',
            trigger: ['blur', 'change']
             }">
-              <el-input
+              <el-select
                 style="width: 80%"
-                v-model="form.labour"
-
+                v-model="form.fLabour"
+                @keyup.enter.native="handleQuery"
+                :remote-method="flabourRemoteMethod"
                 :disabled="browseStatus"
                 placeholder="请输入劳务公司"
-              />
+              >
+                <el-option
+                  v-for="(dict, index) in fMblnoOptions"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="车队" prop="fleet"
+            <el-form-item label="车队" prop="fFleet"
                           :rules="{
               required: isrequired === 1 ? true : false,
            message: '请选择',
            trigger: ['blur', 'change']
             }"
             >
-              <el-input
+              <el-select
                 style="width: 80%"
-                v-model="form.fleet"
-
+                v-model="form.fFleet"
+                @keyup.enter.native="handleQuery"
+                :remote-method="fleetRemoteMethod"
                 :disabled="browseStatus"
                 placeholder="请输入车队"
-              />
+              >
+                <el-option
+                  v-for="(dict, index) in fMblnoOptions"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -860,7 +876,7 @@
               header-align="center"
               align="center"
               width="150px"
-              label="入库日期"
+              label="出库日期"
             >
               <template slot-scope="scope">
                 <el-date-picker
@@ -2580,7 +2596,7 @@ export default {
   data() {
     return {
       // 部门树选项
-      warehousesOptions: undefined,
+      warehousesOptions: [],
       //控制作业类型校验
       isrequired:2,
       isrequired_s:2,
@@ -3275,6 +3291,7 @@ export default {
         //   }
         // }
         this.dataList.push({
+          fBsdate: this.form.fBsdate,
           fId: null,
           fMblno: this.dialogWhgenlegList[whgen].fMblno,
           fGoodsid: this.dialogWhgenlegList[whgen].fGoodsid,
@@ -3704,6 +3721,9 @@ export default {
               this.formBrowseStatus = true;
               this.$set(this.dataList[list], "fBusinessType", this.dataList[list].fBusinessType + '')
             }
+            if(this.dataList[list].fBillstatus === 40){
+              this.contrOl = true
+            }
           }
         }
         if (response.data.corps) {
@@ -4008,6 +4028,7 @@ export default {
               for (let i in this.dataList) {
                 if (listSelection[li].fId === this.dataList[i].fId) {
                   this.$set(this.dataList[i], "fBillstatus", 40);
+
                 }
               }
             }
@@ -4250,7 +4271,7 @@ export default {
               this.$set(this.form, 'fBusinessType', Date.parse(this.form.fChargedate))
               this.dataList = response.data.warehousebillsitems
               for (let list in this.dataList) {
-                // this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));
+                this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));
                 this.$set(this.dataList[list], "fBusinessType", this.dataList[list].fBusinessType + '');
               }
             })
@@ -4446,6 +4467,26 @@ export default {
         this.KHblnoOptions = response.rows;
       });
     },
+    /* 远程模糊查询劳务公司 */
+    flabourRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      let queryParams = { pageNum: 1, pageSize: 10, fName: name, fTypeid: 6 };
+      listCorps(queryParams).then((response) => {
+        this.fSbuOptions = response.rows;
+      });
+    },
+    /* 远程模糊查询车队 */
+    fleetRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      let queryParams = { pageNum: 1, pageSize: 10, fName: name, fTypeid: 2 };
+      listCorps(queryParams).then((response) => {
+        this.fSbuOptions = response.rows;
+      });
+    },
     /* 远程模糊查询商品 */
     goodsRemoteMethod(name) {
       if (name == null || name === "") {
@@ -4553,4 +4594,12 @@ export default {
 .el-form-item__label {
   font-size: 12px !important;
 }
+.el-collapse-item__header{
+  font-size: 16px;
+  font-weight: bolder;
+  padding-left: 5px;
+}
+.el-icon-s-home,.el-icon-s-order,.el-icon-circle-plus,.el-icon-remove{
+  padding-right: 5px;
+}
 </style>

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -431,7 +431,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="调入仓库" prop="fWarehouseid">
-              <treeselect style="width:80%" v-model="form.fWarehouseid" :options="warehousesOptions" :show-count="true" placeholder="请选择归属库区" />
+              <treeselect :disabled="browseStatus" style="width:80%" v-model="form.fWarehouseid" :options="warehousesOptions" :show-count="true" placeholder="请选择归属库区" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -593,35 +593,51 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="劳务公司" prop="labour" :rules="{
+            <el-form-item label="劳务公司" prop="fLabour" :rules="{
               required: isrequired_l === 1 ? true : false,
            message: '请选择',
            trigger: ['blur', 'change']
             }">
-              <el-input
+              <el-select
                 style="width: 80%"
-                v-model="form.labour"
-
+                v-model="form.fLabour"
+                @keyup.enter.native="handleQuery"
+                :remote-method="flabourRemoteMethod"
                 :disabled="browseStatus"
                 placeholder="请输入劳务公司"
-              />
+              >
+                <el-option
+                  v-for="(dict, index) in fMblnoOptions"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="车队" prop="fleet"
+            <el-form-item label="车队" prop="fFleet"
                           :rules="{
               required: isrequired === 1 ? true : false,
            message: '请选择',
            trigger: ['blur', 'change']
             }"
             >
-              <el-input
+              <el-select
                 style="width: 80%"
-                v-model="form.fleet"
-
+                v-model="form.fFleet"
+                @keyup.enter.native="handleQuery"
+                :remote-method="fleetRemoteMethod"
                 :disabled="browseStatus"
                 placeholder="请输入车队"
-              />
+              >
+                <el-option
+                  v-for="(dict, index) in fMblnoOptions"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
 
@@ -793,6 +809,33 @@
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column label="序号" type="index" width="80">
             </el-table-column>
+
+            <el-table-column
+              prop="fBsdate"
+              header-align="center"
+              align="center"
+              width="150px"
+              label="入库日期"
+            >
+              <template slot-scope="scope">
+                <el-date-picker
+                  v-model="scope.row.fBsdate"
+                  style="width: 138px"
+                  :disabled="
+                    browseStatus ||
+                    scope.row.fBillstatus === 20 ||
+                    scope.row.fBillstatus === 30 ||
+                    scope.row.fBillstatus === 40
+                  "
+                  type="date"
+                  value-format="timestamp"
+                  placeholder="入库日期"
+                >
+                </el-date-picker>
+              </template>
+            </el-table-column>
+
+
             <el-table-column
               prop="fMblno"
               header-align="center"
@@ -2214,7 +2257,7 @@ export default {
   data() {
     return {
       //仓库树状图
-      warehousesOptions:undefined,
+      warehousesOptions:[],
       activeNames:['1'],
       //作业类型校验
       isrequired:2,
@@ -2480,6 +2523,9 @@ export default {
   activated(){
     this.Jump()
   },
+  // watch:{
+  //   'form.fWarehouseid' : 'warehouseMethod'
+  // },
   methods: {
     /** 查询部门下拉树结构 */
     getTreeselect() {
@@ -2915,6 +2961,7 @@ export default {
           fDriverIdCar = this.form.fDriverIdCar
         }
         this.dataList.push({
+          fBsdate: this.form.fBsdate,
           fId: null,
           fCntrtype: null,
           fGrossweight: 0,
@@ -3324,6 +3371,7 @@ export default {
     },
 
     check(row,status,res){
+      this.getTreeselect()
       this.reset();
       this.disappear = false
       this.notChange = true
@@ -3948,6 +3996,7 @@ export default {
               this.$set(this.form, 'fChargedate', Date.parse(this.form.fChargedate))
               this.dataList = response.data.warehousebillsitems
               for (let li in this.dataList) {
+                this.$set(this.dataList[li], 'fBsdate', Date.parse(this.dataList[li].fBsdate))
                 this.$set(this.dataList[li], 'fBusinessType', this.dataList[li].fBusinessType + '')
               }
             })
@@ -4132,6 +4181,26 @@ export default {
         }
       }
     },
+    /* 远程模糊查询劳务公司 */
+    flabourRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      let queryParams = { pageNum: 1, pageSize: 10, fName: name, fTypeid: 6};
+      listCorps(queryParams).then((response) => {
+        this.fSbuOptions = response.rows;
+      });
+    },
+    /* 远程模糊查询车队 */
+    fleetRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      let queryParams = { pageNum: 1, pageSize: 10, fName: name, fTypeid: 2 };
+      listCorps(queryParams).then((response) => {
+        this.fSbuOptions = response.rows;
+      });
+    },
     /* 远程模糊查询用户 */
     corpsRemoteMethod(name) {
       if (name == null || name === "") {