【新增】采购退料 、 其他入库单、 其他出库单

src/views/setting/other.vue

@@ -9,98 +9,221 @@
       <el-radio-button label="sixth">机型类别</el-radio-button>
       <el-radio-button label="seventh">登录类型</el-radio-button>
       <el-radio-button label="eigth">权限分类</el-radio-button>
-          <el-radio-button label="receipt"  v-if="$checkBtnRole('receipt', $route.meta.roles)">发票</el-radio-button>
-
+      <el-radio-button
+        label="receipt"
+        v-if="$checkBtnRole('receipt', $route.meta.roles)"
+        >发票</el-radio-button
+      >
     </el-radio-group>
 
     <div v-show="formType === 'first'">
-      <div style="margin: 40px 0 30px;">
+      <div style="margin: 40px 0 30px">
         <span>下单时间超过当天</span>
-        <el-time-picker v-model="firstForm.input1.dictValue" placeholder="选择时间点" size="small" format="HH:mm" style="width: 150px; margin: 0 10px;"></el-time-picker>
+        <el-time-picker
+          v-model="firstForm.input1.dictValue"
+          placeholder="选择时间点"
+          size="small"
+          format="HH:mm"
+          style="width: 150px; margin: 0 10px"
+        ></el-time-picker>
         <span>的订单，订单日期计为下一天的日期</span>
       </div>
-      <el-button type="primary" size="small" @click="submitForm('first')">确 定</el-button>
+      <el-button type="primary" size="small" @click="submitForm('first')"
+        >确 定</el-button
+      >
     </div>
 
     <div v-show="formType === 'second'">
-      <div style="margin: 40px 0 30px;">
+      <div style="margin: 40px 0 30px">
         <div>工程登录二次引用密码设置</div>
         <div>
-          <el-input v-model="secondForm.input1.dictValue" placeholder="请输入密码" size="small" style="width: 150px; margin-top: 20px;"></el-input>
+          <el-input
+            v-model="secondForm.input1.dictValue"
+            placeholder="请输入密码"
+            size="small"
+            style="width: 150px; margin-top: 20px"
+          ></el-input>
         </div>
       </div>
-      <el-button type="primary" size="small" @click="submitForm('second')">确 定</el-button>
+      <el-button type="primary" size="small" @click="submitForm('second')"
+        >确 定</el-button
+      >
     </div>
 
     <div v-show="formType === 'third'">
-      <div style="margin: 40px 0 30px;">
+      <div style="margin: 40px 0 30px">
+        <h4>佛山自动预留配置</h4>
         <div>预留单自动生成时间，从订单审单后，第</div>
-        <el-input v-model="thirdForm.input1.dictValue" type="number" @mousewheel.native.prevent size="small" style="width: 150px; margin-top: 20px; margin-right: 10px"></el-input>
+        <el-input
+          v-model="thirdForm.input1.dictValue"
+          type="number"
+          @mousewheel.native.prevent
+          size="small"
+          style="width: 150px; margin-top: 20px; margin-right: 10px"
+        ></el-input>
         <span>天零时起，按商家提交订单时间顺序，自动生成预留单</span>
       </div>
-      <el-button type="primary" size="small" @click="submitForm('third')">确 定</el-button>
+      <!--      <div style="margin: 40px 0 30px">-->
+      <!--        <h4>广州自动预留配置</h4>-->
+      <!--        <div>预留单自动生成时间，从订单审单后，第</div>-->
+      <!--        <el-input-->
+      <!--          v-model="thirdForm.input2.dictValue"-->
+      <!--          type="number"-->
+      <!--          @mousewheel.native.prevent-->
+      <!--          size="small"-->
+      <!--          style="width: 150px; margin-top: 20px; margin-right: 10px"-->
+      <!--        ></el-input>-->
+      <!--        <span>天零时起，按商家提交订单时间顺序，自动生成预留单</span>-->
+      <!--      </div>-->
+      <el-button type="primary" size="small" @click="submitForm('third')"
+        >确 定</el-button
+      >
     </div>
 
     <div v-show="formType === 'fourth'">
-      <div style="margin: 40px 0 30px;">
+      <div style="margin: 40px 0 30px">
         <div>总可发货数 = 总库存数-总预留数-总发货申请暂扣</div>
         <div style="margin-top: 20px">订单查询库存时：</div>
         <div style="margin-top: 10px">总可发货数为0，显示无货</div>
         <div style="margin-top: 10px">
           <span>总可发货数</span>
