提交禅道BUGID333问题

src/api/basicdata/warehouse.js

@@ -92,3 +92,20 @@ export function listWarehousesss(query) {
     params: query
   })
 }
+// 获取对应角色的用户
+export function selectUserByRole() {
+  return request({
+    url: '/system/user/selectUserByRole',
+    method: 'get',
+    params: {
+      roleName:'业务员'
+    }
+  })
+}
+//出库明细请核
+export function deliveryDetails(fId) {
+  return request({
+    url: '/warehouseBusiness/outStock/addDetails/'+fId,
+    method: 'get'
+  })
+}

src/api/warehouseBusiness/warehouseInStock.js

@@ -169,7 +169,14 @@ export function checkCode(query) {
 // 查询查询仓管员id
 export function queryClerkRoleList() {
   return request({
-    url: '/warehouseBusiness/inStock/queryClerkRoleList ',
+    url: '/warehouseBusiness/inStock/queryClerkRoleList',
     method: 'get',
   })
-}
+}
+//明细请核
+export function pleaseCheck(fId) {
+  return request({
+    url: '/warehouseBusiness/inStock/addDetails/'+fId,
+    method: 'get'
+  })
+}

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -954,7 +954,7 @@
                 placeholder="货值"
                 v-input-limit="2"
                 :disabled="browseStatus || form.warehouseStatus > 3"
-              />
+              ><template slot="append">万</template></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -972,6 +972,16 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="8" v-if="showfWeighingDate == 0">
+            <el-form-item label="过磅重量" prop="fWeighWeight">
+              <el-input
+                  v-model.number="form.fWeighWeight"
+                  style="width: 80%"
+                  placeholder="过磅重量"
+                  :disabled="browseStatus || form.warehouseStatus > 3"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="8" v-if="showfIfsampling == 0">
             <el-form-item label="是否取样" prop="fIfsampling">
               <el-select
@@ -990,21 +1000,21 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="送样时间" prop="sendSampleDate">
               <el-date-picker
-                v-model="form.sendSampleDate"
-                style="width: 80%"
-                type="date"
-                :disabled="browseStatus || form.warehouseStatus > 3"
-                value-format="timestamp"
-                placeholder="请选择送样时间"
+                  v-model="form.sendSampleDate"
+                  style="width: 80%"
+                  type="date"
+                  :disabled="browseStatus || form.warehouseStatus > 3"
+                  value-format="timestamp"
+                  placeholder="请选择送样时间"
               >
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="8">
             <el-form-item label="是否复磅" prop="fIfweightRecovery">
               <el-select
@@ -1162,18 +1172,22 @@
                 type="info"
                 :disabled="browseStatus"
                 prop="打印"
+                v-if="entryPrinting == 0"
                 @click="printZyd"
                 >作业单
               </el-button>
               <el-button
                 size="small"
                 :disabled="browseStatus"
+                v-if="entryPrinting == 0"
                 @click="discharge"
                 >叫车进场</el-button
               >
+
+<!--              :disabled="dataListSelection.length <= 0 || browseStatus || entryPrinting == 1"-->
               <el-button
                 size="small"
-                :disabled="dataListSelection.length <= 0 || browseStatus"
+                :disabled="entryPrinting == 0?dataListSelection.length <= 0 || browseStatus || entryPrinting == 1:Printinglist.length != 1 || browseStatus || Printinglist.length !== 1?true:Printinglist[0].fBillstatus ==40"
                 @click="creditClick"
                 >入库确认
               </el-button>
@@ -1203,6 +1217,17 @@
                   <el-dropdown-item command="h">入库垛卡</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
+              <el-dropdown @command="detailedApproval" style="margin-left: 10px">
+                <el-button size="small" type="primary">
+                  明细审批<i class="el-icon-arrow-down el-icon--right"></i>
+                </el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="QH">明细请核</el-dropdown-item>
+                  <el-dropdown-item command="SP">明细审批</el-dropdown-item>
+                  <el-dropdown-item command="CK">查看明细审批流</el-dropdown-item>
+                  <el-dropdown-item command="CX">撤销明细审批</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
               <div style="margin: 0 10px">
                 <el-button
                   icon="el-icon-setting"
@@ -1444,20 +1469,43 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-if="newPlan == 0">
             <el-col :span="6">
-              <el-form-item label="库区" prop="fWarehouselocid">
-                <treeselect
-                  v-model="importList.fWarehouselocid"
-                  @select="getAlltree"
-                  :options="fWarehouseidOptions"
-                  :show-count="true"
-                  :disable-branch-nodes="true"
-                  placeholder="请选择库区"
+              <el-form-item label="计划件数" prop="fPlanqty">
+                <el-input
+                    v-input-limit="0"
+                    v-model.number="importList.fPlanqty"
+                    style="width: 100%"
+                    placeholder="件数"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
+              <el-form-item label="计划毛重(kg)" prop="fPlangrossweight">
+                <el-input
+                    v-model.number="importList.fPlangrossweight"
+                    v-input-limit="2"
+                    style="width: 100%"
+                    placeholder="毛重">
+                  <template slot="append">{{ (importList.fPlangrossweight / 1000).toFixed(2) }}吨</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="计划净重(kg)" prop="fPlannetweight">
+                <el-input
+                    v-model.number="importList.fPlannetweight"
+                    v-input-limit="2"
+                    style="width: 100%"
+                    placeholder="净重"
+                >
+                  <template slot="append">{{ (importList.fPlannetweight / 1000).toFixed(2) }}吨</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
               <el-form-item label="件数" prop="fQty">
                 <el-input
                   v-input-limit="0"
