合并冲突

src/App.vue

@@ -49,6 +49,6 @@ export default {
     margin: 0 0 3px 0;
 }
 .el-input.is-disabled .el-input__inner {
-    color: #000 !important;
+    color: #000000 !important;
 }
-</style>
+</style>

src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -3108,6 +3108,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "13",
+          label: "fLocalcntrno",
+          name: "库内箱号",
+          checked: 0,
+          width: 100,
+        },
       ],
       setRowList2: [],
       getRowList2: [],

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -2196,6 +2196,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "13",
+          label: "fLocalcntrno",
+          name: "库内箱号",
+          checked: 0,
+          width: 100,
+        },
       ],
       setRowList2: [],
       getRowList2: [],

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -1147,6 +1147,11 @@
                   <el-dropdown-item command="d">货物确认</el-dropdown-item>
                   <el-dropdown-item command="e">劳务确认</el-dropdown-item>
                   <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="i">客户入库单</el-dropdown-item>-->
+                  <!--                  <el-dropdown-item command="j">卸货存档入库单</el-dropdown-item>-->
+                  <!--                  <el-dropdown-item command="k">整票垛卡入库单</el-dropdown-item>-->
                   <el-dropdown-item command="h">入库垛卡</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
@@ -2428,6 +2433,508 @@
         <el-button @click="print_dpxx = false">取消 </el-button>
       </span>
     </el-dialog>