-          <el-input v-model="fourthForm.input1.dictValue" type="number" @mousewheel.native.prevent size="small" style="width: 100px; margin: 0 10px;"></el-input>
+          <el-input
+            v-model="fourthForm.input1.dictValue"
+            type="number"
+            @mousewheel.native.prevent
+            size="small"
+            style="width: 100px; margin: 0 10px"
+          ></el-input>
           <span>到</span>
-          <el-input v-model="fourthForm.input2.dictValue" type="number" @mousewheel.native.prevent size="small" style="width: 100px; margin: 0 10px;"></el-input>
+          <el-input
+            v-model="fourthForm.input2.dictValue"
+            type="number"
+            @mousewheel.native.prevent
+            size="small"
+            style="width: 100px; margin: 0 10px"
+          ></el-input>
           <span>，总库存显示具体数量</span>
         </div>
         <div style="margin-top: 10px">
           <span>总可发货数</span>
-          <el-input v-model="fourthForm.input3.dictValue" type="number" @mousewheel.native.prevent size="small" style="width: 100px; margin: 0 10px;"></el-input>
+          <el-input
+            v-model="fourthForm.input3.dictValue"
+            type="number"
+            @mousewheel.native.prevent
+            size="small"
+            style="width: 100px; margin: 0 10px"
+          ></el-input>
           <span>到</span>
-          <el-input v-model="fourthForm.input4.dictValue" type="number" @mousewheel.native.prevent size="small" style="width: 100px; margin: 0 10px;"></el-input>
+          <el-input
+            v-model="fourthForm.input4.dictValue"
+            type="number"
+            @mousewheel.native.prevent
+            size="small"
+            style="width: 100px; margin: 0 10px"
+          ></el-input>
           <span>，总库存显示有货</span>
         </div>
         <div style="margin-top: 10px">
           <span>总可发货数大于</span>
-          <el-input v-model="fourthForm.input5.dictValue" type="number" @mousewheel.native.prevent size="small" style="width: 100px; margin: 0 10px;"></el-input>
+          <el-input
+            v-model="fourthForm.input5.dictValue"
+            type="number"
+            @mousewheel.native.prevent
+            size="small"
+            style="width: 100px; margin: 0 10px"
+          ></el-input>
           <span>，总库存显示充足</span>
         </div>
         <div style="margin-top: 30px">发货申请查询库存时：</div>
         <div style="margin-top: 10px">
           <span>可发货数大于</span>
-          <el-input v-model="fourthForm.input6.dictValue" type="number" @mousewheel.native.prevent size="small" style="width: 100px; margin: 0 10px;"></el-input>
+          <el-input
+            v-model="fourthForm.input6.dictValue"
+            type="number"
+            @mousewheel.native.prevent
+            size="small"
+            style="width: 100px; margin: 0 10px"
+          ></el-input>
           <span>显示充足</span>
         </div>
       </div>
-      <el-button type="primary" size="small" @click="submitForm('fourth')">确 定</el-button>
+      <el-button type="primary" size="small" @click="submitForm('fourth')"
+        >确 定</el-button
+      >
     </div>
 
     <div v-show="formType === 'fifth'">
-      <div style="margin: 40px 0 30px;">
+      <div style="margin: 40px 0 30px">
         <div>二次打印密码设置</div>
         <div>
-          <el-input v-model="fifthForm.input1.dictValue" placeholder="请输入密码" size="small" style="width: 150px; margin-top: 20px;"></el-input>
+          <el-input
+            v-model="fifthForm.input1.dictValue"
+            placeholder="请输入密码"
+            size="small"
+            style="width: 150px; margin-top: 20px"
+          ></el-input>
         </div>
       </div>
-      <el-button type="primary" size="small" @click="submitForm('fifth')">确 定</el-button>
+      <el-button type="primary" size="small" @click="submitForm('fifth')"
+        >确 定</el-button
+      >
     </div>
 
     <div v-show="formType === 'sixth'">
-      <div style="margin: 40px 0 30px;">
-        <el-button type="primary" size="mini" @click="addShowFn">新增</el-button>
+      <div style="margin: 40px 0 30px">
+        <el-button type="primary" size="mini" @click="addShowFn"
+          >新增</el-button
+        >
         <!-- 列表 -->
         <div class="mymain-container">
           <div class="table">
