Merge branch 'sit'

src/components/globalComponents/file-upload-pdf/main.vue

@@ -29,6 +29,7 @@ export default {
       type: Boolean,
       default: false,
     },
+    size: "mini",
     uploadcondition: {
       type: Function,
       default: null,

src/components/show-pdf-model/index.vue

@@ -1,89 +0,0 @@
-<template>
-  <el-dialog
-    :title="title"
-    :center="true"
-    align="left"
-    top="8vh"
-    width="900px"
-    @close="showModelThis = false"
-    :close-on-click-modal="false"
-    :visible.sync="showModelThis"
-    v-loading="loading"
-    element-loading-text="拼命加载中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    append-to-body
-  >
-    <el-card style="margin-top: -20px" >
-      <pdf 
-        ref="pdf"
-        :src="url"
-      />
-      <!-- v-if="src" <pdf ref="pdf" v-for="i in numPages" :key="i" :src="src" :page="i" /> -->
-    </el-card>
-  </el-dialog>
-</template>
-
-<script>
-import pdf from "vue-pdf";
-export default {
-  name: "showPdfModal",
-  props: ["showModel", "name", "url"],
-  components: {
-    pdf,
-  },
-  data() {
-    return {
-      loading: false,
-      title: "预览",
-      src: "",
-      showModelThis: this.showModel,
-      numPages: null, // pdf 总页数
-    };
-  },
-  watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
-      if (val) {
-        this.initForm();
-      }
-    },
-    showModelThis(val) {
-      if (!val) {
-        this.$emit("cancel");
-      }
-    },
-  },
-  methods: {
-    itemidChange(e) {
-      this.ruleForm.itemid = e;
-      this.$refs.ruleForm.validateField("itemid");
-    },
-    async initForm() {
-      this.loading = true;
-      this.title = "预览" + this.name;
-
-      // this.src = pdf.createLoadingTask(this.url);
-      // this.getNumPages();
-      this.loading = false;
-    },
-    // 计算pdf页码总数
-    async getNumPages() {
-      console.log(this.url);
-      console.log(this.src);
-      this.src.promise
-        .then(async (res) => {
-          console.log(res);
-          // this.numPages = pdf.numPages;
-        })
-        .catch((err) => {
-          console.log(err);
-          // console.error("pdf 加载失败", err);
-        });
-    },
-  },
-};
-</script>
-
-  <style>
-</style>

src/views/goodStore/goodsCost/components/costFormAddEdit.vue

@@ -26,51 +26,69 @@
             class="demo-ruleForm"
           >
             <el-form-item label="起订量" prop="min_num">
-              <el-input
-                placeholder="起订量"
-                v-model="ruleForm.min_num"
-                type="number"
+              <digital-input
+                :values="ruleForm.min_num"
+                :placeholder="'起订量'"
                 :min="0"
-                :max="9999999999"
-                :step="0"
+                :name="'ruleForm.min_num'"
+                :disabled="false"
+                :max="100000000000"
+                :position="'right'"
+                :precision="0"
+                :size="'mini'"
+                :controls="false"
+                :append="''"
+                @reschange="number_change($event, 'min_num')"
               />
             </el-form-item>
             <el-form-item label="成本合计" prop="nake_fee">
-              <el-input
-                placeholder="成本合计"
-                v-model="ruleForm.nake_fee"
-                type="number"
+              <digital-input
+                :values="ruleForm.nake_fee"
+                :placeholder="'成本合计'"
                 :min="0"
-                :max="9999999999.99"
-                :step="2"
-              >
-                <template slot="append">元</template>
-              </el-input>
+                :name="'ruleForm.nake_fee'"
+                :disabled="false"
+                :max="100000000000"
+                :position="'right'"
+                :precision="0"
+                :size="'mini'"
+                :controls="false"
+                :append="'元'"
+                @reschange="number_change($event, 'nake_fee')"
+              />
             </el-form-item>
             <el-form-item label="工艺费" prop="cost_fee">
-              <el-input
-                placeholder="工艺费"
-                v-model="ruleForm.cost_fee"
-                type="number"
+              <digital-input
+                :values="ruleForm.cost_fee"
+                :placeholder="'工艺费'"
                 :min="0"