+    <!--    <el-dialog-->
+    <!--      :visible.sync="print_ccdzrkd"-->
+    <!--      width="70%"-->
+    <!--      :close-on-click-modal="false"-->
+    <!--      :modal="false"-->
+    <!--    >-->
+    <!--      <div id="print_area8" class="print-div">-->
+    <!--        <div-->
+    <!--          class="print-title"-->
+    <!--          style="-->
+    <!--            display: flex;-->
+    <!--            justify-content: center;-->
+    <!--            font-size: 24px;-->
+    <!--            margin-bottom: 5px;-->
+    <!--          "-->
+    <!--        >-->
+    <!--          {{ company }}有限公司-->
+    <!--        </div>-->
+    <!--          <div style="display:flex;flex-direction: column;margin-left: 70%">-->
+    <!--            <div>{{ form.fBillno }}1111</div>-->
+    <!--            <div>存货地点：{{ stockName }}</div>-->
+    <!--          </div>-->
+    <!--        <div class="print_table" style="display: flex">-->
+    <!--          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">-->
+    <!--            <tr>-->
+    <!--              <td>品名</td>-->
+    <!--              <td colspan="3">{{form.goodName}}</td>-->
+    <!--              <td colspan="2">清单号</td>-->
+    <!--              <td colspan="3">{{ form.fCustomsdeclartion}}</td>-->
+    <!--            </tr>-->
+    <!--            <tr>-->
+    <!--              <td>入库日期</td>-->
+    <!--              <td>箱号</td>-->
+    <!--              <td>铅封号</td>-->
+    <!--              <td>预计件数</td>-->
+    <!--              <td>垛位</td>-->
+    <!--              <td>实收件数</td>-->
+    <!--              <td>实收净重（吨）</td>-->
+    <!--              <td>毛重（吨）</td>-->
+    <!--              <td>备注</td>-->
+    <!--            </tr>-->
+    <!--            <tr v-for="(item, index) in Printinglist" :key="index">-->
+    <!--              <td>{{ item.fBsdate }}</td>-->
+    <!--              <td>{{ item.fCntrno }}</td>-->
+    <!--              <td>{{ item.fSealno }}</td>-->
+    <!--              <td>{{ form.fPlanqty }}</td>-->
+    <!--              <td>{{ item.fWarehouseInformation }}</td>-->
+    <!--              <td>{{ item.fQty }}</td>-->
+    <!--              <td>{{ item.fNetweight/1000 }}</td>-->
+    <!--              <td>{{ item.fGrossweight/1000 }}</td>-->
+    <!--              <td>{{ item.remark }}</td>-->
+    <!--            </tr>-->
+    <!--            <tr>-->
+    <!--              <td>合计：</td>-->
+    <!--              <td></td>-->
+    <!--              <td></td>-->
+    <!--              <td></td>-->
+    <!--              <td></td>-->
+    <!--              <td>{{allfQty.toFixed(2)}}</td>-->
+    <!--              <td>{{(allfNetweight/1000).toFixed(2)}}</td>-->
+    <!--              <td>{{(allfGrossweight/1000).toFixed(2)}}</td>-->
+    <!--              <td></td>-->
+    <!--            </tr>-->
+    <!--          </table>-->
+    <!--        </div>-->
+    <!--        <div-->
+    <!--          style="display: flex; justify-content: space-between; font-size: 12px"-->
+    <!--        >-->
+    <!--&lt;!&ndash;          <div>操作：{{ form.createBy }}</div>&ndash;&gt;-->
+    <!--          <div>库管：{{ form.fContacts }}</div>-->
+    <!--          <div style="width: 100px">叉车：</div>-->
+    <!--        </div>-->
+    <!--      </div>-->
+    <!--      <span slot="footer" class="dialog-footer">-->
+    <!--        <el-button-->
+    <!--          type="primary"-->
+    <!--          :disabled="browseStatus"-->
+    <!--          @click="-->
+    <!--            addprint('ccdzrkd');-->
+    <!--            print_ccdzrkd = false;-->
+    <!--          "-->
+    <!--        >打印-->
+    <!--        </el-button>-->
+    <!--        <el-button @click="print_ccdzrkd = false">取消 </el-button>-->
+    <!--      </span>-->
+    <!--    </el-dialog>-->
+    <!--    <el-dialog-->
+    <!--      :visible.sync="print_fxdkrkd"-->
+    <!--      width="70%"-->
+    <!--      :close-on-click-modal="false"-->
+    <!--      :modal="false"-->
+    <!--    >-->
+    <!--      <div id="print_area9" class="print-div">-->
+    <!--        <div-->
+    <!--          class="print-title"-->
+    <!--          style="-->
+    <!--            display: flex;-->
+    <!--            justify-content: center;-->
+    <!--            font-size: 24px;-->
+    <!--            margin-bottom: 5px;-->
+    <!--          "-->
+    <!--        >-->
+    <!--          {{ company }}有限公司货物标识卡-->
+    <!--        </div>-->
+    <!--        <div class="print_table" style="display: flex">-->
+    <!--          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%"  v-for="(item, index) in Printinglist" :key="index">-->
+    <!--            <tr>-->
+    <!--              <td>货物名称</td>-->
+    <!--              <td colspan="2">{{form.goodName}}</td>-->
+    <!--              <td>库位</td>-->
+    <!--              <td colspan="2">{{ form.fWarehouseInformation}}</td>-->
+    <!--            </tr>-->
+    <!--            <tr>-->
+    <!--              <td>提单号</td>-->
+    <!--              <td colspan="2">{{form.fMblno}}</td>-->
+    <!--              <td>清单号</td>-->
+    <!--              <td colspan="2">{{ form.fCustomsdeclartion}}</td>-->
+    <!--            </tr>-->
+    <!--            <tr>-->
+    <!--              <td>箱号</td>-->
+    <!--              <td colspan="2">{{item.fCntrno}}</td>-->
+    <!--              <td>总箱量</td>-->
+    <!--              <td colspan="2">{{ item.fCntqty}}</td>-->
+    <!--            </tr>-->
+    <!--            <tr>-->
+    <!--              <td>总件数</td>-->
+    <!--              <td colspan="2">{{item.fQty}}</td>-->
+    <!--              <td>总净重</td>-->
+    <!--              <td colspan="2">{{ (item.fNetweight/1000).toFixed(2)}}</td>-->
+    <!--            </tr>-->
+    <!--            <tr>-->
+    <!--              <td>总毛重</td>-->
+    <!--              <td colspan="2">{{(item.fGrossweight/1000).toFixed(2)}}</td>-->
+    <!--              <td>本垛毛重</td>-->
+    <!--              <td colspan="2">{{(item.fGrossweight/1000).toFixed(2)}}</td>-->
+    <!--            </tr>-->
+    <!--            <tr>-->
+    <!--              <td>本垛件数</td>-->
+    <!--              <td colspan="2">{{item.fQty}}</td>-->
+    <!--              <td>本垛净重</td>-->
+    <!--              <td colspan="2">{{ (item.fNetweight/1000).toFixed(2)}}</td>-->
+    <!--            </tr>-->
+    <!--            <tr>-->
+    <!--              <td>入库日期</td>-->
+    <!--              <td colspan="2">{{item.fBsdate}}</td>-->
+    <!--              <td>仓管员</td>-->
+    <!--              <td colspan="2">{{ form.createBy}}</td>-->
+    <!--            </tr>-->
+    <!--            <tr>-->
+    <!--              <td>出库日期</td>-->
+    <!--              <td>出库件数</td>-->
+    <!--              <td>剩余件数</td>-->
+    <!--              <td>出库仓管员</td>-->
+    <!--              <td>盘点日期</td>-->
+    <!--              <td>盘点人</td>-->
+    <!--            </tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr>-->
+    <!--              <td>备注：</td>-->
+    <!--              <td colspan="5">{{form.remark}}</td>-->
+    <!--            </tr>-->
+    <!--          </table>-->
+    <!--        </div>-->
+    <!--        <div-->
+    <!--          style="display: flex; justify-content: space-between; font-size: 12px"-->
+    <!--        >-->
+    <!--          &lt;!&ndash;          <div>操作：{{ form.createBy }}</div>&ndash;&gt;-->
+    <!--          <div>库管：{{ form.fContacts }}</div>-->
+    <!--          <div style="width: 100px">叉车：</div>-->
+    <!--        </div>-->
+    <!--      </div>-->
+    <!--      <span slot="footer" class="dialog-footer">-->
+    <!--        <el-button-->
+    <!--          type="primary"-->
+    <!--          :disabled="browseStatus"-->
+    <!--          @click="-->
+    <!--            addprint('fxdkrkd');-->
+    <!--            print_fxdkrkd = false;-->
+    <!--          "-->
+    <!--        >打印-->
+    <!--        </el-button>-->
+    <!--        <el-button @click="print_fxdkrkd = false">取消 </el-button>-->
+    <!--      </span>-->
+    <!--    </el-dialog>-->
+    <!--    <el-dialog-->
+    <!--      :visible.sync="print_khrkd"-->
+    <!--      width="70%"-->
+    <!--      :close-on-click-modal="false"-->
+    <!--      :modal="false"-->
+    <!--    >-->
+    <!--      <div id="print_area10" class="print-div">-->
+    <!--        <div-->
+    <!--          class="print-title"-->
+    <!--          style="-->
+    <!--            display: flex;-->
+    <!--            justify-content: center;-->
+    <!--            font-size: 24px;-->
+    <!--            margin-bottom: 5px;-->
+    <!--          "-->
+    <!--        >-->
+    <!--          {{ company }}有限公司-->
+    <!--        </div>-->
+    <!--        <div-->
+    <!--          style="-->
+    <!--            display: flex;-->
+    <!--            justify-content: center;-->
+    <!--            font-size: 18px;-->
+    <!--            margin-bottom: 5px;-->
+    <!--          "-->
+    <!--        >-->
+    <!--          <div>入&nbsp;库&nbsp;单</div>-->
+    <!--        </div>-->
+    <!--        <div-->
+    <!--          style="-->
+    <!--            display: flex;-->
+    <!--            justify-content: space-between;-->
+    <!--            margin-bottom: 5px;-->
+    <!--          "-->
+    <!--          class="print_form"-->
+    <!--        >-->
+    <!--            <div>客户名称：{{ form.fCorpidName }}</div>-->
+    <!--            <div>存货地点：{{ stockName }}</div>-->
+    <!--        </div>-->
+    <!--        <div class="print_table" style="display: flex">-->
+    <!--          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">-->
+    <!--            <tr>-->
+    <!--              <td>序号</td>-->
+    <!--              <td>实际入库日期</td>-->
+    <!--              <td>商品名称</td>-->
+    <!--              <td>提单号</td>-->
+    <!--              <td>箱号</td>-->
+    <!--              <td>件数</td>-->
+    <!--              <td>毛重（吨）</td>-->
+    <!--              <td>净重（吨）</td>-->
+    <!--              <td>备注</td>-->
+    <!--            </tr>-->
+    <!--            <tr v-for="(item, index) in Printinglist" :key="index">-->
+    <!--              <td>{{ index+1 }}</td>-->
+    <!--              <td>{{ item.fBsdate }}</td>-->
+    <!--              <td>{{ item.fGoodsids }}</td>-->
+    <!--              <td>{{ item.fMblno }}</td>-->
+    <!--              <td>{{ item.fCntrno }}</td>-->
+    <!--              <td>{{ item.fQty }}</td>-->
+    <!--              <td>{{ (item.fGrossweight/1000).toFixed(2) }}</td>-->
+    <!--              <td>{{ (item.fNetweight/1000).toFixed(2) }}</td>-->
+    <!--              <td>{{ item.remark }}</td>-->
+    <!--            </tr>-->
+    <!--            <tr>-->
+    <!--              <td>合计：</td>-->
+    <!--              <td></td>-->
+    <!--              <td></td>-->
+    <!--              <td></td>-->
+    <!--              <td></td>-->
+    <!--              <td>{{allfQty.toFixed(2)}}</td>-->
+    <!--              <td>{{(allfNetweight/1000).toFixed(2)}}</td>-->
+    <!--              <td>{{(allfGrossweight/1000).toFixed(2)}}</td>-->
+    <!--              <td></td>-->
+    <!--            </tr>-->
+    <!--          </table>-->
+    <!--        </div>-->
+    <!--        <div-->
+    <!--          style="display: flex; justify-content: space-between; font-size: 12px"-->
+    <!--        >-->
+    <!--          &lt;!&ndash;          <div>操作：{{ form.createBy }}</div>&ndash;&gt;-->
+    <!--          <div>库管：{{ form.fContacts }}</div>-->
+    <!--          <div style="width: 100px">叉车：</div>-->
+    <!--        </div>-->
+    <!--      </div>-->
+    <!--      <span slot="footer" class="dialog-footer">-->
+    <!--        <el-button-->
+    <!--          type="primary"-->
+    <!--          :disabled="browseStatus"-->
+    <!--          @click="-->
+    <!--            addprint('khrkd');-->
+    <!--            print_khrkd = false;-->
+    <!--          "-->
+    <!--        >打印-->
+    <!--        </el-button>-->
+    <!--        <el-button @click="print_khrkd = false">取消 </el-button>-->
+    <!--      </span>-->
+    <!--    </el-dialog>-->
+    <!--    <el-dialog-->
+    <!--      :visible.sync="print_xhcdrkd"-->
+    <!--      width="70%"-->
+    <!--      :close-on-click-modal="false"-->
+    <!--      :modal="false"-->
+    <!--    >-->
+    <!--      <div id="print_area11" class="print-div">-->
+    <!--        <div-->
+    <!--          class="print-title"-->
+    <!--          style="-->
+    <!--            display: flex;-->
+    <!--            justify-content: center;-->
+    <!--            font-size: 24px;-->
+    <!--            margin-bottom: 5px;-->
+    <!--          "-->
+    <!--        >-->
+    <!--          {{ company }}有限公司入库单-->
+    <!--        </div>-->
+    <!--        <div-->
+    <!--          style="-->
+    <!--            display: flex;-->
+    <!--            justify-content: space-between;-->
+    <!--            margin-bottom: 5px;-->
+    <!--          "-->
+    <!--          class="print_form"-->
+    <!--        >-->
+    <!--          <div>-->
+    <!--            <div>提单号：{{ form.fMblno }}</div>-->
+    <!--            <div>客户名称：{{ form.fCorpidName }}</div>-->
+    <!--            <div>货物名称：{{ form.fProductName }}</div>-->
+    <!--            <div>件数：{{ form.fPlanqty }}</div>-->
+    <!--          </div>-->
+    <!--          <div>-->
+    <!--            <div>系统编号：{{ form.fBillno }}</div>-->
+    <!--            <div>计划入库日期：{{ form.fBsdate }}</div>-->
+    <!--            <div>制单日期：{{ form.createTime }}</div>-->
+    <!--            <div>毛重：{{(form.fPlangrossweight/1000).toFixed(2)}}</div>-->
+    <!--          </div>-->
+    <!--          <div>-->
+    <!--            <div>清单号：{{ form.fCustomsdeclartion }}</div>-->
+    <!--            <div>存放仓库：{{ stockName }}</div>-->
+    <!--            <div>净重：{{(form.fPlannetweight/1000).toFixed(2)}}</div>-->
+    <!--          </div>-->
+    <!--        </div>-->
+    <!--        <div class="print_table" style="display: flex">-->
+    <!--          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">-->
+    <!--            <tr>-->
+    <!--              <td>箱号</td>-->
+    <!--              <td>铅封号</td>-->
+    <!--              <td>预计件数</td>-->
+    <!--              <td>实际件数</td>-->
+    <!--              <td>库位</td>-->
+    <!--              <td>实际入库日期</td>-->
+    <!--              <td>送货车号</td>-->
+    <!--              <td>送货司机</td>-->
+    <!--              <td>备注</td>-->
+    <!--            </tr>-->
+    <!--            <tr v-for="(item,index) in Printinglist" :key="index">-->
+    <!--              <td>{{item.fCntrno}}</td>-->
+    <!--              <td>{{item.fSealno}}</td>-->
+    <!--              <td>{{form.fPlanqty}}</td>-->
+    <!--              <td>{{item.fQty}}</td>-->
+    <!--              <td>{{item.fWarehouseInformation}}</td>-->
+    <!--              <td>{{item.fBsdate}}</td>-->
+    <!--              <td>{{item.fTruckno}}</td>-->
+    <!--              <td>{{item.fDriverName}}</td>-->
+    <!--              <td>{{item.remark}}</td>-->
+    <!--            </tr>-->
+    <!--            <tr>-->
+    <!--              <td colspan="3">合计：</td>-->
+    <!--              <td>{{allfQty}}</td>-->
+    <!--              <td></td>-->
+    <!--              <td></td>-->
+    <!--              <td></td>-->
+    <!--              <td></td>-->
+    <!--              <td></td>-->
+    <!--            </tr>-->
+    <!--          </table>-->
+    <!--        </div>-->
+    <!--        <div-->
+    <!--          style="display: flex; justify-content: space-between; font-size: 12px"-->
+    <!--        >-->
+    <!--          <div>操作：{{ form.createBy }}</div>-->
+    <!--          <div>库管：{{ form.fContacts }}</div>-->
+    <!--          <div style="width: 100px">叉车：</div>-->
+    <!--        </div>-->
+    <!--      </div>-->
+    <!--      <span slot="footer" class="dialog-footer">-->
+    <!--        <el-button-->
+    <!--          type="primary"-->
+    <!--          :disabled="browseStatus"-->
+    <!--          @click="-->
+    <!--            addprint('xhcdrkd');-->
+    <!--            print_xhcdrkd = false;-->
+    <!--          "-->
+    <!--        >打印-->
+    <!--        </el-button>-->
+    <!--        <el-button @click="print_xhcdrkd = false">取消 </el-button>-->
+    <!--      </span>-->
+    <!--    </el-dialog>-->
+    <!--    <el-dialog-->
+    <!--      :visible.sync="print_zpdkrkd"-->
+    <!--      width="70%"-->
+    <!--      :close-on-click-modal="false"-->
+    <!--      :modal="false"-->
+    <!--    >-->
+    <!--      <div id="print_area12" class="print-div">-->
+    <!--        <div-->
+    <!--          class="print-title"-->
+    <!--          style="-->
+    <!--            display: flex;-->
+    <!--            justify-content: center;-->
+    <!--            font-size: 24px;-->
+    <!--            margin-bottom: 5px;-->
+    <!--          "-->
+    <!--        >-->
+    <!--          {{ company }}有限公司货物标识卡-->
+    <!--        </div>-->
+    <!--        <div class="print_table" style="display: flex">-->
+    <!--          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%"  >-->
+    <!--            <tr>-->
+    <!--              <td>货物名称</td>-->
+    <!--              <td colspan="2">{{form.goodName}}</td>-->
+    <!--              <td>库位</td>-->
+    <!--              <td colspan="2">{{ stockName}}</td>-->
+    <!--            </tr>-->
+    <!--            <tr>-->
+    <!--              <td>提单号</td>-->
+    <!--              <td colspan="2">{{form.fMblno}}</td>-->
+    <!--              <td>清单号</td>-->
+    <!--              <td colspan="2">{{ form.fCustomsdeclartion}}</td>-->
+    <!--            </tr>-->
+    <!--            <tr>-->
+    <!--              <td>箱号</td>-->
+    <!--              <td colspan="2"></td>-->
+    <!--              <td>总箱量</td>-->
+    <!--              <td colspan="2">{{ container}}</td>-->
+    <!--            </tr>-->
+    <!--            <tr>-->
+    <!--              <td>总件数</td>-->
+    <!--              <td colspan="2">{{form.fPlanqty}}</td>-->
+    <!--              <td>总净重</td>-->
+    <!--              <td colspan="2">{{ (form.fPlannetweight/1000).toFixed(2)}}</td>-->
+    <!--            </tr>-->
+    <!--            <tr>-->
+    <!--              <td>总毛重</td>-->
+    <!--              <td colspan="2">{{(form.fPlangrossweight/1000).toFixed(2)}}</td>-->
+    <!--              <td>本垛毛重</td>-->
+    <!--              <td colspan="2">{{(form.fPlangrossweight/1000).toFixed(2)}}</td>-->
+    <!--            </tr>-->
+    <!--            <tr>-->
+    <!--              <td>本垛件数</td>-->
+    <!--              <td colspan="2">{{form.fPlanqty}}</td>-->
+    <!--              <td>本垛净重</td>-->
+    <!--              <td colspan="2">{{ (form.fPlannetweight/1000).toFixed(2)}}</td>-->
+    <!--            </tr>-->
+    <!--            <tr>-->
+    <!--              <td>入库日期</td>-->
+    <!--              <td colspan="2">{{form.fBsdate}}</td>-->
+    <!--              <td>仓管员</td>-->
+    <!--              <td colspan="2">{{ form.createBy}}</td>-->
+    <!--            </tr>-->
+    <!--            <tr>-->
+    <!--              <td>出库日期</td>-->
+    <!--              <td>出库件数</td>-->
+    <!--              <td>剩余件数</td>-->
+    <!--              <td>出库仓管员</td>-->
+    <!--              <td>盘点日期</td>-->
+    <!--              <td>盘点人</td>-->
+    <!--            </tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr ><td style="height:20px"></td><td></td><td></td><td></td><td></td><td></td></tr>-->
+    <!--            <tr>-->
+    <!--              <td>备注：</td>-->
+    <!--              <td colspan="5">{{form.remark}}</td>-->
+    <!--            </tr>-->
+    <!--          </table>-->
+    <!--        </div>-->
+    <!--        <div-->
+    <!--          style="display: flex; justify-content: space-between; font-size: 12px"-->
+    <!--        >-->
+    <!--          &lt;!&ndash;          <div>操作：{{ form.createBy }}</div>&ndash;&gt;-->
+    <!--          <div>库管：{{ form.fContacts }}</div>-->
+    <!--          <div style="width: 100px">叉车：</div>-->
+    <!--        </div>-->
+    <!--      </div>-->
+    <!--      <span slot="footer" class="dialog-footer">-->
+    <!--        <el-button-->
+    <!--          type="primary"-->
+    <!--          :disabled="browseStatus"-->
+    <!--          @click="-->
+    <!--            addprint('fxdkrkd');-->
+    <!--            print_zpdkrkd = false;-->
+    <!--          "-->
+    <!--        >打印-->
+    <!--        </el-button>-->
+    <!--        <el-button @click="print_zpdkrkd = false">取消 </el-button>-->
+    <!--      </span>-->
+    <!--    </el-dialog>-->
+    <!-- 选择作业费协议数据 -->
     <el-dialog
       :visible.sync="print_dk"
       width="70%"