@@ -1494,6 +1542,18 @@
                 </el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="库区" prop="fWarehouselocid">
+                <treeselect
+                    v-model="importList.fWarehouselocid"
+                    @select="getAlltree"
+                    :options="fWarehouseidOptions"
+                    :show-count="true"
+                    :disable-branch-nodes="true"
+                    placeholder="请选择库区"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
@@ -1509,6 +1569,7 @@
               <el-form-item label="箱型" prop="fCntrtype">
                 <el-select
                   placeholder="请选择箱型"
+                  style="width: 100%"
                   v-model="importList.fCntrtype"
                 >
                   <el-option
@@ -1622,7 +1683,7 @@
                   v-model="importList.fGoodsval"
                   style="width: 100%"
                   placeholder="货值"
-                />
+                ><template slot="append">万</template></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -2519,15 +2580,15 @@
               <td colspan="3">{{ form.fCustomsdeclartion }}</td>
             </tr>
             <tr>
-              <td>入库日期</td>
-              <td>箱号</td>
+              <td class="oneHundredSix">入库日期</td>
+              <td class="twoHundred">箱号</td>
               <td>铅封号</td>
               <td>预计件数</td>
               <td>垛位</td>
               <td>实收件数</td>
-              <td>实收净重（吨）</td>
-              <td>毛重（吨）</td>
-              <td>备注</td>
+              <td class="oneHundred">实收净重（吨）</td>
+              <td class="oneHundred">毛重（吨）</td>
+              <td class="twoHundred">备注</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
               <td>{{ item.fBsdate }}</td>
@@ -3187,7 +3248,7 @@
           {{ company }}有限公司
         </div>
           <div style="display:flex;flex-direction: column;margin-left: 70%">
-            <div>{{ form.fBillno }}1111</div>
+            <div>{{ form.fBillno }}</div>
             <div>存货地点：{{ stockName }}</div>
           </div>
         <div class="print_table" style="display: flex">
@@ -3199,15 +3260,15 @@
               <td colspan="3">{{ form.fCustomsdeclartion}}</td>
             </tr>
             <tr>
-              <td>入库日期</td>
-              <td>箱号</td>
+              <td class="oneHundredSix" style="width: 160px;">入库日期</td>
+              <td class="twoHundred" style="width: 200px;">箱号</td>
               <td>铅封号</td>
               <td>预计件数</td>
               <td>垛位</td>
               <td>实收件数</td>
-              <td>实收净重（吨）</td>
-              <td>毛重（吨）</td>
-              <td>备注</td>
+              <td class="oneHundred" style="width: 100px;">实收净重（吨）</td>
+              <td class="oneHundred" style="width: 100px;">毛重（吨）</td>
+              <td class="twoHundred" style="width: 200px;">备注</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
               <td>{{ item.fBsdate }}&nbsp;{{ timeOut }}</td>
@@ -3856,6 +3917,7 @@ import {
   ordersRevoke,
   checkCode,
   queryClerkRoleList,
+  pleaseCheck,
 } from "@/api/warehouseBusiness/warehouseInStock";
 import { operationAgreement } from "@/api/agreement/agreement";
 import { listCorps } from "@/api/basicdata/corps";