-                :max="9999999999.99"
-                :step="2"
-              >
-                <template slot="append">元</template>
-              </el-input>
+                :name="'ruleForm.cost_fee'"
+                :disabled="false"
+                :max="100000000000"
+                :position="'right'"
+                :precision="0"
+                :size="'mini'"
+                :controls="false"
+                :append="'元'"
+                @reschange="number_change($event, 'cost_fee')"
+              />
             </el-form-item>
 
             <el-form-item label="其中运费" prop="delivery_fee">
-              <el-input
-                placeholder="其中运费"
-                v-model="ruleForm.delivery_fee"
-                type="number"
+              <digital-input
+                :values="ruleForm.delivery_fee"
+                :placeholder="'其中运费'"
                 :min="0"
-                :max="9999999999.99"
-                :step="2"
-              >
-                <template slot="append">元</template>
-              </el-input>
+                :name="'ruleForm.delivery_fee'"
+                :disabled="false"
+                :max="100000000000"
+                :position="'right'"
+                :precision="0"
+                :size="'mini'"
+                :controls="false"
+                :append="'元'"
+                @reschange="number_change($event, 'delivery_fee')"
+              />
             </el-form-item>
           </el-form>
         </el-col>
@@ -93,6 +111,21 @@ export default {
   props: ["showModel", "index", "sitem"],
   mixins: [resToken],
   data() {
+    const validate_num_0 = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("不能为空！"));
+      } else if (
+        value === "0" ||
+        value === "0." ||
+        value === "0.0" ||
+        value === "0.00" ||
+        value === "0.000"
+      ) {
+        callback(new Error("不能为零！"));
+      } else {
+        callback();
+      }
+    };
     return {
       loading: false,
       title: "",
@@ -101,16 +134,16 @@ export default {
       rulesThis: this.rules,
       rules: {
         min_num: [
-          { required: true, message: "起订量应为合法数字", trigger: "blur" },
+          { required: true, validator: validate_num_0, trigger: "blur" },
         ],
         cost_fee: [
-          { required: true, message: "工艺费应为合法数字", trigger: "blur" },
+          { required: true, validator: validate_num_0, trigger: "blur" },
         ],
         nake_fee: [
-          { required: true, message: "成本合计应为合法数字", trigger: "blur" },
+          { required: true, validator: validate_num_0, trigger: "blur" },
         ],
         delivery_fee: [
-          { required: true, message: "其中运费应为合法数字", trigger: "blur" },
+          { required: true, validator: validate_num_0, trigger: "blur" },
         ],
       },
     };
@@ -165,6 +198,10 @@ export default {
       };
     },
 
