暂存

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/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/components/addEdit.vue

@@ -6,7 +6,7 @@
       status-icon
       :size="'mini'"
       ref="ruleForm"
-      label-width="110px"
+      label-width="90px"
       class="demo-ruleForm"
     >
       <el-row>
@@ -27,7 +27,7 @@
           </el-form-item>
         </el-col>
         <!-- 采购数量 -->
-        <el-col :span="12">
+        <el-col :span="5">
           <el-form-item label="采购数量" prop="goods_num">
             <el-input
               :disabled="
@@ -42,14 +42,18 @@
           </el-form-item>
         </el-col>
         <!-- 最晚入库时间 -->
-        <el-col :span="12">
-          <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="
                 !(
@@ -84,6 +88,7 @@
                 class="Upload"
                 :accept="'.pdf'"
                 :multiple="false"
+                :size="'mini'"
                 :uploadcondition="beforeAvatarUpload"
                 @UploadErrorEvent="UploadErrorEvent"
                 @UploadSuccessEvent="UploadSuccessEvent"
@@ -106,10 +111,7 @@
           </el-form-item>
         </el-col>
 
-        <el-col
-          :span="12"
-          style="padding: 0 0 15px 0; text-align: right"
-        >
+        <el-col :span="12" style="padding: 0 0 15px 0; text-align: right">
           <el-button
             type="primary"
             @click="submitForm"
@@ -130,8 +132,6 @@
       @cancel="showGoodsModel = false"
       @searchChange="addGoodsRes"
     />
-
- 
   </div>
 </template>
    <script>
@@ -200,6 +200,7 @@ export default {
         file_url: "",
         file_url_name: "",
         last_go_stock: "",
+        remark: "",
         // supplier_code: [],
         // supplier_name: "",
         // stock_code: [],
@@ -209,7 +210,7 @@ export default {
         goods_name: [
           {
             required: true,
-            message: "商品名称不能为空",
+            message: "商品名称不能为空！",
             trigger: "blur",
           },
         ],
@@ -223,17 +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",
+          },
+        ],
       },
     };
   },
@@ -250,7 +258,6 @@ export default {
       await this.resetForm();
       this.loading = false;
     },
-   
 
     // 执行点击商品名称的抛出事件
     addGoodsRes(e) {

src/views/sellOut/stockApply/detail.vue

@@ -4,7 +4,7 @@
       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,15 +29,15 @@
           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="0">
+        <el-tab-pane label="新建备库申请单" name="0" v-if="queryType === 'add'">
           <add-edit
             :sitem="sitem"
             :id="queryId"
@@ -47,7 +47,7 @@
             v-if="newTime != ''"
           />
         </el-tab-pane>
-        <el-tab-pane label="业务详情" name="1">
+        <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
@@ -118,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"
@@ -164,7 +164,7 @@ export default {
   data() {
     return {
       orderCode: "",
-      activeTabs: "1",
+      activeTabs: "0",
       activeNames: ["0", "1", "2", "3", "4"],
       newTime: "",
       isDisabled: false,

src/views/sellOut/stockApply/index.vue

@@ -124,7 +124,7 @@
                   @click="
                     routeGoto('stockApplyDetail', {
                       id: 'add',
-                      type: 'veiw',
+                      type: 'add',
                     })
                   "
                 >

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 = {};