@@ -2657,6 +3164,7 @@ export default {
   },
   data() {
     return {
+      container: "",
       pageNum: 1,
       pageSize: 10,
       dialogWhgenlegList: [],
@@ -2737,6 +3245,11 @@ export default {
       print_hwqr: false,
       print_lwqr: false,
       print_dpxx: false,
+      print_ccdzrkd: false,
+      print_fxdkrkd: false,
+      print_khrkd: false,
+      print_xhcdrkd: false,
+      print_zpdkrkd: false,
       print_bzrkd: false,
       print_dk: false,
       company: "",
@@ -3299,7 +3812,6 @@ export default {
         if (res.code == 200) {
           this.showSetting = false;
           this.getRowList = this.setRowList.filter((e) => e.checked == 0);
-          console.log(this.tableDate);
         }
       });
     },
@@ -4546,7 +5058,6 @@ export default {
               this.importList.fGrossweight / 1000
             ).toFixed(2);
           }
-          console.log(this.importList);
           this.weightList = true;
         }
       });
@@ -4593,6 +5104,11 @@ export default {
                 this.stockaddr = e.fAddr;
               }
             });
+            this.goodsOptions.map((e) => {
+              if (e.fId == this.form.fGoodsid) {
+                this.$set(this.form, "goodName", e.fName);
+              }
+            });
             this.fDriverTel = this.Printinglist[0].fDriverTel;
             this.fBsdate = this.Printinglist[0].fBsdate;
             this.fTruckno = this.Printinglist[0].fTruckno;