+    number_change(e, key) {
+      this.ruleForm[key] = e + "" || "0";
+      this.$refs.ruleForm.validateField(key);
+    },
     async submitForm() {
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {

src/views/goodStore/goodsOnline/columns.js

@@ -63,11 +63,11 @@ const listCol = [
     label: "名称",
     "min-width": "160px",
   },
-  {
-    prop: "platform_code_en",
-    label: "平台编号",
-    width: "170px",
-  },
+  // {
+  //   prop: "platform_code_en",
+  //   label: "平台编号",
+  //   width: "170px",
+  // },
   {
     prop: "platform_name",
     label: "平台名称",

src/views/goodStore/goodsOnline/index.vue

@@ -141,7 +141,7 @@
                 >
                   <el-option label="商品名称" value="1" />
                   <el-option label="商品编号" value="2" />
-                  <el-option label="平台编号" value="3" />
+                  <!-- <el-option label="平台编号" value="3" /> -->
                   <!-- <el-option label="供应商编号" value="4" /> -->
                   <el-option label="业务企业编号" value="5" />
                   <el-option label="平台商品编号" value="6" />

src/views/sellOut/stockApply/addModel.vue

@@ -1,59 +0,0 @@
-<template>
-  <el-dialog
-    title="新建备货申请"
-    :center="true"
-    align="left"
-    top="15vh"
-    width="600px"
-    @close="showModelThis = false"
-    :close-on-click-modal="false"
-    :visible.sync="showModelThis"
-    v-loading="loading"
-    element-loading-text="拼命加载中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    append-to-body
-  >
-    <el-card style="margin-top: -20px">
-      <add-edit v-if="showModelThis" :id="modelId" @closeModel="closeModel" />
-    </el-card>
-  </el-dialog>
-</template>
-   <script>
-import addEdit from "./components/addEdit.vue";
-export default {
-  name: "stockApplyDetail",
-  props: ["showModel", "id", "isDetail"],
-  components: {
-    addEdit,
-  },
-  data() {
-    return {
-      modelId: "",
-      loading: false,
-      showModelThis: this.showModel,
-    };
-  },
-  watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
-    },
-    showModelThis(val) {
-      if (!val) {
-        this.$emit("cancel");
-      }
-    },
-    id: function () {
-      this.modelId = this.id;
-    },
-  },
-  methods: {
-    closeModel() {
-      this.showModelThis = false;
-      this.$emit("refresh");
-      this.$emit("closeModel");
-    },
-  },
-};
-</script>
-   

src/views/sellOut/stockApply/components/addEdit.vue

@@ -6,12 +6,11 @@
       status-icon
       :size="'mini'"
       ref="ruleForm"
-      label-width="120px"
+      label-width="90px"
       class="demo-ruleForm"
     >
       <el-row>
-      
-        <el-col :span="type === '1' ? 12 : 24">
+        <el-col :span="12">
           <el-form-item label="商品名称" prop="goods_name">
             <el-input
               :disabled="
@@ -28,7 +27,7 @@
           </el-form-item>
         </el-col>
         <!-- 采购数量 -->
-        <el-col :span="type === '1' ? 12 : 24">
+        <el-col :span="5">
           <el-form-item label="采购数量" prop="goods_num">
             <el-input
               :disabled="
@@ -43,14 +42,18 @@
           </el-form-item>
         </el-col>
         <!-- 最晚入库时间 -->
-        <el-col :span="type === '1' ? 12 : 24">
-          <el-form-item label="最晚入库时间" prop="last_go_stock">
+        <el-col :span="7">
+          <el-form-item
+            label="最晚入库时间"
+            prop="last_go_stock"
+            label-width="120px"
+          >
             <el-date-picker
               v-model="ruleForm.last_go_stock"
               type="date"
               style="width: 100%"
               value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择日期"
+              placeholder="最晚入库时间"
               :picker-options="pickerOptions"
               :disabled="
                 !(
@@ -62,7 +65,7 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="type === '1' ? 12 : 24">
+        <el-col :span="12">
           <el-form-item label="附件" prop="file_url">
             <div
               class="file_url"
@@ -85,6 +88,7 @@
                 class="Upload"
                 :accept="'.pdf'"
                 :multiple="false"
+                :size="'mini'"
                 :uploadcondition="beforeAvatarUpload"
                 @UploadErrorEvent="UploadErrorEvent"
                 @UploadSuccessEvent="UploadSuccessEvent"
@@ -93,14 +97,21 @@
                 查看
               </div>
             </div>
-            <!-- <add-edit> -->
           </el-form-item>
         </el-col>
-   
-        <el-col
-          :span="type === '1' ? 12 : 24"
-          style="padding: 0 0 15px 0; text-align: right"
-        >
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              type="textarea"
+              :rows="2"
+              placeholder="备注"
+              v-model="remark"
+            >
+            </el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" style="padding: 0 0 15px 0; text-align: right">
           <el-button
             type="primary"
             @click="submitForm"
@@ -121,13 +132,6 @@
       @cancel="showGoodsModel = false"
       @searchChange="addGoodsRes"
     />
-
-    <show-pdf-model
-      :show-model="showPDF"
-      :name="PDF_name"
-      :url="PDF_url"
-      @closeModel="showPDF = false"
-    />
   </div>
 </template>
    <script>
@@ -135,14 +139,13 @@ import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/stockApply";
 import { isnumber } from "@/utils/validate";
 import searchGoodModal from "@/components/search-good-modal";
-// import showPdfModel from "@/components/show-pdf-model";
 export default {
   name: "stockApply",
   props: ["id", "sitem", "newTime", "type"],
   mixins: [resToken],
-  components: { searchGoodModal
-  //, showPdfModel
-   },
+  components: {
+    searchGoodModal,
+  },
   computed: {
     powers() {
       let tran =
@@ -181,14 +184,11 @@ export default {
           return time.getTime() < Date.now();
         },
       },
-      showPDF: false,
-      PDF_name: "",
-      PDF_url: "",
       status: "",
       cat_id: "",
       routerId: "",
       stockCode: "",
-  
+
       showGoodsModel: "",
       loading: false,
       ruleForm: {
@@ -200,17 +200,17 @@ export default {
         file_url: "",
         file_url_name: "",
         last_go_stock: "",
+        remark: "",
         // supplier_code: [],
         // supplier_name: "",
         // stock_code: [],
       },
       rulesThis: this.rules,
       rules: {
-     
         goods_name: [
           {
             required: true,
-            message: "商品名称不能为空",
+            message: "商品名称不能为空！",
             trigger: "blur",
           },
         ],
@@ -224,18 +224,24 @@ export default {
         last_go_stock: [
           {
             required: true,
-            message: "请输入入库最晚时间",
+            message: "请输入入库最晚时间！",
             trigger: "change",
           },
         ],
         file_url: [
           {
             required: true,
-            message: "请选择附件",
+            message: "请选择附件！",
             trigger: "change",
           },
         ],
-       
+        remark: [
+          {
+            required: true,
+            message: "备注不能为空！",
+            trigger: "blur",
+          },
+        ],
       },
     };
   },
@@ -252,13 +258,7 @@ export default {
       await this.resetForm();
       this.loading = false;
     },
-    PDFModelShow() {
-      this.PDF_name = this.ruleForm.file_url_name;
-      this.PDF_url = this.ruleForm.file_url;
-      this.showPDF = true;
-      console.log(34567);
-    },
-  
+
     // 执行点击商品名称的抛出事件
     addGoodsRes(e) {
       let { good_code, type_code, good_name } = e[0];
@@ -267,7 +267,7 @@ export default {
       this.ruleForm.good_code = good_code;
       this.$refs.ruleForm.validateField("goods_name");
     },
-   
+
     closeModel() {
       this.$emit("closeModel");
     },
@@ -293,7 +293,6 @@ export default {
               // 缺供应商
             } = this.sitem;
 
-           
             this.ruleForm = {
               id,
               good_code,
@@ -303,7 +302,7 @@ export default {
               last_go_stock: lasttime,
               file_url: file_url || "",
               file_url_name: file_name || "",
-          
+
               status,
             };
           }

src/views/sellOut/stockApply/detail.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="stockApplyDetail pagePadding">
     <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
     >
       <p>{{ status }}---{{ powers }}</p>
-      <div class="detail-page-title">
+      <!-- <div class="detail-page-title">
         <span>备货申请编号：</span><span v-if="sitem">{{ sitem.bk_code }}</span>
 
         <el-button
@@ -29,16 +29,26 @@
           v-if="status === '1' && powers.some((item) => item == '014')"
           >取消审核流程</el-button
         >
-      </div>
+      </div> -->
       <status-bar
-        v-if="newTime !== ''"
+        v-if="newTime !== '' && queryType === 'view'"
         :newTime="newTime"
         :options="statusOptions"
         :status="status"
       />
       <el-tabs v-model="activeTabs">
-        <el-tab-pane label="业务详情" name="1">
-          <el-collapse v-model="activeNames" style="margin:-18px 0 0 0">
+        <el-tab-pane label="新建备库申请单" name="0" v-if="queryType === 'add'">
+          <add-edit
+            :sitem="sitem"
+            :id="queryId"
+            :newTime="newTime"
+            :type="queryId"
+            @refresh="initData"
+            v-if="newTime != ''"
+          />
+        </el-tab-pane>
+        <el-tab-pane label="业务详情" name="1" v-if="queryType === 'view'">
+          <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
             <el-collapse-item name="1" title="备货详情">
               <add-edit
                 :sitem="sitem"
@@ -108,7 +118,7 @@
             </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
-        <el-tab-pane label="审批记录" name="2">
+        <el-tab-pane label="审批记录" name="2" v-if="queryType === 'view'">
           <process-time-line
             v-if="newTime !== ''"
             :newTime="newTime"
@@ -154,11 +164,12 @@ export default {
   data() {
     return {
       orderCode: "",
-      activeTabs: "1",
+      activeTabs: "0",
       activeNames: ["0", "1", "2", "3", "4"],
       newTime: "",
       isDisabled: false,
       queryId: "",
+      queryType: "",
       loading: true,
       sitem: null,
       status: "",
@@ -171,8 +182,15 @@ export default {
     };
   },
   mounted() {
-    this.queryId = this.$route.query.id;
-    this.initData();
+    const { id, type } = this.$route.query;
+    this.queryId = id;
+    this.queryType = type;
+    if (this.queryType === "add") {
+      this.sitem = {};
+      this.getNewTime();
+    } else {
+      this.initData();
+    }
   },
   methods: {
     async feeChange(val, status) {

src/views/sellOut/stockApply/index.vue

@@ -83,7 +83,7 @@
               </el-col>
             </el-row>
             <el-row style="padding-top: 10px">
-              <el-col style="width: 400px; ">
+              <el-col style="width: 400px">
                 <el-input
                   placeholder="关键字"
                   v-model="input"
@@ -121,7 +121,12 @@
                   class="fl"
                   :size="searchSize"
                   type="success"
-                  @click="openModal('add', false)"
+                  @click="
+                    routeGoto('stockApplyDetail', {
+                      id: 'add',
+                      type: 'add',
+                    })
+                  "
                 >
                   新建
                 </el-button>
@@ -156,18 +161,16 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="routeGoto('stockApplyDetail', { id: scope.row.id })"
+              @click="
+                routeGoto('stockApplyDetail', {
+                  id: scope.row.id,
+                  type: 'veiw',
+                })
+              "
             ></i>
           </el-tooltip>
         </template>
       </ex-table>
-      <add-model
-        :id="modelId"
-        :show-model="showModel"
-        :is-detail="isDetail"
-        @refresh="searchList"
-        @closeModel="showModel = false"
-      />
     </div>
     <div v-else>
       <no-auth></no-auth>
@@ -178,15 +181,11 @@
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/stockApply";
-import addModel from "./addModel.vue";
 import { mapGetters } from "vuex";
 import columns from "./columns";
 export default {
   name: "stockApply",
   mixins: [mixinPage, resToken],
-  components: {
-    addModel,
-  },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
@@ -228,9 +227,6 @@ export default {
       select: "1",
       input: "",
       loading: true,
-      showModel: false,
-      isDetail: false,
-      modelId: 0,
       parmValue: {
         good_code: "",
         bk_code: "",
@@ -304,11 +300,6 @@ export default {
       this.searchList();
     },
 
-    openModal(id, isDetail) {
-      this.showModel = true;
-      this.modelId = id;
-      this.isDetail = isDetail;
-    },
     // 列表搜索
     async searchList() {
       this.loading = true;

src/views/serviceParam/business/addEdit.vue

@@ -414,7 +414,7 @@ export default {
           }
           this.loading = false;
           if (res && res.code === 0) {
-            const title = this.isDetail === "add" ? "添加成功!" : "修改成功!";
+            const title = this.isDetail === "003" ? "添加成功!" : "修改成功!";
             this.$notify.success({
               title,
               message: "",

src/views/serviceParam/supplier/components/baseForm.vue

@@ -292,7 +292,7 @@
             v-model="ruleForm.telephone"
             :disabled="type !== 'add' && type !== 'edit'"
             placeholder="座机号"
-            maxlength="20"
+            maxlength="50"
           />
         </el-form-item>
       </el-col>
@@ -316,7 +316,7 @@
             v-model="ruleForm.name"
             :disabled="type !== 'add' && type !== 'edit'"
             placeholder="供应商名称"
-            maxlength="20"
+            maxlength="50"
           />
         </el-form-item>
       </el-col>
@@ -333,7 +333,7 @@
               (type !== 'add' && type !== 'edit')
             "
             placeholder="统一社会信用代码"
-            maxlength="20"
+            maxlength="18"
           />
         </el-form-item>
       </el-col>
@@ -347,7 +347,7 @@
               (type !== 'add' && type !== 'edit')
             "
             placeholder="详细地址"
-            maxlength="20"
+            maxlength="200"
           />
         </el-form-item>
       </el-col>
@@ -378,7 +378,7 @@
               (type !== 'add' && type !== 'edit')
             "
             placeholder="运营范围"
-            maxlength="20"
+            maxlength="5000"
           />
         </el-form-item>
       </el-col>

src/views/serviceParam/unusualReason/addEdit.vue

@@ -100,6 +100,7 @@ export default {
         { id: "4", label: "采购退货" },
         { id: "5", label: "销售退换货" },
       ],
+      
       rules: {
         type: [
           {
@@ -192,13 +193,13 @@ export default {
         console.log(valid);
         if (valid) {
           this.loading = true;
-          const { result, result_desc } = JSON.parse(
+          const { result, result_desc,type } = JSON.parse(
             JSON.stringify(this.ruleForm)
           );
           const model = {
             result: result || "", //入库验收异常原因
             result_desc: result_desc || "", //入库异常备注
-            type: "1",
+            type: type||'1',
             id: this.id,
           };
           let res = {};