-            <el-table v-loading="listLoading" :data="sixthForm" element-loading-text="Loading" border fit highlight-current-row stripe>
-
-              <el-table-column align="left" label="名称" prop="dictCode" min-width="160" show-overflow-tooltip></el-table-column>
-              <el-table-column align="left" label="备注" prop="remark" min-width="170" show-overflow-tooltip></el-table-column>
-
-              <el-table-column align="center" label="操作" prop="" min-width="160" show-overflow-tooltip fixed="right">
+            <el-table
+              v-loading="listLoading"
+              :data="sixthForm"
+              element-loading-text="Loading"
+              border
+              fit
+              highlight-current-row
+              stripe
+            >
+              <el-table-column
+                align="left"
+                label="名称"
+                prop="dictCode"
+                min-width="160"
+                show-overflow-tooltip
+              ></el-table-column>
+              <el-table-column
+                align="left"
+                label="备注"
+                prop="remark"
+                min-width="170"
+                show-overflow-tooltip
+              ></el-table-column>
+
+              <el-table-column
+                align="center"
+                label="操作"
+                prop=""
+                min-width="160"
+                show-overflow-tooltip
+                fixed="right"
+              >
                 <template slot-scope="scope">
-                  <el-button type="text" class="textColor" @click="editFn(scope.row)">编辑</el-button>
-                  <el-popconfirm @onConfirm="deleFn(scope.row.sysDictId)" v-if="$checkBtnRole('del', $route.meta.roles)" title="这是一段内容确定删除吗？">
-                    <el-button type="text" class="textColor" slot="reference">删除</el-button>
+                  <el-button
+                    type="text"
+                    class="textColor"
+                    @click="editFn(scope.row)"
+                    >编辑</el-button
+                  >
+                  <el-popconfirm
+                    @onConfirm="deleFn(scope.row.sysDictId)"
+                    v-if="$checkBtnRole('del', $route.meta.roles)"
+                    title="这是一段内容确定删除吗？"
+                  >
+                    <el-button type="text" class="textColor" slot="reference"
+                      >删除</el-button
+                    >
                   </el-popconfirm>
                 </template>
               </el-table-column>
@@ -108,24 +231,62 @@
           </div>
         </div>
       </div>
-
     </div>
     <div v-show="formType === 'seventh'">
-      <div style="margin: 40px 0 30px;">
-        <el-button type="primary" size="mini" @click="addShowFn">新增</el-button>
+      <div style="margin: 40px 0 30px">
+        <el-button type="primary" size="mini" @click="addShowFn"
+          >新增</el-button
+        >
         <!-- 列表 -->
         <div class="mymain-container">
           <div class="table">
-            <el-table v-loading="listLoading" :data="seventhForm" element-loading-text="Loading" border fit highlight-current-row stripe>
-
-              <el-table-column align="left" label="名称" prop="dictCode" min-width="160" show-overflow-tooltip></el-table-column>
-              <el-table-column align="left" label="备注" prop="remark" min-width="170" show-overflow-tooltip></el-table-column>
-
-              <el-table-column align="center" label="操作" prop="" min-width="160" show-overflow-tooltip fixed="right">
+            <el-table
+              v-loading="listLoading"
+              :data="seventhForm"
+              element-loading-text="Loading"
+              border
+              fit
+              highlight-current-row
+              stripe
+            >
+              <el-table-column
+                align="left"
+                label="名称"
+                prop="dictCode"
+                min-width="160"
+                show-overflow-tooltip
+              ></el-table-column>
+              <el-table-column
+                align="left"
+                label="备注"
+                prop="remark"
+                min-width="170"
+                show-overflow-tooltip
+              ></el-table-column>
+
+              <el-table-column
+                align="center"
+                label="操作"
+                prop=""
+                min-width="160"
+                show-overflow-tooltip
+                fixed="right"
+              >
                 <template slot-scope="scope">
-                  <el-button type="text" class="textColor" @click="editFn(scope.row)">编辑</el-button>
-                  <el-popconfirm @onConfirm="deleFn(scope.row.sysDictId)" v-if="$checkBtnRole('del', $route.meta.roles)" title="这是一段内容确定删除吗？">
-                    <el-button type="text" class="textColor" slot="reference">删除</el-button>
+                  <el-button
+                    type="text"
+                    class="textColor"
+                    @click="editFn(scope.row)"
+                    >编辑</el-button
+                  >
+                  <el-popconfirm
+                    @onConfirm="deleFn(scope.row.sysDictId)"
+                    v-if="$checkBtnRole('del', $route.meta.roles)"
+                    title="这是一段内容确定删除吗？"
+                  >
+                    <el-button type="text" class="textColor" slot="reference"
+                      >删除</el-button
+                    >
                   </el-popconfirm>
                 </template>
               </el-table-column>