@@ -4617,6 +5133,16 @@ export default {
               if (e.fQty) {
                 this.allfQty += e.fQty;
               }
+              if (e.fBsdate) {
+                let date = new Date(this.Printinglist[0].fBsdate);
+                let Y = date.getFullYear();
+                let M =
+                  date.getMonth() + 1 < 10
+                    ? "0" + (date.getMonth() + 1)
+                    : date.getMonth() + 1;
+                let D = date.getDate();
+                e.fBsdate = Y + "-" + M + "-" + D;
+              }
             });
             if (command == "a") {
               this.print_shd = true;
@@ -4630,8 +5156,43 @@ export default {
               this.print_lwqr = true;
             } else if (command == "f") {
               this.print_dpxx = true;
-            } else if (command == "g") {
-              this.print_bzrkd = true;
+              // }
+              // else if(command == "g"){
+              //   this.print_ccdzrkd = true
+              // } else if(command == "h"){
+              //   if(this.Printinglist.length == 1){
+              //     this.print_fxdkrkd = true
+              //   }else {
+              //     this.$message.error("请选择单条明细")
+              //   }
+              // } else if(command == "i"){
+              // this.print_khrkd = true
+              // } else if(command == "j"){
+              //   let date = new Date(this.Printinglist[0].fBsdate)
+              //   let Y = date.getFullYear()
+              //   let M = (date.getMonth() +1 <10 ?'0' + (date.getMonth() +1) : date.getMonth() +1)
+              //   let D = date.getDate()
+              //   this.form.fBsdate = Y + '-' + M + '-' + D
+              // this.print_xhcdrkd = true
+              // } else if(command == "k") {
+              //   let container = []
+              //   this.container = ''
+              //   this.CntrTable.map((e)=>{
+              //     this.cntrList.map((i)=>{
+              //       if(i.fId == e.fCntrid){
+              //         e.fCntrid = i.fName
+              //         container.push(e.fCntrid + '*' + e.fCntrcount + ',')
+              //       }
+              //     })
+              //   })
+              //   container.forEach(item =>{
+              //     this.container += item
+              //   })
+              //   this.container = this.container.slice(0,this.container.length-1)
+              //   console.log(this.container)
+              //   this.print_zpdkrkd = true
+              // } else if (command == "g") {
+              //   this.print_bzrkd = true;
             } else if (command == "h") {
               this.print_dk = true;
             }
@@ -4760,119 +5321,139 @@ export default {
     },
     //打印
     addprint(status) {
-      let checkData = {
-        fId: this.form.fId,
-        fType: "warehouse",
-        codeVal: this.form.fDateChanged,
-      };
-      checkCode(checkData).then((response) => {
-        if (!response) {
-          this.$confirm("数据发生变化，请更新一下数据?", "提示", {
-            confirmButtonText: "确认",
-            cancelButtonText: "取消",
-            type: "warning",
-          }).then(() => {
-            this.getForm();
-          });
-        } else {
-          if (status == "zyd") {
-            if (this.CntrTable.length > 0) {
-              let arr = [];
-              this.CntrTable.map((e) => {
-                this.cntrList.map((item) => {
-                  if (item.fId == e.fCntrid) {
-                    arr.push(item.fName + "X" + e.fCntrcount);
-                  }
-                });
+      const style =
+        "@page {  } " +
+        "@media print { .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;}";
+      switch (status) {
+        case "zyd":
+          if (this.CntrTable.length > 0) {
+            let arr = [];
+            this.CntrTable.map((e) => {
+              this.cntrList.map((item) => {
+                if (item.fId == e.fCntrid) {
+                  arr.push(item.fName + "X" + e.fCntrcount);
+                }
               });
-              arr = [...new Set(arr)];
-              this.form.fCntval = arr.join(",");
-            } else {
-              this.form.fCntval = null;
-            }
-            if (this.detailList.length > 0) {
-              let arr = [];
-              this.detailList.map((e) => {
-                this.goodsOptions.map((item) => {
-                  if (e.fGoodsid == item.fId) {
-                    arr.push(item.fName);
+            });
+            arr = [...new Set(arr)];
+            this.form.fCntval = arr.join(",");
+          } else {
+            this.form.fCntval = null;
+          }
+          if (this.detailList.length > 0) {
+            let arr = [];
+            this.detailList.map((e) => {
+              this.goodsOptions.map((item) => {
+                if (e.fGoodsid == item.fId) {
+                  arr.push(item.fName);
+                }
+              });
+            });
+            arr = [...new Set(arr)];
+            this.form.fProductName = arr.join(",");
+          } else {
+            this.form.fProductName = "";
+          }
+          if (this.detailList.length > 0) {
+            let arr = [];
+            this.detailList.map((e) => {
+              arr.push(e.fMarks);
+            });
+            arr = [...new Set(arr)];
+            this.form.fMarks = arr.join(",");
+          } else {
+            this.form.fMarks = "";
+          }
+          this.form.fBillingway = this.form.fFeetUnit;
+          if (this.detailList.length == 0) {
+            this.form.fNetweight = 0;
+            this.form.fPlanvolumn = 0;
+            this.form.fGrossweight = 0;
+          } else {
+            this.form.fNetweight = this.fNetweight;
+            this.form.fPlanvolumn = this.fPlanvolumn;
+            this.form.fGrossweight = this.fGrossweight;
+          }
+          let formData = new window.FormData();
+          formData.append("warehouseBills", JSON.stringify(this.form));
+          formData.append(
+            "warehousebillsitems",
+            JSON.stringify(this.Printinglist)
+          );
+          formData.append(
+            "warehousebillsfeesDr",
+            JSON.stringify(this.warehouseDrList)
+          );
+          formData.append(
+            "warehousebillsfeesCr",
+            JSON.stringify(this.warehouseCrList)
+          );
+          formData.append(
+            "tEnclosure",
+            JSON.stringify(this.relevantAttachments)
+          );
+          formData.append("tCntr", JSON.stringify(this.CntrTable));
+          addJoblist(formData).then((response) => {
+            if (response.code == 200) {
+              this.detailList.map((e, index) => {
+                response.data.warehousebillsitems.map((item) => {
+                  if (e.fId == item.fId) {
+                    e = item;
+                    this.$set(this.detailList, index, e);
                   }
                 });
               });
-              arr = [...new Set(arr)];
-              this.form.fProductName = arr.join(",");
-            } else {
-              this.form.fProductName = "";
+              this.$set(this.form, "fItemsStatus", 2);
             }
-            if (this.detailList.length > 0) {
-              let arr = [];
-              this.detailList.map((e) => {
-                arr.push(e.fMarks);
-              });
-              arr = [...new Set(arr)];
-              this.form.fMarks = arr.join(",");
-            } else {
-              this.form.fMarks = "";
-            }
-            this.form.fBillingway = this.form.fFeetUnit;
-            if (this.detailList.length == 0) {
-              this.form.fNetweight = 0;
-              this.form.fPlanvolumn = 0;
-              this.form.fGrossweight = 0;
-            } else {
-              this.form.fNetweight = this.fNetweight;
-              this.form.fPlanvolumn = this.fPlanvolumn;
-              this.form.fGrossweight = this.fGrossweight;
-            }
-            let formData = new window.FormData();
-            formData.append("warehouseBills", JSON.stringify(this.form));
-            formData.append(
-              "warehousebillsitems",
-              JSON.stringify(this.Printinglist)
-            );
-            formData.append(
-              "warehousebillsfeesDr",
-              JSON.stringify(this.warehouseDrList)
-            );
-            formData.append(
-              "warehousebillsfeesCr",
-              JSON.stringify(this.warehouseCrList)
-            );
-            formData.append(
-              "tEnclosure",
-              JSON.stringify(this.relevantAttachments)
-            );
-            formData.append("tCntr", JSON.stringify(this.CntrTable));
-            addJoblist(formData).then((response) => {
-              if (response.code == 200) {
-                this.$set(
-                  this.form,
-                  "fDateChanged",
-                  response.data.fDateChanged
-                );
-                this.detailList.map((e, index) => {
-                  response.data.warehousebillsitems.map((item) => {
-                    if (e.fId == item.fId) {
-                      e = item;
-                      this.$set(this.detailList, index, e);
-                    }
-                  });
-                });
-                this.$set(this.form, "fItemsStatus", 2);
-              }
-            });
-          }
-        }
-      });
-      const style =
-        "@page {  } " +
-        "@media print { .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_area1",
-        type: "html",
-        style: style, // 亦可使用引入的外部css;
-        scanStyles: false,
-      });
+          });
+          print({
+            printable: "print_area1",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break;
+        case "ccdzrkd":
+          print({
+            printable: "print_area8",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break;
+        case "fxdkrkd":
+          print({
+            printable: "print_area9",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break;
+        case "khrkd":
+          print({
+            printable: "print_area10",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break;
+        case "xhcdrkd":
+          print({
+            printable: "print_area11",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break;
+        case "zpdkrkd":
+          print({
+            printable: "print_area12",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break;
+      }
     },
     cancel() {
       if (this.$route.query.id) {

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -863,6 +863,9 @@
                   <el-dropdown-item command="c">理货单</el-dropdown-item>
                   <el-dropdown-item command="e">出库确认</el-dropdown-item>
                   <el-dropdown-item command="e">劳务确认</el-dropdown-item>
+<!--                  <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-menu>
               </el-dropdown>
               <div style="margin: 0 10px">
@@ -2594,6 +2597,321 @@
         <el-button @click="print_lwqr = false">取消 </el-button>
       </span>
     </el-dialog>
+    <el-dialog
+      :visible.sync="print_ccckd"
+      width="70%"
+      :close-on-click-modal="false"
+      :modal="false"
+    >
+      <div id="print_area6" class="print-div">
+        <div
+          class="print-title"
+          style="
+            display: flex;
+            justify-content: center;
+            font-size: 24px;
+            margin-bottom: 5px;
+          "
+        >
+          {{ company }}有限公司
+        </div>
+
+          <div
+            style="
+            display: flex;
+            justify-content: center;
+            margin-left: 350px;
+            margin-bottom: 5px;
+          "
+          >
+            <div style="font-size: 18px;">出&nbsp;库&nbsp;单</div>
+            <div  style="margin-left: 200px">
+              <div style="margin-bottom: 5px;">{{form.fBillno}}</div>
+              <div>存放地点：{{stockName}}</div>
+            </div>
+
+          </div>
+
+        <div class="print_table" style="display: flex">
+          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
+            <tr>
+              <td>品名</td>
+              <td colspan="2">{{ form.fProductName }}</td>
+              <td>清单号</td>
+              <td colspan="3">{{ form.fCustomsdeclartion }}</td>
+            </tr>
+            <tr>
+              <td>提单号</td>
+              <td colspan="2">{{ form.fMblno }}</td>
+              <td>出库日期</td>
+              <td colspan="3">{{ fBsdate}}</td>
+            </tr>
+            <tr>
+              <td>原入库箱号</td>
+              <td>出库车号</td>
+              <td>铅封号</td>
+              <td>垛位</td>
+              <td>件数</td>
+              <td>净重</td>
+              <td>备注</td>
+            </tr>
+            <tr v-for="(item, index) in Printinglist" :key="index">
+              <td>{{ item.fCntrno }}</td>
+              <td>{{ item.fTruckno }}</td>
+              <td>{{item.fSealno}}</td>
+              <td>{{ item.fWarehouseInformation }}</td>
+              <td>{{ item.fQty }}</td>
+              <td>{{item.fNetweight}}</td>
+              <td>{{ item.remark }}</td>
+            </tr>
+            <tr>
+              <td colspan="4">合计：</td>
+              <td>{{allfQty}}</td>
+              <td>{{allfNetweight}}</td>
+              <td></td>
+            </tr>
+          </table>
+        </div>
+        <div
+          style="display: flex; justify-content: space-between; font-size: 12px"
+        >
+          <div>库管：{{ form.fContacts }}</div>
+          <div style="width: 100px">叉车：</div>
+        </div>
+        <div
+          style="display: flex; justify-content: space-between; font-size: 12px"
+        >
+          <div>制单人：{{ form.createBy }}</div>
+          <div style="width: 100px">初审核人：</div>
+          <div style="width: 100px">复式审核人：</div>
+        </div>
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          :disabled="browseStatus"
+          @click="
+            addprint('ccckd');
+            print_ccckd = false;
+          "
+        >打印
+        </el-button>
+        <el-button @click="print_ccckd = false">取消 </el-button>
+      </span>
+    </el-dialog>
+    <el-dialog
+      :visible.sync="print_dcckd"
+      width="70%"
+      :close-on-click-modal="false"
+      :modal="false"
+    >
+      <div id="print_area7" class="print-div">
+        <div
+          class="print-title"
+          style="
+            display: flex;
+            justify-content: center;
+            font-size: 24px;
+            margin-bottom: 5px;
+          "
+        >
+          {{ company }}有限公司
+        </div>
+
+        <div
+          style="
+            display: flex;
+            justify-content: center;
+            margin-left: 350px;
+            margin-bottom: 5px;
+          "
+        >
+          <div style="font-size: 18px;">出&nbsp;库&nbsp;单</div>
+          <div  style="margin-left: 200px">
+            <div style="margin-bottom: 5px;">{{form.fBillno}}</div>
+          </div>
+        </div>
+        <div style="
+            display: flex;
+            margin-bottom: 5px;
+          ">
+          <div style="width: 50%">客户名称：{{form.fCorpidName}}</div>
+          <div style="margin-left: 250px">存放地点：{{stockName}}</div>
+        </div>
+        <div class="print_table" style="display: flex">
+          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
+            <tr>
+              <td>品名</td>
+              <td colspan="2">{{ form.fProductName }}</td>
+              <td>清单号</td>
+              <td colspan="3">{{ form.fCustomsdeclartion }}</td>
+            </tr>
+            <tr>
+              <td>提单号</td>
+              <td colspan="2">{{ form.fMblno }}</td>
+              <td>出库日期</td>
+              <td colspan="3">{{ fBsdate}}</td>
+            </tr>
+            <tr>
+              <td>原入库箱号</td>
+              <td>出库车号</td>
+              <td>铅封号</td>
+              <td>垛位</td>
+              <td>件数</td>
+              <td>净重</td>
+              <td>备注</td>
+            </tr>
+            <tr v-for="(item, index) in Printinglist" :key="index">
+              <td>{{ item.fCntrno }}</td>
+              <td>{{ item.fTruckno }}</td>
+              <td>{{item.fSealno}}</td>
+              <td>{{ item.fWarehouseInformation }}</td>
+              <td>{{ item.fQty }}</td>
+              <td>{{item.fNetweight}}</td>
+              <td>{{ item.remark }}</td>
+            </tr>
+            <tr>
+              <td colspan="4">合计：</td>
+              <td>{{allfQty}}</td>
+              <td>{{allfNetweight}}</td>
+              <td></td>
+            </tr>
+          </table>
+        </div>
+        <div
+          style="display: flex; justify-content: space-between; font-size: 12px"
+        >
+          <div>库管：{{ form.fContacts }}</div>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          :disabled="browseStatus"
+          @click="
+            addprint('dcckd');
+            print_dcckd = false;
+          "
+        >打印
+        </el-button>
+        <el-button @click="print_dcckd = false">取消 </el-button>
+      </span>
+    </el-dialog>
+    <el-dialog
+      :visible.sync="print_zccdckd"
+      width="70%"
+      :close-on-click-modal="false"
+      :modal="false"
+    >
+      <div id="print_area8" class="print-div">
+        <div
+          class="print-title"
+          style="
+            display: flex;
+            justify-content: center;
+            font-size: 24px;
+            margin-bottom: 5px;
+          "
+        >
+          {{ company }}有限公司
+        </div>
+
+        <div
+          style="
+            display: flex;
+            justify-content: center;
+            margin-left: 350px;
+            margin-bottom: 5px;
+          "
+        >
+          <div style="font-size: 18px;">出&nbsp;库&nbsp;单</div>
+          <div  style="margin-left: 200px">
+            <div style="margin-bottom: 5px;">{{form.fBillno}}</div>
+          </div>
+        </div>
+        <div style="
+            display: flex;
+            margin-bottom: 5px;
+          ">
+          <div style="width: 50%">客户名称：{{form.fCorpidName}}</div>
+          <div style="margin-left: 250px">存放地点：{{stockName}}</div>
+        </div>
+        <div class="print_table" style="display: flex">
+          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
+            <tr>
+              <td>品名</td>
+              <td colspan="3">{{ form.fProductName }}</td>
+              <td colspan="2">清单号</td>
+              <td colspan="3">{{ form.fCustomsdeclartion }}</td>
+            </tr>
+            <tr>
+              <td>提单号</td>
+              <td colspan="3">{{ form.fMblno }}</td>
+              <td colspan="2">出库日期</td>
+              <td colspan="3">{{ fBsdate}}</td>
+            </tr>
+            <tr>
+              <td>原入库箱号</td>
+              <td>出库车号</td>
+              <td>垛位</td>
+              <td>件数</td>
+              <td>净重</td>
+              <td>提货人签字手印</td>
+              <td>提货人电话</td>
+              <td>所收费用</td>
+              <td>备注</td>
+            </tr>
+            <tr v-for="(item, index) in Printinglist" :key="index">
+              <td>{{ item.fCntrno }}</td>
+              <td>{{ item.fTruckno }}</td>
+              <td>{{ item.fWarehouseInformation }}</td>
+              <td>{{ item.fQty }}</td>
+              <td>{{item.fNetweight}}</td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td>{{ item.remark }}</td>
+            </tr>
+            <tr>
+              <td colspan="3">合计：</td>
+              <td>{{allfQty}}</td>
+              <td>{{allfNetweight}}</td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+            </tr>
+          </table>
+        </div>
+        <div
+          style="display: flex; justify-content: space-between; font-size: 12px"
+        >
+          <div>库管：{{ form.fContacts }}</div>
+          <div style="width: 100px">叉车：</div>
+        </div>
+        <div
+          style="display: flex; justify-content: space-between; font-size: 12px"
+        >
+          <div>制单人：{{ form.createBy }}</div>
+          <div style="width: 100px">初审核人：</div>
+          <div style="width: 100px">复式审核人：</div>
+        </div>
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          :disabled="browseStatus"
+          @click="
+            addprint('zccdckd');
+            print_zccdckd = false;
+          "
+        >打印
+        </el-button>
+        <el-button @click="print_zccdckd = false">取消 </el-button>
+      </span>
+    </el-dialog>
     <!-- 选择作业费协议数据 -->
     <el-dialog
       v-dialogDrag
@@ -2897,7 +3215,6 @@ export default {
       fStorageTypeOptions: [],
       weightList: false,
       sumMum: 0,
-      allfPlanqty: 0,
       detailList: [],
       print_zyd: false,
       print_shd: false,
@@ -2906,6 +3223,9 @@ export default {
       print_hwqr: false,
       print_lwqr: false,
       print_dpxx: false,
+      print_ccckd: false,
+      print_dcckd: false,
+      print_zccdckd: false,
       print_bzckd: false,
       company: "",
       Printinglist: [],
@@ -3265,6 +3585,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "13",
+          label: "fLocalcntrno",
+          name: "库内箱号",
+          checked: 0,
+          width: 100,
+        },
       ],
       setRowList2: [],
       getRowList2: [],
@@ -3510,7 +3837,6 @@ export default {
         if (res.code == 200) {
           this.showSetting = false;
           this.getRowList = this.setRowList.filter((e) => e.checked == 0);
-          console.log(this.tableDate);
         }
       });
     },
@@ -4775,10 +5101,6 @@ export default {
       //允许撤销入库list
       this.dataWithdrawList = [];
       this.dataWithdrawList = selection.filter((e) => e.fBillstatus == 40);
-      console.log("ruku");
-      console.log(this.dataListSelection);
-      console.log("chexiao");
-      console.log(this.dataWithdrawList);
     },
     // 合计
     getSummaries(param) {
@@ -5004,7 +5326,12 @@ export default {
               }
             });
             this.fDriverTel = this.Printinglist[0].fDriverTel;
-            this.fBsdate = this.Printinglist[0].fBsdate;
+            let date = new Date(this.Printinglist[0].fBsdate)
+            let Y = date.getFullYear()
+            let M = (date.getMonth() +1 <10 ?'0' + (date.getMonth() +1) : date.getMonth() +1)
+            let D = date.getDate()
+            this.fBsdate = Y + '-' + M + '-' + D
+            // this.fBsdate = this.Printinglist[0].fBsdate;
             this.fTruckno = this.Printinglist[0].fTruckno;
             this.allfCntqty = 0;
             this.allfGrossweight = 0;
@@ -5038,6 +5365,12 @@ export default {
               this.print_bzckd = true;
             } else if (command == "e") {
               this.print_lwqr = true;
+            } else if(command == "f"){
+              this.print_ccckd = true
+            } else if (command == "g"){
+              this.print_dcckd = true
+            } else if(command == "h"){
+              this.print_zccdckd = true
             }
           }
         });
@@ -5164,7 +5497,6 @@ export default {
           }
           let fAmount = 0;
           fAmount = e.fPrice * qty;
-          console.log(this.key_id);
           if (this.key_id == 3) {
             this.warehouseDrList.push({
               fQty: qty,
@@ -5298,125 +5630,207 @@ export default {
     },
     //打印
     addprint(status) {
-      let checkData = {
-        fId: this.form.fId,
-        fType: "warehouse",
-        codeVal: this.form.fDateChanged,
-      };
-      checkCode(checkData).then((response) => {
-        if (!response) {
-          this.$confirm("数据发生变化，请更新一下数据?", "提示", {
-            confirmButtonText: "确认",
-            cancelButtonText: "取消",
-            type: "warning",
-          }).then(() => {
-            this.getForm();
-          });
-        } else {
-          if (status == "zyd") {
-            if (this.CntrTable.length > 0) {
-              let arr = [];
-              this.CntrTable.map((e) => {
-                this.cntrList.map((item) => {
-                  if (item.fId == e.fCntrid) {
-                    arr.push(item.fName + "X" + e.fCntrcount);
-                  }
-                });
+      // if (status == "zyd") {
+        // if (this.CntrTable.length > 0) {
+        //   let arr = [];
+        //   this.CntrTable.map((e) => {
+        //     this.cntrList.map((item) => {
+        //       if (item.fId == e.fCntrid) {
+        //         arr.push(item.fName + "X" + e.fCntrcount);
+        //       }
+        //     });
+        //   });
+        //   arr = [...new Set(arr)];
+        //   this.form.fCntval = arr.join(",");
+        // } else {
+        //   this.form.fCntval = null;
+        // }
+        // if (this.detailList.length > 0) {
+        //   let arr = [];
+        //   this.detailList.map((e) => {
+        //     this.goodsOptions.map((item) => {
+        //       if (e.fGoodsid == item.fId) {
+        //         arr.push(item.fName);
+        //       }
+        //     });
+        //   });
+        //   arr = [...new Set(arr)];
+        //   this.form.fProductName = arr.join(",");
+        // } else {
+        //   this.form.fProductName = "";
+        // }
+        // if (this.detailList.length > 0) {
+        //   let arr = [];
+        //   this.detailList.map((e) => {
+        //     arr.push(e.fMarks);
+        //   });
+        //   arr = [...new Set(arr)];
+        //   this.form.fMarks = arr.join(",");
+        // } else {
+        //   this.form.fMarks = "";
+        // }
+        // this.form.fBillingway = this.form.fFeetUnit;
+        // if (this.detailList.length == 0) {
+        //   this.form.fNetweight = 0;
+        //   this.form.fPlanvolumn = 0;
+        //   this.form.fGrossweight = 0;
+        // } else {
+        //   this.form.fNetweight = this.fNetweight;
+        //   this.form.fPlanvolumn = this.fPlanvolumn;
+        //   this.form.fGrossweight = this.fGrossweight;
+        // }
+        // let formData = new window.FormData();
+        // formData.append("warehouseBills", JSON.stringify(this.form));
+        // formData.append(
+        //   "warehousebillsitems",
+        //   JSON.stringify(this.Printinglist)
+        // );
+        // formData.append(
+        //   "warehousebillsfeesDr",
+        //   JSON.stringify(this.warehouseDrList)
+        // );
+        // formData.append(
+        //   "warehousebillsfeesCr",
+        //   JSON.stringify(this.warehouseCrList)
+        // );
+        // formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
+        // formData.append("tCntr", JSON.stringify(this.CntrTable));
+        // addJoblist(formData).then((response) => {
+        //   if (response.code == 200) {
+        //     this.detailList.map((e, index) => {
+        //       response.data.warehousebillsitems.map((item) => {
+        //         item.fBsdate = Date.parse(new Date(item.fBsdate));
+        //         if (item.fBusinessType) {
+        //           item.fBusinessType = item.fBusinessType.toString();
+        //         }
+        //         if (e.fId == item.fId) {
+        //           this.$set(this.detailList, index, item);
+        //         }
+        //       });
+        //     });
+        //     this.$set(this.form, "fItemsStatus", 2);
+        //   }
+        // });
+      // }
+      const style =
+        "@page {  } " +
+        "@media print { .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;}";
+
+      switch (status){
+        case 'zyd':
+          if (this.CntrTable.length > 0) {
+            let arr = [];
+            this.CntrTable.map((e) => {
+              this.cntrList.map((item) => {
+                if (item.fId == e.fCntrid) {
+                  arr.push(item.fName + "X" + e.fCntrcount);
+                }
               });
-              arr = [...new Set(arr)];
-              this.form.fCntval = arr.join(",");
-            } else {
-              this.form.fCntval = null;
-            }
-            if (this.detailList.length > 0) {
-              let arr = [];
-              this.detailList.map((e) => {
-                this.goodsOptions.map((item) => {
-                  if (e.fGoodsid == item.fId) {
-                    arr.push(item.fName);
+            });
+            arr = [...new Set(arr)];
+            this.form.fCntval = arr.join(",");
+          } else {
+            this.form.fCntval = null;
+          }
+          if (this.detailList.length > 0) {
+            let arr = [];
+            this.detailList.map((e) => {
+              this.goodsOptions.map((item) => {
+                if (e.fGoodsid == item.fId) {
+                  arr.push(item.fName);
+                }
+              });
+            });
+            arr = [...new Set(arr)];
+            this.form.fProductName = arr.join(",");
+          } else {
+            this.form.fProductName = "";
+          }
+          if (this.detailList.length > 0) {
+            let arr = [];
+            this.detailList.map((e) => {
+              arr.push(e.fMarks);
+            });
+            arr = [...new Set(arr)];
+            this.form.fMarks = arr.join(",");
+          } else {
+            this.form.fMarks = "";
+          }
+          this.form.fBillingway = this.form.fFeetUnit;
+          if (this.detailList.length == 0) {
+            this.form.fNetweight = 0;
+            this.form.fPlanvolumn = 0;
+            this.form.fGrossweight = 0;
+          } else {
+            this.form.fNetweight = this.fNetweight;
+            this.form.fPlanvolumn = this.fPlanvolumn;
+            this.form.fGrossweight = this.fGrossweight;
+          }
+          let formData = new window.FormData();
+          formData.append("warehouseBills", JSON.stringify(this.form));
+          formData.append(
+            "warehousebillsitems",
+            JSON.stringify(this.Printinglist)
+          );
+          formData.append(
+            "warehousebillsfeesDr",
+            JSON.stringify(this.warehouseDrList)
+          );
+          formData.append(
+            "warehousebillsfeesCr",
+            JSON.stringify(this.warehouseCrList)
+          );
+          formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
+          formData.append("tCntr", JSON.stringify(this.CntrTable));
+          addJoblist(formData).then((response) => {
+            if (response.code == 200) {
+              this.detailList.map((e, index) => {
+                response.data.warehousebillsitems.map((item) => {
+                  item.fBsdate = Date.parse(new Date(item.fBsdate));
+                  if (item.fBusinessType) {
+                    item.fBusinessType = item.fBusinessType.toString();
+                  }
+                  if (e.fId == item.fId) {
+                    this.$set(this.detailList, index, item);
                   }
                 });
               });
-              arr = [...new Set(arr)];
-              this.form.fProductName = arr.join(",");
-            } else {
-              this.form.fProductName = "";
-            }
-            if (this.detailList.length > 0) {
-              let arr = [];
-              this.detailList.map((e) => {
-                arr.push(e.fMarks);
-              });
-              arr = [...new Set(arr)];
-              this.form.fMarks = arr.join(",");
-            } else {
-              this.form.fMarks = "";
+              this.$set(this.form, "fItemsStatus", 2);
             }
-            this.form.fBillingway = this.form.fFeetUnit;
-            if (this.detailList.length == 0) {
-              this.form.fNetweight = 0;
-              this.form.fPlanvolumn = 0;
-              this.form.fGrossweight = 0;
-            } else {
-              this.form.fNetweight = this.fNetweight;
-              this.form.fPlanvolumn = this.fPlanvolumn;
-              this.form.fGrossweight = this.fGrossweight;
-            }
-            let formData = new window.FormData();
-            formData.append("warehouseBills", JSON.stringify(this.form));
-            formData.append(
-              "warehousebillsitems",
-              JSON.stringify(this.Printinglist)
-            );
-            formData.append(
-              "warehousebillsfeesDr",
-              JSON.stringify(this.warehouseDrList)
-            );
-            formData.append(
-              "warehousebillsfeesCr",
-              JSON.stringify(this.warehouseCrList)
-            );
-            formData.append(
-              "tEnclosure",
-              JSON.stringify(this.relevantAttachments)
-            );
-            formData.append("tCntr", JSON.stringify(this.CntrTable));
-            addJoblist(formData).then((response) => {
-              if (response.code == 200) {
-                this.$set(
-                  this.form,
-                  "fDateChanged",
-                  response.data.fDateChanged
-                );
-                this.detailList.map((e, index) => {
-                  response.data.warehousebillsitems.map((item) => {
-                    item.fBsdate = Date.parse(new Date(item.fBsdate));
-                    if (item.fBusinessType) {
-                      item.fBusinessType = item.fBusinessType.toString();
-                    }
-                    item.fLntype = item.fLntype
-                      ? item.fLntype.toString()
-                      : null;
-                    if (e.fId == item.fId) {
-                      this.$set(this.detailList, index, item);
-                    }
-                  });
-                });
-                this.$set(this.form, "fItemsStatus", 2);
-              }
-            });
-          }
-        }
-      });
-      const style =
-        "@page {  } " +
-        "@media print { .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_area1",
-        type: "html",
-        style: style, // 亦可使用引入的外部css;
-        scanStyles: false,
-      });
+          });
+          break
+        case 'ccckd':
+          print({
+            printable: "print_area6",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break
+        case 'dcckd':
+          print({
+            printable: "print_area7",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break
+        case 'zccdckd':
+          print({
+            printable: "print_area8",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break
+        default:
+        print({
+          printable: "print_area1",
+          type: "html",
+          style: style, // 亦可使用引入的外部css;
+          scanStyles: false,
+        });
+      }
     },
     cancel() {
       if (this.$route.query.id) {

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -782,6 +782,7 @@
                   <el-dropdown-item command="a">收货单</el-dropdown-item>
                   <el-dropdown-item command="b">入库单</el-dropdown-item>
                   <el-dropdown-item command="c">移库单</el-dropdown-item>
+<!--                  <el-dropdown-item command="d">调拨单</el-dropdown-item>-->
                 </el-dropdown-menu>
               </el-dropdown>
               <div style="margin: 0 10px">
@@ -2730,6 +2731,103 @@
         <el-button @click="print_ykd = false">取消 </el-button>
       </span>
     </el-dialog>
+    <el-dialog
+      :visible.sync="print_ddd"
+      width="70%"
+      :close-on-click-modal="false"
+      :modal="false"
+    >
+      <div id="print_area5" class="print-div">
+        <div
+          class="print-title"
+          style="
+            display: flex;
+            justify-content: center;
+            font-size: 24px;
+            margin-bottom: 5px;
+          "
+        >
+          {{ company }}有限公司
+        </div>
+<!--        <div-->
+<!--          style="-->
+<!--            display: flex;-->
+<!--            justify-content: center;-->
+<!--            font-size: 18px;-->
+<!--            margin-bottom: 5px;-->
+<!--          "-->
+<!--        >-->
+<!--          <div>移&nbsp;库&nbsp;单</div>-->
+<!--        </div>-->
+        <div
+          style="
+            display: flex;
+            justify-content: space-between;
+            margin-bottom: 5px;
+          "
+          class="print_form"
+        >
+          <div>
+            <div>调拨日：{{ fBsdate }}</div>
+          </div>
+          <div>
+            <div>清单：{{ form.fCustomsdeclartion }}</div>
+          </div>
+          <div>
+            <div>调拨：{{form.fStorekeeper}}</div>
+          </div>
+        </div>
+        <div class="print_table" style="display: flex">
+          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
+            <tr>
+              <td>箱号</td>
+              <td>现存库区</td>
+              <td>件数</td>
+              <td>毛重</td>
+              <td>净重</td>
+              <td>移入库区</td>
+            </tr>
+            <tr v-for="(item, index) in Printinglist" :key="index">
+              <td>{{ item.fCntrno }}</td>
+              <td>{{ item.fOrgwarehouseInformation }}</td>
+              <td>{{ item.fQty }}</td>
+              <td>{{ item.fGrossweight }}</td>
+              <td>{{ item.fNetweight }}</td>
+
+              <td>{{ item.fWarehouseInformation }}</td>
+            </tr>
+            <tr>
+              <td colspan="2">合计：</td>
+              <td>{{allfQty}}</td>
+              <td>{{allfNetweight}}</td>
+              <td>{{allfGrossweight}}</td>
+              <td></td>
+            </tr>
+            <tr>
+              <td colspan="6" style="text-align: left">备注：{{form.remark}}</td>
+            </tr>
+          </table>
+        </div>
+        <div
+          style="display: flex; justify-content: space-between; font-size: 12px"
+        >
+          <div>库管：{{ form.fContacts }}</div>
+          <div style="width: 100px">叉车：</div>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          :disabled="browseStatus"
+          @click="
+            addprint('ddd');
+            print_ddd = false;
+          "
+        >打印
+        </el-button>
+        <el-button @click="print_ddd = false">取消 </el-button>
+      </span>
+    </el-dialog>
     <!-- 选择作业费协议数据 -->
     <el-dialog
       v-dialogDrag
@@ -3037,6 +3135,7 @@ export default {
       print_shd: false,
       print_rkd: false,
       print_ykd: false,
+      print_ddd: false,
       company: "",
       Printinglist: [],
       //库位
@@ -3406,6 +3505,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "13",
+          label: "fLocalcntrno",
+          name: "库内箱号",
+          checked: 0,
+          width: 100,
+        },
       ],
       setRowList2: [],
       getRowList2: [],
@@ -3994,7 +4100,6 @@ export default {
       }
     },
     creditClick() {
-      console.log(this.Printinglist);
       for (let item in this.Printinglist) {
         if (!this.Printinglist[item].fId) {
           return this.$message.error("请存在未保存的数据");
@@ -4976,8 +5081,13 @@ export default {
                 this.stockaddr = e.fAddr;
               }
             });
+            let date = new Date(this.Printinglist[0].fBsdate)
+            let Y = date.getFullYear()
+            let M = (date.getMonth() +1 <10 ?'0' + (date.getMonth() +1) : date.getMonth() +1)
+            let D = date.getDate()
+            this.fBsdate = Y + '-' + M + '-' + D
             this.fDriverTel = this.Printinglist[0].fDriverTel;
-            this.fBsdate = this.Printinglist[0].fBsdate;
+            // this.fBsdate = this.Printinglist[0].fBsdate;
             this.fTruckno = this.Printinglist[0].fTruckno;
             this.allfCntqty = 0;
             this.allfGrossweight = 0;
@@ -5007,6 +5117,8 @@ export default {
               this.print_rkd = true;
             } else if (command == "c") {
               this.print_ykd = true;
+            } else if(command="d"){
+              this.print_ddd = true;
             }
           }
         });
@@ -5133,7 +5245,6 @@ export default {
           }
           let fAmount = 0;
           fAmount = e.fPrice * qty;
-          console.log(this.key_id);
           if (this.key_id == 3) {
             this.warehouseDrList.push({
               fQty: qty,
@@ -5380,15 +5491,30 @@ export default {
           }
         });
       }
+      if(status == 'ddd'){
+        print({
+          printable: "print_area5",
+          type: "html",
+          style: style, // 亦可使用引入的外部css;
+          scanStyles: false,
+        });
+      }else{
+        print({
+          printable: "print_area1",
+          type: "html",
+          style: style, // 亦可使用引入的外部css;
+          scanStyles: false,
+        });
+      }
       const style =
         "@page {  } " +
         "@media print { .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_area1",
-        type: "html",
-        style: style, // 亦可使用引入的外部css;
-        scanStyles: false,
-      });
+      // print({
+      //   printable: "print_area1",
+      //   type: "html",
+      //   style: style, // 亦可使用引入的外部css;
+      //   scanStyles: false,
+      // });
     },
     cancel() {
       if (this.$route.query.id) {

src/views/kaihe/domesticTrade/orderInformation/index.vue

@@ -17,7 +17,7 @@
               <el-form-item label="订舱单位" prop="corpName">
                 <el-input
                   v-model="form.corpName"
-                  :disabled="doNot"
+                  :disabled="modify"
                   size="small"
                   style="width: 100%"
                 />
@@ -63,7 +63,7 @@
                   type="date"
                   size="small"
                   style="width: 100%"
-                  :disabled="doNot"
+                  :disabled="modify"
                   placeholder="选择日期"
                   format="yyyy-MM-dd"
                 >
@@ -71,53 +71,88 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="运输条款" prop="serviceitemsName">
-                <el-input
-                  v-model="form.serviceitemsName"
-                  :disabled="doNot"
+              <el-form-item label="运输条款" prop="fServiceitems">
+                <el-select
+                  v-model="form.fServiceitems"
+                  :disabled="modify"
                   size="small"
                   style="width: 100%"
-                />
+                >
+                  <el-option
+                    v-for="(dict, index) in transport"
+                    :key="dict.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  ></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="付款方式" prop="paymodeName">
-                <el-input
-                  v-model="form.paymodeName"
-                  :disabled="doNot"
+              <el-form-item label="付款方式" prop="fPaymode">
+                <el-select
+                  v-model="form.fPaymode"
+                  :disabled="modify"
                   size="small"
                   style="width: 100%"
-                />
+                >
+                  <el-option
+                    v-for="(dict, index) in paymentMethod"
+                    :key="dict.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  ></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="售票方" prop="invoceobjName">
-                <el-input
-                  v-model="form.invoceobjName"
-                  :disabled="doNot"
+              <el-form-item label="售票方" prop="fInvoceobj">
+                <el-select
+                  v-model="form.fInvoceobj"
+                  :disabled="modify"
                   size="small"
                   style="width: 100%"
-                />
+                >
+                  <el-option
+                    v-for="(dict, index) in drawee"
+                    :key="dict.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  ></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="箱内签收单" prop="signName">
-                <el-input
-                  v-model="form.signName"
-                  :disabled="doNot"
+              <el-form-item label="箱内签收单" prop="fSign">
+                <el-select
+                  v-model="form.fSign"
+                  :disabled="modify"
                   size="small"
                   style="width: 100%"
-                />
+                >
+                  <el-option
+                    v-for="(dict, index) in cEsign"
+                    :key="dict.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  ></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="订舱人扣货" prop="detentioncargoName">
-                <el-input
-                  v-model="form.detentioncargoName"
-                  :disabled="doNot"
+              <el-form-item label="订舱人扣货" prop="fDetentioncargo">
+                <el-select
+                  v-model="form.fDetentioncargo"
+                  :disabled="modify"
                   style="width: 100%"
                   size="small"
-                />
+                >
+                  <el-option
+                  v-for="(dict, index) in etentioncargo"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -146,7 +181,7 @@
               <el-form-item label="备注" prop="remarks">
                 <el-input
                   v-model="form.remarks"
-                  :disabled="doNot"
+                  :disabled="modify"
                   size="small"
                   style="width: 75%"
                 >
@@ -184,7 +219,7 @@
             <!--              <el-form-item label="预计中转抵港日期" prop="fMblno">-->
             <!--                <el-input-->
             <!--                  v-model="form.fMblno"-->
-            <!--                  :disabled="doNot"-->
+            <!--                  :disabled="modify"-->
             <!--                  size="small"-->
             <!--                  style="width: 100%"-->
             <!--                  placeholder="手工输入"-->
@@ -195,7 +230,7 @@
             <!--              <el-form-item label="预计中转开航日期" prop="fMblno">-->
             <!--                <el-input-->
             <!--                  v-model="form.fMblno"-->
-            <!--                  :disabled="doNot"-->
+            <!--                  :disabled="modify"-->
             <!--                  size="small"-->
             <!--                  style="width: 100%"-->
             <!--                  placeholder="手工输入"-->
@@ -242,7 +277,7 @@
               <el-form-item label="发货人全称" prop="fShippername">
                 <el-input
                   v-model="form.fShippername"
-                  :disabled="doNot"
+                  :disabled="modify"
                   size="small"
                   style="width: 100%"
                   placeholder="手工输入"
@@ -253,7 +288,7 @@
               <el-form-item label="发货人联系人" prop="fShipperattn">
                 <el-input
                   v-model="form.fShipperattn"
-                  :disabled="doNot"
+                  :disabled="modify"
                   style="width: 100%"
                   size="small"
                   placeholder="手工输入"
@@ -264,7 +299,7 @@
               <el-form-item label="发货人电话" prop="fShippertel">
                 <el-input
                   v-model="form.fShippertel"
-                  :disabled="doNot"
+                  :disabled="modify"
                   size="small"
                   style="width: 100%"
                   placeholder="手工输入"
@@ -277,7 +312,7 @@
               <el-form-item label="收货人全称" prop="fConsigneername">
                 <el-input
                   v-model="form.fConsigneername"
-                  :disabled="doNot"
+                  :disabled="modify"
                   size="small"
                   style="width: 100%"
                   placeholder="手工输入"
@@ -288,7 +323,7 @@
               <el-form-item label="收货人联系人" prop="fConsigneeattn">
                 <el-input
                   v-model="form.fConsigneeattn"
-                  :disabled="doNot"
+                  :disabled="modify"
                   style="width: 100%"
                   size="small"
                   placeholder="手工输入"
@@ -299,7 +334,7 @@
               <el-form-item label="收货人电话" prop="fConsigneetel">
                 <el-input
                   v-model="form.fConsigneetel"
-                  :disabled="doNot"
+                  :disabled="modify"
                   style="width: 100%"
                   size="small"
                   placeholder="手工输入"
@@ -313,20 +348,27 @@
         <el-form v-model="form" label-width="130px" size="mini">
           <el-row>
             <el-col :span="6">
-              <el-form-item label="是否办理保险" prop="insuranceName">
-                <el-input
-                  v-model="form.insuranceName"
-                  :disabled="doNot"
+              <el-form-item label="是否办理保险" prop="fInsurance">
+                <el-select
+                  v-model="form.fInsurance"
+                  :disabled="modify"
                   size="small"
                   style="width: 100%"
-                />
+                >
+                  <el-option
+                    v-for="(dict, index) in insurance"
+                    :key="dict.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  ></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="保险货值（万元）" prop="fInsuranceamt">
                 <el-input
                   v-model="form.fInsuranceamt"
-                  :disabled="doNot"
+                  :disabled="modify"
                   style="width: 100%"
                   size="small"
                 />
@@ -338,19 +380,103 @@
       <el-collapse-item title="货物信息" name="4">
         <el-table :data="goodsList" style="width: 100%;" align="center">
           <el-table-column label="行号" type="index" min-width="100px"/>
-          <el-table-column label="货物名称" prop="goodsName" min-width="100px"/>
-          <el-table-column label="货类" prop="typeidName" min-width="100px"/>
-          <el-table-column label="包装类型" prop="packageName" min-width="100px"/>
-          <el-table-column label="箱型" prop="cntrName" min-width="100px"/>
-          <el-table-column label="箱量" prop="fCntrcount" min-width="100px"/>
-          <el-table-column label="单箱重量（吨）" prop="fCntrweight" min-width="120px"/>
-          <el-table-column label="箱态" prop="fCntrstatus" min-width="100px"/>
-          <el-table-column label="自备货柜" prop="fSoc" min-width="100px"/>
-          <el-table-column label="设置温度（℃）" prop="fTemperature" min-width="120px"/>
-          <el-table-column label="风门开度（%）" prop="fDraught" min-width="120px"/>
-          <el-table-column label="湿度设置（%）" prop="fHumidity" min-width="120px"/>
-          <el-table-column label="预冷要求" prop="fPrecooling" min-width="100px"/>
-          <el-table-column label="是否化学品" prop="ifdangerName" min-width="100px">
+          <el-table-column label="货物名称" prop="fGoodsid" min-width="100px">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.fGoodsid" @change="selectChange(scope)" :disabled="modify">
+                <el-option
+                v-for="(item,index) in goods"
+                :key="index"
+                :label="item.fName"
+                :value="item.fId"
+                />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="货类" prop="typeidName" min-width="100px">
+                        <template slot-scope="scope">
+              <el-input v-model="scope.row.typeidName" :disabled="modify"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="包装类型" prop="fPackageid" min-width="100px">
+                        <template slot-scope="scope">
+              <el-select v-model="scope.row.fPackageid" :disabled="modify">
+                <el-option
+                v-for="item in packgeOptions"
+                :key="item.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+                />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="箱型" prop="fCntrid"  min-width="100px">
+                        <template slot-scope="scope">
+              <el-select v-model="scope.row.fCntrid" @change="seleEt(scope)" :disabled="modify">
+                <el-option
+                  v-for="item in cntrOptions"
+                  :key="item.fId"
+                  :label="item.fNo"
+                  :value="item.fId"
+                />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="箱量" prop="fCntrcount" min-width="100px">
+                        <template slot-scope="scope">
+              <el-input v-model="scope.row.fCntrcount" :disabled="modify" :maxlength="3" oninput='this.value=this.value.replace(/[^\d.]/g,"")'></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="单箱重量（吨）" prop="fCntrweight" min-width="120px">
+                        <template slot-scope="scope">
+              <el-input v-model="scope.row.fCntrweight" :disabled="modify" @input="cntrWeight"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="箱态" prop="fCntrstatus" min-width="100px">
+                        <template slot-scope="scope">
+              <el-select v-model="scope.row.fCntrstatus" :disabled="modify">
+                <el-option
+                v-for="item in fStatus"
+                :key="item.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+                />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="自备货柜" prop="fSoc" min-width="100px">
+                        <template slot-scope="scope">
+              <el-select v-model="scope.row.fSoc" :disabled="modify">
+                <el-option label="是" value="0"></el-option>
+                <el-option label="否" value="1"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <div v-if="whether === true">
+            <el-table-column label="设置温度（℃）" prop="fTemperature" min-width="120px">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.fTemperature" :disabled="modify" @input="temperature" oninput='this.value=this.value.replace(/[^\-?\d.]/g,"")'></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="风门开度（%）" prop="fDraught" min-width="120px">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.fDraught" :disabled="modify" @input="throttleOpening" oninput='this.value=this.value.replace(/[^\d.]/g,"")'></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="湿度设置（%）" prop="fHumidity" min-width="120px">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.fHumidity" :disabled="modify" @input="throttleOpening" oninput='this.value=this.value.replace(/[^\d.]/g,"")'></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="预冷要求" prop="fPrecooling" min-width="100px">
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.fPrecooling" :disabled="modify">
+                  <el-option label="是" value="1"></el-option>
+                  <el-option label="否" value="2"></el-option>
+                </el-select>
+              </template>
+            </el-table-column>
+          </div>
+          <el-table-column label="是否危险品" prop="ifdangerName" min-width="100px">
             <template slot-scope="scope">
               <span>{{ scope.row.ifdangerName }}</span>
               <el-button type="primary" size="small" @click="check(2)" style="margin-left: 5px;">查看</el-button>
@@ -397,24 +523,24 @@
           <el-table-column label="序号" type="index" width="80"/>
           <el-table-column label="箱号" align="center" prop="fCntrno">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.fCntrno" :disabled="scope.row.fManual == 0 || modify"/>
+              <el-input v-model="scope.row.fCntrno" :disabled="modify"/>
             </template>
           </el-table-column>
           <el-table-column label="铅封号" align="center" prop="fSealno">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.fSealno" :disabled="scope.row.fManual == 0 || modify"/>
+              <el-input v-model="scope.row.fSealno" :disabled="modify"/>
             </template>
           </el-table-column>
           <el-table-column prop="fCntrweight" label="单箱重量（吨）" align="center">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.fCntrweight" :disabled="scope.row.fManual == 0 || modify"
+              <el-input v-model="scope.row.fCntrweight" :disabled="modify"
                         @input="cntrWeight"
               />
             </template>
           </el-table-column>
           <el-table-column prop="fGoodsid" label="货名" align="center">
             <template slot-scope="scope">
-              <el-select clearable v-model="scope.row.fGoodsid" :disabled="scope.row.fManual == 0 || modify">
+              <el-select clearable v-model="scope.row.fGoodsid" :disabled="modify">
                 <el-option
                   v-for="item in goodsOptions"
                   :key="item.fId"
@@ -426,7 +552,7 @@
           </el-table-column>
           <el-table-column prop="fPackageid" label="包装类型" align="center">
             <template slot-scope="scope">
-              <el-select clearable v-model="scope.row.fPackageid" :disabled="scope.row.fManual == 0 || modify">
+              <el-select clearable v-model="scope.row.fPackageid" :disabled="modify">
                 <el-option
                   v-for="dict in packgeOptions"
                   :key="dict.dictValue"
@@ -438,7 +564,7 @@
           </el-table-column>
           <el-table-column prop="fCntrid" label="箱型" align="center">
             <template slot-scope="scope">
-              <el-select clearable v-model="scope.row.fCntrid" :disabled="scope.row.fManual == 0 || modify">
+              <el-select clearable v-model="scope.row.fCntrid" :disabled="modify">
                 <el-option
                   v-for="item in cntrOptions"
                   :key="item.fId"
@@ -1113,7 +1239,6 @@
       <el-collapse-item name="9" class="minHeight" title="箱信息">
         <template slot="title">
           <i class="el-icon-circle-plus"></i>利润合计：
-<!--          {{this.amountDr != null && this.amountCr != null ? this.amountDr - this.amountCr : ''}}-->
           {{this.amountDr != null && this.amountCr != null ? this.amountDr - this.amountCr :
           (!this.amountDr && this.amountCr ? 0 - this.amountCr :
             (!this.amountDr && !this.amountCr ? '' : this.amountDr))}}
@@ -1257,7 +1382,7 @@ import {
   getGoodName,
   getFName,
   getfee,
-  getName
+  getName,
 } from '@/api/kaihe/domesticTrade/orderInformation'
 import Global from '@/layout/components/global'
 import { getToken } from '@/utils/auth'
@@ -1332,6 +1457,15 @@ export default {
   },
   data() {
     return {
+      insurance:[],
+      etentioncargo:[],
+      cEsign:[],
+      transport:[],
+      paymentMethod:[],
+      drawee:[],
+      whether:false,
+      fStatus:[],
+      goods:[],
       rules: {
         fMblno: [{ required: true, message: ' ', trigger: 'blur' }]
       },
@@ -1437,51 +1571,55 @@ export default {
     }
     if (formDate) {
       addmodify(formDate).then(response => {
-        this.form = response.rows[0]
-        if (this.form.fMblno == null) {
-          this.changeNum = false
-        } else {
-          this.changeNum = true
-        }
-        let data = {
-          actId: 460,
-          id: this.form.fId
-        }
-        getName(data).then(response => {
-          if (response.data.length != 0) {
-            this.before = response.data[0].userName
+        if(response.code == 200){
+          this.form = response.rows[0]
+          if (this.form.fMblno == null) {
+            this.changeNum = false
+          } else {
+            this.changeNum = true
           }
-        })
-        queryUserVal().then((response) => {
-          this.current = response.user.userName
-          if (formDate.num) {
-            if (this.form.moneyStatus >= 4) {
+          let data = {
+            actId: 460,
+            id: this.form.fId
+          }
+          getName(data).then(response => {
+            if (response.data.length != 0) {
+              this.before = response.data[0].userName
+            }
+          })
+          queryUserVal().then((response) => {
+            this.current = response.user.userName
+            if (formDate.num) {
+              if (this.form.moneyStatus >= 4) {
+                this.jumpDonot = true
+              }
+              if (this.current == this.before) {
+                this.disappear = false
+              }
+            } else {
               this.jumpDonot = true
+              this.disappear = true
             }
-            if (this.current == this.before) {
-              this.disappear = false
+          })
+          this.$set(this.form,'fPaymode',JSON.stringify(this.form.fPaymode))
+          this.$set(this.form,'fSign',JSON.stringify(this.form.fSign))
+          this.$set(this.form,'fDetentioncargo',JSON.stringify(this.form.fDetentioncargo))
+          this.goodsList = response.rows[0].tWarehousebillsCntrList
+          this.estimatedTime = response.rows[0].tVoyageL
+          this.dataList = response.rows[0].tWarehousebillsCntritemsList
+          this.loading = false
+          if (response.rows[0].tWarehousebillsfeesDr) {
+            this.warehouseDrList = response.rows[0].tWarehousebillsfeesDr
+            for (let item in this.warehouseDrList) {
+              this.$set(this.warehouseDrList[item], 'fFeeUnitid', JSON.stringify(this.warehouseDrList[item].fFeeunitid))
+              // this.$set(this.warehouseDrList[item], 'fCorpid', JSON.stringify(this.warehouseDrList[item].fCorpid))
             }
-          } else {
-            this.jumpDonot = true
-            this.disappear = true
-          }
-        })
-
-        this.goodsList = response.rows[0].tWarehousebillsCntrList
-        this.estimatedTime = response.rows[0].tVoyageL
-        this.dataList = response.rows[0].tWarehousebillsCntritemsList
-        this.loading = false
-        if (response.rows[0].tWarehousebillsfeesDr) {
-          this.warehouseDrList = response.rows[0].tWarehousebillsfeesDr
-          for (let item in this.warehouseDrList) {
-            this.$set(this.warehouseDrList[item], 'fFeeUnitid', JSON.stringify(this.warehouseDrList[item].fFeeunitid))
-            // this.$set(this.warehouseDrList[item], 'fCorpid', JSON.stringify(this.warehouseDrList[item].fCorpid))
           }
-        }
-        if (response.rows[0].warehousebillsfeesCr) {
-          this.warehouseCrList = response.rows[0].warehousebillsfeesCr
-          for (let item in this.warehouseCrList) {
-            this.$set(this.warehouseCrList[item], 'fFeeUnitid', JSON.stringify(this.warehouseCrList[item].fFeeunitid))
+          if (response.rows[0].warehousebillsfeesCr) {
+            this.warehouseCrList = response.rows[0].warehousebillsfeesCr
+            for (let item in this.warehouseCrList) {
+              this.$set(this.warehouseCrList[item], 'fFeeUnitid', JSON.stringify(this.warehouseCrList[item].fFeeunitid))
+            }
           }
         }
       })
@@ -1513,10 +1651,46 @@ export default {
         this.businessTypeOptions = response.data
       }
     })
+    this.getDicts('f_updateEF').then((response) => {
+      if (response.data) {
+        this.fStatus = response.data
+      }
+    })
+    this.getDicts('f_serviceitems').then((response) => {
+      if (response.data) {
+        this.transport = response.data
+      }
+    })
+    this.getDicts('f_paymode').then((response) => {
+      if (response.data) {
+        this.paymentMethod = response.data
+      }
+    })
+    this.getDicts('f_invoceobj').then((response) => {
+      if (response.data) {
+        this.drawee = response.data
+      }
+    })
+    this.getDicts('f_sign').then((response) => {
+      if (response.data) {
+        this.cEsign = response.data
+      }
+    })
+    this.getDicts('f_detentioncargo').then((response) => {
+      if (response.data) {
+        this.etentioncargo = response.data
+      }
+    })
+    this.getDicts('f_insurance').then((response) => {
+      if (response.data) {
+        this.insurance = response.data
+      }
+    })
     this.cntrtypeRemoteMethod()
     this.goodRemoteMethod()
     this.nameRemoteMethod()
     this.fWRemoteMethod()
+    this.queryGoods()
     let queryParams = { pageNum: 1, fDc: 'C' }
     listFees(queryParams).then((response) => {
       this.fCNameOptions = response.rows
@@ -1527,6 +1701,60 @@ export default {
     })
   },
   methods: {
+
+    seleEt(scope) {
+      console.log(scope)
+      for (let item in this.cntrOptions) {
+        if (this.cntrOptions[item].fId === scope.row.fCntrid) {
+          if (this.cntrOptions[item].fType === 2) {
+            this.whether = true;
+            return;
+          } else {
+            this.whether = false;
+            return;
+          }
+        }
+      }
+    },
+    throttleOpening(res) {
+      if (res <= 100) {
+      } else {
+        this.list.fDraught = '';
+        this.$message({
+          showClose: true,
+          message: '不能大于100%或小于0%',
+          type: 'error',
+          offset: 90
+        });
+      }
+    },
+    temperature(res) {
+      if (res < 20 && res > -30) {
+      } else if (res == '-') {
+      } else {
+        this.list.fTemperature = '';
+        this.$message({
+          showClose: true,
+          message: '冷藏箱温度为-30℃至20℃之间的整数',
+          type: 'error',
+          offset: 90
+        });
+      }
+    },
+    selectChange(scope) {
+      for (let item in this.goods) {
+        if (this.goods[item].fId === scope.row.fGoodsid) {
+          scope.row.typeidName = this.goods[item].typeName;
+        }
+      }
+    },
+    queryGoods() {
+      getGoodName().then(res=>{
+        if(res.code == 200){
+          this.goods = res.data
+        }
+      })
+    },
     homePage() {
       this.open = false
       let view = {
@@ -2016,8 +2244,8 @@ export default {
       for (let item in this.warehouseCrList) {
         this.warehouseCrList[item].fMblno = this.form.fMblno
       }
-      formData.append('tWarehousebills', JSON.stringify(form))
-      // formData.append("tWarehousebills",JSON.stringify(this.form))
+      formData.append('tWarehousebills', JSON.stringify(this.form))
+      formData.append("tWarehousebillsCntr",JSON.stringify(this.goodsList))
       formData.append('tWarehousebillsCntritems', JSON.stringify(this.dataList))
       formData.append('tWarehousebillsfeesDr', JSON.stringify(this.warehouseDrList))
       formData.append('tWarehousebillsfeesCr', JSON.stringify(this.warehouseCrList))
@@ -2025,7 +2253,13 @@ export default {
         this.msgSuccess('操作成功')
         if (response.data.tWarehouseBills) {
           this.form = response.data.tWarehouseBills
+          this.$set(this.form,'fPaymode',JSON.stringify(this.form.fPaymode))
+          this.$set(this.form,'fSign',JSON.stringify(this.form.fSign))
+          this.$set(this.form,'fDetentioncargo',JSON.stringify(this.form.fDetentioncargo))
         }
+      if(response.data.tWarehousebillsCntrList){
+        this.goodsList = response.data.tWarehousebillsCntrList
+      }
         if (response.data.tWarehousebillsCntritemsList) {
           this.dataList = response.data.tWarehousebillsCntritemsList
         }

src/views/system/user/index.vue

@@ -481,7 +481,6 @@ export default {
       this.initPassword = response.msg;
     });
     this.getDicts("user_system").then(response => {
-      console.log(response)
       this.SystemOptions = response.data;
     });
   },