@@ -3906,6 +3968,7 @@ export default {
   data() {
     return {
       timeOut:'',
+      plannedGrossWeight:0,
       container:'',
       pageNum: 1,
       pageSize: 10,
@@ -3964,6 +4027,7 @@ export default {
       isrequired2: 2,
       detailsHidden: false,
       detailsHidden2: true,
+      fSalesmanId:[],
       CntrTable: [],
       cntrList: [],
       fTrademodeidOptions: [],
@@ -4093,128 +4157,146 @@ export default {
           name: "箱量",
           checked: 0,
           width: 100,
+        },{
+          surface: "9",
+          label: "fPlanqty",
+          name: "计划件数",
+          checked: 1,
+          width: 100,
+        },{
+          surface: "10",
+          label: "fPlangrossweight",
+          name: "计划毛重",
+          checked: 1,
+          width: 100,
+        },{
+          surface: "11",
+          label: "fPlannetweight",
+          name: "计划净重",
+          checked: 1,
+          width: 100,
         },
         {
-          surface: "9",
+          surface: "12",
           label: "fQty",
           name: "入库件数",
           checked: 0,
           width: 100,
         },
         {
-          surface: "10",
+          surface: "13",
           label: "fGrossweight",
           name: "入库毛重(kg)",
           checked: 0,
           width: 120,
         },
         {
-          surface: "11",
+          surface: "14",
           label: "fNetweight",
           name: "入库净重(kg)",
           checked: 0,
           width: 120,
         },
         {
-          surface: "12",
+          surface: "15",
           label: "fPackagespecs",
           name: "包装规格",
           checked: 0,
           width: 100,
         },
         {
-          surface: "13",
+          surface: "16",
           label: "fFleet",
           name: "车队",
           checked: 0,
           width: 100,
         },
         {
-          surface: "14",
+          surface: "17",
           label: "fTruckno",
           name: "车号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "15",
+          surface: "18",
           label: "fDriverName",
           name: "司机名称",
           checked: 0,
           width: 100,
         },
         {
-          surface: "16",
+          surface: "19",
           label: "fDriverTel",
           name: "司机电话",
           checked: 0,
           width: 100,
         },
         {
-          surface: "17",
+          surface: "20",
           label: "fDriverIdCar",
           name: "司机身份证",
           checked: 0,
           width: 120,
         },
         {
-          surface: "18",
+          surface: "21",
           label: "fSerialNumber",
           name: "流水号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "19",
+          surface: "22",
           label: "fCntrno",
           name: "箱号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "20",
+          surface: "23",
           label: "fLntype",
           name: "装卸方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "21",
+          surface: "24",
           label: "fForkliftman",
           name: "叉车工",
           checked: 0,
           width: 100,
         },
         {
-          surface: "22",
+          surface: "25",
           label: "fStevedore",
           name: "装卸工",
           checked: 0,
           width: 100,
         },
         {
-          surface: "23",
+          surface: "26",
           label: "fLocalcntrno",
           name: "库内箱号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "24",
+          surface: "27",
           label: "fSealno",
           name: "封号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "25",
+          surface: "28",
           label: "fGoodsval",
           name: "货值",
           checked: 0,
           width: 100,
         },
         {
-          surface: "26",
+          surface: "29",
           label: "remark",
           name: "备注",
           checked: 0,
@@ -4247,6 +4329,8 @@ export default {
       showfValue: null,
       showfIfinspection: null,
       showfPartNumber: null,
+      newPlan:1,
+      entryPrinting:1,
     };
   },
   created() {
@@ -4293,6 +4377,12 @@ export default {
     this.getConfigKey("stockoi").then((response) => {
       this.stockoi = response.msg;
     });
+    this.getConfigKey("entry.printing").then((response) => {
+      this.entryPrinting = response.msg;
+    });
+    this.getConfigKey("new.plan").then((response) => {
+      this.newPlan = response.msg;
+    });
     this.getConfigKey("show_fCustomno").then((response) => {
       this.showfCustomno = response.msg;
     });
@@ -4695,10 +4785,7 @@ export default {
               if (this.Printinglist[item].fBillstatus === 10) {
                 return this.$message.error("请先打印作业单");
               }
-              if (
-                this.Printinglist[item].fBillstatus >= 30 &&
-                this.stockoi == "0"
-              ) {
+              if (this.Printinglist[item].fBillstatus >= 30 && this.stockoi == "0") {
                 return this.$message.error("请勿重复卸货");
               }
             }
@@ -4809,11 +4896,8 @@ export default {
             if (!this.Printinglist[item].fId) {
               return this.$message.error("请存在未保存的数据");
             }
-            if (
-              this.Printinglist[item].fBillstatus == 10 &&
-              this.stockoi == "0"
-            ) {
-              return this.$message.error("请存在未打印的作业单");
+            if (this.entryPrinting == 0){
+              if (this.Printinglist[item].fBillstatus == 10 && this.stockoi == "0") return this.$message.error("请存在未打印的作业单");
             }
             if (
               this.Printinglist[item].fBillstatus == 20 &&
@@ -5732,17 +5816,31 @@ export default {
       return sums;
     },
     playcomputer() {
-      let Num1 = Number(this.form.fPlannetweight) / Number(this.form.fPlanqty);
-      let Num2 =
-        Number(this.form.fPlangrossweight) / Number(this.form.fPlanqty);
-      this.importList.fNetweight = Number(
-        (this.importList.fQty * Num1).toFixed(2)
-      );
-      this.tfNetweightnum2 = (this.importList.fNetweight / 1000).toFixed(2);
-      this.importList.fGrossweight = Number(
-        (this.importList.fQty * Num2).toFixed(2)
-      );
-      this.tfGrossweightnum2 = (this.importList.fGrossweight / 1000).toFixed(2);
+      if (this.importList.fPlannetweight && this.importList.fPlanqty && this.importList.fPlangrossweight){
+        let Num1 = Number(this.importList.fPlannetweight) / Number(this.importList.fPlanqty);
+        let Num2 =
+            Number(this.importList.fPlangrossweight) / Number(this.importList.fPlanqty);
+        this.importList.fNetweight = Number(
+            (this.importList.fQty * Num1).toFixed(2)
+        );
+        this.tfNetweightnum2 = (this.importList.fNetweight / 1000).toFixed(2);
+        this.importList.fGrossweight = Number(
+            (this.importList.fQty * Num2).toFixed(2)
+        );
+        this.tfGrossweightnum2 = (this.importList.fGrossweight / 1000).toFixed(2);
+      }else {
+        let Num1 = Number(this.form.fPlannetweight) / Number(this.form.fPlanqty);
+        let Num2 =
+            Number(this.form.fPlangrossweight) / Number(this.form.fPlanqty);
+        this.importList.fNetweight = Number(
+            (this.importList.fQty * Num1).toFixed(2)
+        );
+        this.tfNetweightnum2 = (this.importList.fNetweight / 1000).toFixed(2);
+        this.importList.fGrossweight = Number(
+            (this.importList.fQty * Num2).toFixed(2)
+        );
+        this.tfGrossweightnum2 = (this.importList.fGrossweight / 1000).toFixed(2);
+      }
     },
     imporComputer() {
       this.playcomputer();
@@ -5764,9 +5862,10 @@ export default {
               type: "warning",
             });
           }
-          this.importList.fPlanqty=this.form.fPlanqty
-          this.importList.fPlannetweight=this.form.fPlannetweight
-          this.importList.fNetweight=this.form.fNetweight
+          this.$set(this.importList,'fPlanqty',this.form.fPlanqty)
+          this.$set(this.importList,'fPlangrossweight',this.form.fPlangrossweight)
+          this.$set(this.importList,'fPlannetweight',this.form.fPlannetweight)
+          this.$set(this.importList,'fNetweight',this.form.fNetweight)
           this.importList.fQty = Number(
             (this.form.fPlanqty - this.sumMum).toFixed(2)
           );
@@ -5858,6 +5957,41 @@ export default {
         this.$message.error("请选择需要打印的明细!");
       }
     },
+    detailedApproval(command){
+      if (command === 'QH'){
+        pleaseCheck(this.form.fId).then(res =>{
+          if (res.code == 200) {
+            this.msgSuccess("请核成功");
+            this.$set(this.form,'fItemstatus',4)
+          }
+        })
+      }else if(command === 'CK'){
+        this.addOrUpdateVisible = true;
+        let actId = "170";
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(this.form.fId, actId, 'f_itemstatus');
+        });
+      }else if(command === 'SP'){
+        this.addOrUpdateVisib = true;
+        this.$nextTick(() => {
+          this.$refs.ApprovalComments.init(this.form.fId, 'f_itemstatus', 170);
+        });
+      }else if(command === 'CX'){
+        let data = {
+          actId: 170,
+          billId: this.form.fId,
+          id: this.form.fId,
+          fidStatus: 'f_itemstatus',
+        };
+        revokeTwo(data).then((data) => {
+          if (data.code === 200) {
+            this.browseStatus = false;
+            this.msgSuccess("撤销成功");
+            this.$set(this.form,'fItemstatus',2)
+          }
+        });
+      }
+    },
     handleCommand(command) {
       if (this.Printinglist.length > 0) {
         this.$refs["form"].validate((valid) => {
@@ -6268,10 +6402,13 @@ export default {
             });
           break
         case 'ccdzrkd':
+          let stylEe =
+              "@page {  } " +
+              "@media print {.oneHundred{width: 100px} .twoHundred{width: 200px} .oneHundredSix{width: 160px} .print-div{ padding:8px;background-color:#cccccc;} .print-title{display:flex;justify-content: center;font-size:24px} .print_form{font-size:12px} .print_table table {border-right: 1px solid #000;border-bottom: 1px solid #000;font-size:12px} .print_table table td {border-left: 1px solid #000;border-top: 1px solid #000;padding:2px;vertical-align:middle;text-align: center;}";
           print({
             printable: "print_area8",
             type: "html",
-            style: style, // 亦可使用引入的外部css;
+            style: stylEe, // 亦可使用引入的外部css;
             scanStyles: false,
           });
           break

src/views/Warehousing/inStock/uploadExcel.vue

@@ -73,6 +73,7 @@
                 style="width: 100%"
                 value-format="timestamp"
                 placeholder="入库日期"
+                @change="dateSelected(scope,'fBsdate')"
               >
               </el-date-picker>
             </span>
@@ -82,6 +83,7 @@
                 v-model="scope.row.fGoodsid"
                 style="width: 100%"
                 placeholder="请选择品名"
+                @change="dateSelected(scope,'fGoodsid')"
               >
                 <el-option
                   v-for="(item, index) in goodsOptions"
@@ -97,6 +99,7 @@
                 v-model="scope.row.fBusinessType"
                 style="width: 100%"
                 placeholder="请选择商品属性"
+                @change="dateSelected(scope,'fBusinessType')"
               >
                 <el-option
                   v-for="(item, index) in fStorageTypeOptions"
@@ -416,6 +419,21 @@ export default {
     this.getRow();
   },
   methods: {
+    dateSelected(scope,name){
+      if (name === 'fBsdate'){
+        this.excelList.forEach(item => {
+          if (!item.fBsdate) this.$set(item,'fBsdate',scope.row.fBsdate)
+        })
+      }else if (name === 'fGoodsid'){
+        this.excelList.forEach(item => {
+          if (!item.fGoodsid) this.$set(item,'fGoodsid',scope.row.fGoodsid)
+        })
+      }else if (name === 'fBusinessType'){
+        this.excelList.forEach(item => {
+          if (!item.fBusinessType) this.$set(item,'fBusinessType',scope.row.fBusinessType)
+        })
+      }
+    },
     init(row, list) {
       this.oldList = [];
       this.form = null;

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -679,6 +679,61 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="业务员" prop="fSalesmanId">
+              <el-select
+                  v-model="form.fSalesmanId"
+                  clearable
+                  filterable
+                  placeholder="请选择业务员"
+                  style="width: 80%"
+                  :disabled="browseStatus || form.warehouseStatus > 3"
+              >
+                <el-option
+                    v-for="(item, index) in fSalesmanId"
+                    :key="index.userId"
+                    :label="item.userName"
+                    :value="item.userId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="预计到厂日期" prop="fPredictBranch">
+              <el-date-picker
+                  v-model="form.fPredictBranch"
+                  style="width: 80%"
+                  type="date"
+                  :disabled="browseStatus || form.warehouseStatus > 3"
+                  value-format="timestamp"
+                  placeholder="预计到厂日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="等级" prop="fGrade">
+              <el-input
+                  v-model="form.fGrade"
+                  :disabled="browseStatus || form.warehouseStatus > 3"
+                  style="width: 80%"
+                  placeholder="等级"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="送货详情" prop="fDeliveryDetails">
+              <el-input
+                  v-model="form.fDeliveryDetails"
+                  :disabled="browseStatus || form.warehouseStatus > 3"
+                  style="width: 80%"
+                  placeholder="送货详情"
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
       </div>
     </el-form>
@@ -788,11 +843,12 @@
               >
             </el-col>
             <el-col style="display: flex; justify-content: flex-end">
-              <el-button size="small" type="info" prop="打印" @click="printZyd"
+              <el-button size="small" type="info" prop="打印" @click="printZyd" v-if="entryPrinting == 0"
               >作业单
               </el-button>
               <el-button
                   size="small"
+                  v-if="entryPrinting == 0"
                   :disabled="browseStatus"
                   @click="discharge"
               >叫车进场
@@ -800,7 +856,7 @@
               >
               <el-button
                   size="small"
-                  :disabled="dataListSelection.length <= 0 || browseStatus"
+                  :disabled="entryPrinting == 0?dataListSelection.length <= 0 || browseStatus || entryPrinting == 1:Printinglist.length != 1 || browseStatus || Printinglist.length !== 1?true:Printinglist[0].fBillstatus ==40"
                   @click="creditClick"
               >出库确认
               </el-button>
@@ -823,7 +879,18 @@
                   <el-dropdown-item command="f">叉车出库单</el-dropdown-item>
                   <el-dropdown-item command="g">单车出库单</el-dropdown-item>
                   <el-dropdown-item command="h">装车存档出库单</el-dropdown-item>
-                  <!--<el-dropdown-item command="q">签收单</el-dropdown-item>-->
+                  <el-dropdown-item command="q">签收单</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+              <el-dropdown @command="detailedApproval" style="margin-left: 10px" v-if="showApproval == 0">
+                <el-button size="small" type="primary">
+                  明细审批<i class="el-icon-arrow-down el-icon--right"></i>
+                </el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="QH">明细请核</el-dropdown-item>
+                  <el-dropdown-item command="CK">查看明细审批</el-dropdown-item>
+                  <el-dropdown-item command="SP">明细审批</el-dropdown-item>
+                  <el-dropdown-item command="CX">撤销明细审批</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
               <div style="margin: 0 10px">
@@ -900,6 +967,13 @@
                     />
                   </el-select>
                 </span>
+                <span v-else-if="item.label =='fNowCarton'">
+                  <el-input
+                      v-model="scope.row.fNowCarton"
+                      :disabled="browseStatus || scope.row.fBillstatus == 40"
+                      placeholder="现箱号"
+                  />
+                </span>
                 <span v-else-if="item.label == 'fQty'">
                   <el-input
                       @change="qtyChange(scope.row)"
@@ -1443,7 +1517,7 @@
               <el-input
                   v-model="scope.row.Remarks"
                   :disabled="browseStatus"
-                  placeholder="备注"
+                  placeholder="备1注"
                   show-word-limit
               />
             </template>
@@ -2290,79 +2364,81 @@
           style="box-shadow:none"
           width="70%">
         <section ref="print">
-          <p><span class="no-print">打印日期:</span><span style="padding-left: 100px">2021-09-12</span></p>
+          <p><span class="no-print">打印日期:</span><span style="padding-left: 100px">{{ new Date().toLocaleDateString().replace(/\//g,"-") }}</span></p>
           <table class="table" valign="center">
             <tr>
               <td style="width: 9%;"><span class="no-print">提 单 号</span></td>
-              <td style="width: 14%;">1231252343</td>
+              <td style="width: 14%;">{{ Printinglist.length === 1?Printinglist[0].fMblno:'' }}</td>
               <td style="width: 8%;"><span class="no-print">合 同 号</span></td>
-              <td style="width: 13%;">123123</td>
+              <td style="width: 13%;">{{ Printinglist.length === 1?Printinglist[0].fSerialNumber:'' }}</td>
               <td style="width: 9%;"><span class="no-print">品 名</span></td>
-              <td style="width: 16%;">627313791</td>
+              <td style="width: 16%;">{{ Printinglist.length === 1?Printinglist[0].fGoodsid:'' }}</td>
             </tr>
             <tr>
               <td><span class="no-print">件 数</span></td>
-              <td>1231252343</td>
+              <td>{{ Printinglist.length === 1?Printinglist[0].fQty:'' }}</td>
               <td><span class="no-print">重 量</span></td>
-              <td>123123</td>
+              <td>{{Printinglist.length === 1?Printinglist[0].fNetweight:''}}</td>
               <td><span class="no-print">尺 码</span></td>
-              <td>627313791</td>
+              <td></td>
             </tr>
             <tr>
               <td><span class="no-print">原箱号</span></td>
-              <td>1231252343</td>
+              <td>{{ Printinglist.length === 1?Printinglist[0].fCntrno:'' }}</td>
               <td><span class="no-print">现箱号</span></td>
-              <td>123123</td>
+              <td>{{ Printinglist.length === 1?Printinglist[0].fNowCarton:'' }}</td>
               <td><span class="no-print">铅封号</span></td>
-              <td>627313791</td>
+              <td>{{ Printinglist.length === 1?Printinglist[0].fSealno:'' }}</td>
             </tr>
             <tr>
               <td><span class="no-print">出库日</span></td>
-              <td>1231252343</td>
+              <td>{{ Printinglist.length === 1?Printinglist[0].fBsdate:'' }}</td>
               <td><span class="no-print">预计到厂日</span></td>
-              <td>123123</td>
+              <td>{{ form.fPredictBranch?form.fPredictBranch:'' }}</td>
               <td><span class="no-print">等级</span></td>
-              <td>627313791</td>
+              <td>{{ form.fGrade?form.fGrade:'' }}</td>
             </tr>
             <tr>
               <td><span class="no-print">车牌号</span></td>
-              <td>1231252343</td>
+              <td>{{ Printinglist.length === 1?Printinglist[0].fTruckno:'' }}</td>
               <td><span class="no-print">司机姓名</span></td>
-              <td>123123</td>
+              <td>{{ Printinglist.length === 1?Printinglist[0].fDriverName:'' }}</td>
               <td><span class="no-print">司机电话</span></td>
-              <td>627313791</td>
+              <td>{{ Printinglist.length === 1?Printinglist[0].fDriverTel:'' }}</td>
             </tr>
             <tr>
               <td style="height: 70px;"><span class="no-print">送货详情</span></td>
-              <td colspan="5">测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试</td>
+              <td colspan="5">{{ form.fDeliveryDetails?form.fDeliveryDetails:'' }}</td>
             </tr>
             <tr>
-              <td><span class="no-print">送货详情</span></td>
-              <td colspan="5">测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试</td>
+              <td><span class="no-print">送货备注</span></td>
+              <td colspan="5">{{ Printinglist.length === 1?Printinglist[0].remark:'' }}</td>
             </tr>
             <tr>
               <td><span class="no-print">到厂名称</span></td>
-              <td>1231252343</td>
+              <td></td>
               <td><span class="no-print">到厂日期</span></td>
-              <td>123123</td>
+              <td></td>
               <td rowspan="4"><span class="no-print">工厂盖章</span></td>
               <td rowspan="4"></td>
             </tr>
             <tr>
               <td><span class="no-print">签收人姓名</span></td>
-              <td>1231252343</td>
+              <td></td>
               <td><span class="no-print">签收人电话</span></td>
-              <td>123123</td>
+              <td></td>
             </tr>
             <tr>
               <td><span class="no-print">其他</span></td>
-              <td colspan="4">1231252343</td>
+              <td colspan="4"></td>
             </tr>
             <tr>
               <td><span class="no-print">业务员</span></td>
-              <td>1231252343</td>
+              <td v-for="item in fSalesmanId" v-if="form.fSalesmanId === item.userId">
+                {{item.userName}}
+              </td>
               <td><span class="no-print">叉车工</span></td>
-              <td>123123</td>
+              <td>{{ Printinglist.length === 1?Printinglist[0].fForkliftman:'' }}</td>
             </tr>
             <tr>
               <td style="height: 200px"><span class="no-print">车队注意事项</span></td>
@@ -2374,18 +2450,14 @@
             </tr>
             <tr>
               <td style="height: 190px"><span class="no-print">关于我们</span></td>
-              <td colspan="5">
-                1.承运方务必让工厂将签收单填写完整、准确且字迹清晰，如因填写不完整准确清晰所造成的一- 切损失<br>
-                由承运方承担。<br>
-                2.承运方七天之内务必将出库签收单送回我司，我司凭工厂签收单结算本次运输费用，否则我司拒付运<br>
-                费，如有丢失，由承运方承担损失。<br>
-                3.承运方如未按要求时间到达工厂，造成的一- 切损失将由承运方承担。<br>
-                4.如果在运输途中货物损坏或者丢失，承运方必须原价赔偿并且承担相应的全部责任。<br>
-                5.货物在装卸过程中，驾驶员要密切关注货物情况，如有货损或者其它事件发生，驾驶员应第一时间告<br>
-                知我司出库签收单，上的业务员。<br>
+              <td colspan="5" style="height: 170px;">
+                1、出口优势：东南亚马尼拉、宿务、卡加延、达沃、胡志明、曼谷、台湾、巴生等<br>
+                2、进口优势：承接各种板材、塑料颗粒、原木、棕榈纤维、红酒、等货物订舱、清<br>
+                关、仓储、运输一条龙服务<br>
+                3、陆运优势：我司自有28部集卡车，专业承接临沂、沭阳等板材运输<br>
+                4、仓储优势：我司自有仓库10000平米，可提供进口分拨、仓储、出口装箱服务
               </td>
             </tr>
-
           </table>
         </section>
         <span slot="footer" class="dialog-footer">
@@ -3201,6 +3273,7 @@
 
 <script>
 import print from "print-js";
+import {selectUserByRole} from "@/api/basicdata/warehouse"
 import {
   addWhgenleg,
   listWarehousebills,
@@ -3228,6 +3301,7 @@ import {
   listWarehouse,
   treeselect,
   listWarehousesss,
+  deliveryDetails
 } from "@/api/basicdata/warehouse";
 import {listGoods} from "@/api/basicdata/goods";
 import {listCntrs} from "@/api/basicdata/cntr";
@@ -3385,6 +3459,7 @@ export default {
         orgStorageDate: null,
       },
       stockoi: null,
+      fSalesmanId:[],
       drag: false,
       tableDate: [
         {
@@ -3600,7 +3675,13 @@ export default {
           name: "备注",
           checked: 0,
           width: 100,
-        },
+        },{
+          surface: "30",
+          label: "fNowCarton",
+          name: "现箱号",
+          checked: 0,
+          width: 100,
+        }
       ],
       setRowList: [],
       getRowList: [],
@@ -3712,6 +3793,7 @@ export default {
       showApproval: null,
       allfPlanqty: 0,
       ckTime: null,
+      entryPrinting:1,
     };
   },
   created() {
@@ -3727,6 +3809,13 @@ export default {
         this.detailsHidden2 = true;
       }
     });
+    selectUserByRole().then(res =>{
+      console.log(res)
+      this.fSalesmanId = res.rows
+    })
+    this.getConfigKey("entry.printing").then((response) => {
+      this.entryPrinting = response.msg;
+    });
     this.getDicts("data_stltype_type").then((response) => {
       this.fStltypeOptions = response.data;
     });
@@ -4362,11 +4451,13 @@ export default {
             if (!this.Printinglist[item].fId) {
               return this.$message.error("请存在未保存的数据");
             }
-            if (
-                this.Printinglist[item].fBillstatus == 10 &&
-                this.stockoi == "0"
-            ) {
-              return this.$message.error("请存在未打印的作业单");
+            if(this.entryPrinting == 0){
+              if (
+                  this.Printinglist[item].fBillstatus == 10 &&
+                  this.stockoi == "0"
+              ) {
+                return this.$message.error("请存在未打印的作业单");
+              }
             }
             if (
                 this.Printinglist[item].fBillstatus == 20 &&
@@ -5419,6 +5510,41 @@ export default {
         this.$message.error("请选择需要打印的明细!");
       }
     },
+    detailedApproval(command){
+      if (command === 'QH'){
+        deliveryDetails(this.form.fId).then(res =>{
+          if (res.code == 200) {
+            this.msgSuccess("请核成功");
+            this.$set(this.form,'fItemstatus',4)
+          }
+        })
+      }else if(command === 'CK'){
+        this.addOrUpdateVisible = true;
+        let actId = "180";
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(this.form.fId, actId, 'f_itemstatus');
+        });
+      }else if(command === 'SP'){
+        this.addOrUpdateVisib = true;
+        this.$nextTick(() => {
+          this.$refs.ApprovalComments.init(this.form.fId, 'f_itemstatus', 180);
+        });
+      }else if(command === 'CX'){
+        let data = {
+          actId: 180,
+          billId: this.form.fId,
+          id: this.form.fId,
+          fidStatus: 'f_itemstatus',
+        };
+        revokeTwo(data).then((data) => {
+          if (data.code === 200) {
+            this.browseStatus = false;
+            this.msgSuccess("撤销成功");
+            this.$set(this.form,'fItemstatus',2)
+          }
+        });
+      }
+    },
     handleCommand(command) {
       if (this.Printinglist.length > 0) {
         for (let item in this.Printinglist) {

src/views/index.vue

@@ -179,6 +179,8 @@
                   <span v-else-if="item.refno2 === 'ApplyFP'">凯和开票申请</span>
                   <span v-else-if="item.refno2 === 'KHDD'">凯和订单</span>
                   <span v-else-if="item.refno2 === 'SE'">下单配船</span>
+                  <span v-else-if="item.refno2 === 'SJRKITEM'">入库明细审批</span>
+                  <span v-else-if="item.refno2 === 'SJCKITEM'">出库明细审批</span>
                 </div>
                 <div class="home_stock_table" @click="approval(item)">
                   查看详情
@@ -1036,6 +1038,20 @@ export default {
           });
           break;
         }
+        case "SJRKITEM": {
+          this.$router.push({
+            path: "/business/inStock",
+            query: { id: row.billId},
+          });
+          break;
+        }
+        case "SJCKITEM": {
+          this.$router.push({
+            path: "/business/outStock",
+            query: { id: row.billId},
+          });
+          break;
+        }
         default: {
           return this.$message.error("未知错误，无状态");
         }

src/views/morePage/stock/index.vue

@@ -684,6 +684,14 @@ export default {
                 e.refno2 = "凯和订单";
                 break;
               }
+              case "SJRKITEM": {
+                e.refno2 = "入库明细审批";
+                break;
+              }
+              case "SJCKITEM": {
+                e.refno2 = "出库明细审批";
+                break;
+              }
               default: {
                 return this.$message.error("未知错误，无状态");
               }
@@ -810,6 +818,20 @@ export default {
           });
           break;
         }
+        case "SJRKITEM": {
+          this.$router.push({
+            path: "/business/inStock",
+            query: { id: row.billId},
+          });
+          break;
+        }
+        case "SJCKITEM": {
+          this.$router.push({
+            path: "/business/outStock",
+            query: { id: row.billId},
+          });
+          break;
+        }
         default: {
           console.log(row);
           return this.$message.error("未知错误，无状态");

src/views/reportManagement/whgenleg/index.vue

@@ -137,17 +137,23 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="属性详情" prop="fMarks">
+        <el-input
+            v-model="queryParams.fMarks"
+            placeholder="属性详情"
+            clearable
+            style="width: 200px"
+            size="small"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button
           type="cyan"
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
+          >搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -616,11 +622,11 @@ export default {
       isCntrnoOptions: [
         {
           id: 0,
-          name: "否",
+          name: "是",
         },
         {
           id: 1,
-          name: "是",
+          name: "否",
         },
       ],
     };

src/views/system/auditConfiguration/index.vue

@@ -55,6 +55,8 @@
           <span v-if="scope.row.actId === 450">凯和付费审批流程</span>
           <span v-if="scope.row.actId === 460">凯和费用审批流程</span>
           <span v-if="scope.row.actId === 470">凯和发票申请审批流程</span>
+          <span v-if="scope.row.actId === 170">入库明细审批流程</span>
+          <span v-if="scope.row.actId === 180">出库明细审批流程</span>
         </template>
       </el-table-column>
       <el-table-column

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -465,17 +465,27 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
+            <el-form-item label="仓储费方式" prop="fChargetype">
+              <span>
+                <el-select v-model="form.fChargetype" slot="prepend" :disabled="browseStatus" placeholder="请选择" style="width:80%">
+                <el-option label="实际入库日期" value="0"></el-option>
+                <el-option label="最早入库日期" value="1"></el-option>
+              </el-select>
+              </span>
+            </el-form-item>
+          </el-col>
+          </el-row>
+        <el-row>
+          <el-col :span="8">
             <el-form-item label="制单人" prop="createBy">
               <el-input
-                disabled
-                v-model="form.createBy"
-                style="width:80%"
-                placeholder="制单人"
+                  disabled
+                  v-model="form.createBy"
+                  style="width:80%"
+                  placeholder="制单人"
               />
             </el-form-item>
           </el-col>
-          </el-row>
-        <el-row>
           <el-col :span="8">
             <el-form-item disabled label="制单日期" prop="fbilldate">
               <el-date-picker

vue.config.js

@@ -34,10 +34,12 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
+        // target: `http://192.168.1.143:9010/`,
+        target: `http://test.wms.tubaosoft.com/prod-api/`,
         // 华为10M
         // target: `http://121.36.212.131:9010/`,
         // target: `http://121.36.212.131:9020/`,
-        target: `http://121.36.212.131:9030/`,
+        // target: `http://121.36.212.131:9030/`,
         // 华为测试
         // target: `http://124.70.179.5:9010/`,
         // target: `http://124.70.179.5:9030`,