@@ -133,24 +294,62 @@
           </div>
         </div>
       </div>
-
     </div>
     <div v-show="formType === 'eigth'">
-      <div style="margin: 40px 0 30px;">
-        <el-button type="primary" size="mini" @click="addShowFn">新增</el-button>
+      <div style="margin: 40px 0 30px">
+        <el-button type="primary" size="mini" @click="addShowFn"
+          >新增</el-button
+        >
         <!-- 列表 -->
         <div class="mymain-container">
           <div class="table">
-            <el-table v-loading="listLoading" :data="eigthForm" element-loading-text="Loading" border fit highlight-current-row stripe>
-
-              <el-table-column align="left" label="名称" prop="dictCode" min-width="160" show-overflow-tooltip></el-table-column>
-              <el-table-column align="left" label="备注" prop="remark" min-width="170" show-overflow-tooltip></el-table-column>
-
-              <el-table-column align="center" label="操作" prop="" min-width="160" show-overflow-tooltip fixed="right">
+            <el-table
+              v-loading="listLoading"
+              :data="eigthForm"
+              element-loading-text="Loading"
+              border
+              fit
+              highlight-current-row
+              stripe
+            >
+              <el-table-column
+                align="left"
+                label="名称"
+                prop="dictCode"
+                min-width="160"
+                show-overflow-tooltip
+              ></el-table-column>
+              <el-table-column
+                align="left"
+                label="备注"
+                prop="remark"
+                min-width="170"
+                show-overflow-tooltip
+              ></el-table-column>
+
+              <el-table-column
+                align="center"
+                label="操作"
+                prop=""
+                min-width="160"
+                show-overflow-tooltip
+                fixed="right"
+              >
                 <template slot-scope="scope">
-                  <el-button type="text" class="textColor" @click="editFn(scope.row)">编辑</el-button>
-                  <el-popconfirm @onConfirm="deleFn(scope.row.sysDictId)" v-if="$checkBtnRole('del', $route.meta.roles)" title="这是一段内容确定删除吗？">
-                    <el-button type="text" class="textColor" slot="reference">删除</el-button>
+                  <el-button
+                    type="text"
+                    class="textColor"
+                    @click="editFn(scope.row)"
+                    >编辑</el-button
+                  >
+                  <el-popconfirm
+                    @onConfirm="deleFn(scope.row.sysDictId)"
+                    v-if="$checkBtnRole('del', $route.meta.roles)"
+                    title="这是一段内容确定删除吗？"
+                  >
+                    <el-button type="text" class="textColor" slot="reference"
+                      >删除</el-button
+                    >
                   </el-popconfirm>
                 </template>
               </el-table-column>
@@ -158,47 +357,58 @@
           </div>
         </div>
       </div>
-
     </div>
-    <div  v-show="formType === 'receipt'" >
-      <div style="margin: 40px 0 30px;">
-         <el-date-picker
-              v-model="value1"
-              size="mini"
-              type="daterange"
-               value-format="yyyy-MM-dd HH:mm:ss"
-              range-separator="至"
-              :picker-options="setDisabled"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              style="margin:0 10px"
-            >
-            </el-date-picker>
-            <el-button
-              size="mini"
-
-              type="warning"
-              icon="el-icon-finished"
-              @click="updateReceipt"
-              >更新发票</el-button
-            >
+    <div v-show="formType === 'receipt'">
+      <div style="margin: 40px 0 30px">
+        <el-date-picker
+          v-model="value1"
+          size="mini"
+          type="daterange"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至"
+          :picker-options="setDisabled"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          style="margin: 0 10px"
+        >
+        </el-date-picker>
+        <el-button
+          size="mini"
+          type="warning"
+          icon="el-icon-finished"
+          @click="updateReceipt"
+          >更新发票</el-button
+        >
       </div>
     </div>
 
     <!-- //弹窗 -->
-    <el-dialog :title="title" :visible.sync="dialogForm" width="30%" :show-close="false" :close-on-click-modal="false">
-      <el-form size="mini" ref="addForm" :rules="rules" :model="addForm" label-width="120px">
+    <el-dialog
+      :title="title"
+      :visible.sync="dialogForm"
+      width="30%"
+      :show-close="false"
+      :close-on-click-modal="false"
+    >
+      <el-form
+        size="mini"
+        ref="addForm"
+        :rules="rules"
+        :model="addForm"
+        label-width="120px"
+      >
         <el-form-item label="名称" prop="dictCode">
           <el-input v-model="addForm.dictCode"></el-input>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="addForm.remark"></el-input>
         </el-form-item>
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="cancelFn">取 消</el-button>
-        <el-button size="mini" type="primary" @click="addDataFn">确 定</el-button>
+        <el-button size="mini" type="primary" @click="addDataFn"
+          >确 定</el-button
+        >
       </div>
     </el-dialog>
   </div>
@@ -210,7 +420,7 @@ import {
   editDictList,
   addDictList,
   deleDictList,
-  updateReceipt
+  updateReceipt,
 } from "@/api/common";
 
 export default {
@@ -235,6 +445,7 @@ export default {
       },
       thirdForm: {
         input1: {},
+        // input2: {},
       },
       fourthForm: {
         input1: {},
@@ -250,8 +461,8 @@ export default {
       sixthForm: [],
       seventhForm: [],
       eigthForm: [],
-      value1:'',
-      choiceDate:'',
+      value1: "",
+      choiceDate: "",
       setDisabled: {
         disabledDate: (time) => {
           if (this.choiceDate) {
@@ -354,12 +565,12 @@ export default {
     },
 
     changeType(val) {
-
-    if (this.formType === 'receipt') return
+      if (this.formType === "receipt") return;
       this.getDetail(val);
     },
 
     getDetail(type) {
+      console.log(type, "type");
       const MAP = {
         first: "ORDER_TIME_LIMIT",
         second: "ENGIN_TWO_PWD",
@@ -371,22 +582,20 @@ export default {
         eigth: "POWER_CATEGORY",
       };
       getDictList({ sysDictEnum: MAP[type] }).then((res) => {
-
+        console.log(res, "99");
         let data = res.data.map((item) => {
-
           return {
             sysDictId: item.sysDictId,
             dictValue: item.dictValue,
-            dictType:item.dictType,
-            dictCode:item.dictCode
+            dictType: item.dictType,
+            dictCode: item.dictCode,
           };
         });
         if (type != "fourth") {
-
           this[type + "Form"].input1 = data[0];
-             console.log(777);
+          // this[type + "Form"].input2 = data[1];
+          console.log(777, this[type + "Form"].input1);
         } else {
-
           this[type + "Form"].input1 = data[0];
           this[type + "Form"].input2 = data[1];
           this[type + "Form"].input3 = data[2];
@@ -415,26 +624,25 @@ export default {
         }
         list.push(this[type + "Form"][key]);
       }
+      console.log(list, "890");
+
       editDictList(list).then((res) => {
         this.$successMsg("保存成功");
         this.getDetail(type);
       });
     },
-        updateReceipt() {
-
-    if (!this.value1) {
-      this.$errorMsg('请选择时间')
-      return
-    }
+    updateReceipt() {
+      if (!this.value1) {
+        this.$errorMsg("请选择时间");
+        return;
+      }
       updateReceipt({
-      startTime:this.value1[0],
-      endTime:this.value1[1]
-      }).then(res=>{
-
+        startTime: this.value1[0],
+        endTime: this.value1[1],
+      }).then((res) => {
         this.$successMsg("已更新");
-         this.value1 = ''
-      })
-
+        this.value1 = "";
+      });
     },
   },
 };

src/views/supply/engin/components/commerce_detail.vue

@@ -378,7 +378,7 @@
           >
           <!-- <el-button type="primary" @click="openDirectDialog" v-if="!isDealer">提前开票</el-button> -->
 
-          <template v-if="detailData.isPlanOrder === 'false'">
+          <template v-if="detailData.isPlanOrder === 'true'">
             <el-button
               v-if="!isDealer"
               type="primary"
@@ -967,6 +967,7 @@ export default {
         res.data.isPlanOrder = String(res.data.isPlanOrder);
 
         this.detailData = res.data;
+        console.log(this.detailData.isPlanOrder);
       });
     },