ソースを参照

Merge branch 'sit'

戴艳蓉 3 年 前
コミット
69293469aa

ファイルの差分が大きいため隠しています
+ 119 - 0
dist/static/js/0.js


ファイルの差分が大きいため隠しています
+ 9 - 0
dist/static/js/app.js


+ 6 - 33
src/components/search-good-modal/main.vue

@@ -37,10 +37,8 @@
       >
         <template #table-header="{ selection }">
           <div style="width: 100%">
-            <el-row style="padding: 0 0 10px 0;margin:-5px 0 0 0">
+            <el-row style="padding: 0 0 10px 0; margin: -5px 0 0 0">
               <el-col :span="6" style="width: 363px">
-
-                
                 <good-class
                   :value="parmValue.cat_id"
                   @handleChange="goods_class_change"
@@ -50,7 +48,7 @@
                   :placeholder="'分类'"
                 />
               </el-col>
-              <el-col :span="4" style="width: 145px; padding: 0 0 0 10px">
+              <el-col :span="4" style="width: 228px; padding: 0 0 0 10px">
                 <search-brand
                   :value="brandid"
                   :disabled="type === 'view' || type === 'editCoin'"
@@ -83,7 +81,7 @@
                   />
                 </el-select>
               </el-col>
-               <el-col :span="4" style="width: 210px; padding: 0 0 0 10px">
+              <!-- <el-col :span="4" style="width: 210px; padding: 0 0 0 10px">
                 <el-select
                   v-model="parmValue.status"
                   filterable
@@ -104,7 +102,7 @@
                     :value="item.code"
                   />
                 </el-select>
-              </el-col>
+              </el-col> -->
               <el-col
                 :span="3"
                 class="fr"
@@ -118,29 +116,6 @@
                   刷新
                 </el-button>
               </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="4" style="width: 363px">
-                <search-supplier
-                  :value="supplierNo"
-                  :placeholder="'供应商'"
-                  :disabled="false"
-                  :size="searchSize"
-                  :isDetail="false"
-                  @searchChange="supplierNosearchChange"
-                />
-              </el-col>
-
-              <el-col :span="4" style="width: 373px; padding: 0 0 0 10px">
-                <search-work-company
-                  :value="parmValue.company_id"
-                  :placeholder="'业务公司'"
-                  :disabled="false"
-                  :size="searchSize"
-                  :isDetail="false"
-                  @searchChange="company_idsearchChange"
-                />
-              </el-col>
               <el-col
                 :span="3"
                 class="fr"
@@ -155,7 +130,7 @@
                 </el-button>
               </el-col>
             </el-row>
-            <el-row style="padding: 10px 0 0 0">
+            <el-row style="padding: 0 0 0 0">
               <el-col :span="4" style="width: 518px">
                 <el-input
                   :size="searchSize"
@@ -177,7 +152,7 @@
                     <el-option label="商品名称" value="2" /> </el-select
                 ></el-input>
               </el-col>
-                <el-col
+              <el-col
                 :span="3"
                 class="fr"
                 style="width: 66px; padding: 0 0 0 10px"
@@ -190,9 +165,7 @@
                   保存
                 </el-button>
               </el-col>
-             
             </el-row>
-            
           </div>
         </template>
         <template #good_thumb_img="{ scope }">

+ 80 - 77
src/views/sellOut/bargainList/detail.vue

@@ -6,43 +6,73 @@
     >
       <el-tabs v-model="projectTabs">
         <el-tab-pane label="议价单详情" name="1">
-          <show-data-table
-            style="padding: 10px 0 5px 0"
-            :newTime="newTime"
-            v-if="newTime !== '' && queryType === 'view'"
-            :sitem="sitem"
-            :columns="editColumns"
-          >
-            <template slot="status">
-              <el-tag
-                :size="tablebtnSize"
-                v-text="
-                  (options.find((item) => item.id == sitem.status) || {})
-                    .label || '--'
-                "
-              ></el-tag>
-              <i
-                v-if="sitem.status === '1'"
-                class="el-icon-video-pause"
-                style="margin: 0 0 0 10px"
-                @click="changeStatus('2')"
-              ></i>
-            </template>
-
-            <template slot="departinfo">
-              <span>{{ sitem.salesman }}--</span>
-              <span v-for="(si, sii) in sitem.departinfo" :key="si + sii"
-                ><span v-if="sii !== 0">/</span>{{ si.name }}</span
+          <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
+            <el-collapse-item :title="''" name="0">
+              <show-data-table
+                style="padding: 10px 0 5px 0"
+                :newTime="newTime"
+                v-if="newTime !== '' && queryType === 'view'"
+                :sitem="sitem"
+                :columns="editColumns"
               >
-            </template>
-          </show-data-table>
-        </el-tab-pane>
-        <el-tab-pane label="议价单反馈情况" name="2">
-          <feedback-list
-            v-if="newTime !== ''"
-            :newTime="newTime"
-            :id="queryId"
-          />
+                <template slot="status">
+                  <el-tag
+                    :size="tablebtnSize"
+                    v-text="
+                      (options.find((item) => item.id == sitem.status) || {})
+                        .label || '--'
+                    "
+                  ></el-tag>
+                </template>
+
+                <template slot="departinfo">
+                  <span>{{ sitem.salesman }}--</span>
+                  <span v-for="(si, sii) in sitem.departinfo" :key="si + sii"
+                    ><span v-if="sii !== 0">/</span>{{ si.name }}</span
+                  >
+                </template>
+              </show-data-table>
+            </el-collapse-item>
+            <el-collapse-item
+              title="业务部门审批"
+              name="1"
+              v-if="status == '0' && powers.some((item) => item == '056')"
+            >
+              <exam-form
+                :statusList="[]"
+                :newTime="newTime"
+                :disabled="false"
+                :isMust="false"
+                @searchChange="examForm($event, 1, '业务部门')"
+              />
+            </el-collapse-item>
+            <el-collapse-item
+              title="财务专员审批"
+              name="1"
+              v-if="status == '0' && powers.some((item) => item == '056')"
+            >
+              <exam-form
+                :statusList="[]"
+                :newTime="newTime"
+                :disabled="false"
+                :isMust="false"
+                @searchChange="examForm($event, 2, '财务专员')"
+              />
+            </el-collapse-item>
+            <el-collapse-item
+              title="财务主管审批"
+              name="1"
+              v-if="status == '0' && powers.some((item) => item == '056')"
+            >
+              <exam-form
+                :statusList="[]"
+                :newTime="newTime"
+                :disabled="false"
+                :isMust="false"
+                @searchChange="examForm($event, 3, '财务主管')"
+              />
+            </el-collapse-item>
+          </el-collapse>
         </el-tab-pane>
         <el-tab-pane label="审批记录" name="3"> 111 </el-tab-pane>
       </el-tabs>
@@ -165,53 +195,26 @@ export default {
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
-    /**
-     * 停止招标任务
-     * @param {String} id id
-     * @param {String} status 0-禁用 1-启用
-     */
-    async changeStatus(status) {
-      await this.$confirm(`确定要停止招标任务么?`, {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(async () => {
-          this.loading = true;
-          let model = {
-            infoNo: this.queryId,
-            status: status,
-          };
-          const res = await asyncRequest.status(model);
-          console.log(res);
-          this.loading = false;
-          if (res && res.code === 0) {
-            this.$notify.success({
-              title: "招标任务已结束!",
-              message: "",
-            });
-            await this.initForm();
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.$message.warning(res.message);
-          }
-        })
-        .catch(() => {
-          console.log("取消");
-        });
-    },
+
     // 点击业务审核的保存按钮
 
-    async examForm(e) {
+    async examForm(e, type, title) {
       console.log(e);
       if (!this.loading) {
         let model = {
-          activity_code: this.queryId,
-          status: e.state === "1" ? "1" : "8",
-          remark: e.remark,
+          bargainNo: this.queryId,
+          status: "",
+          remark: e.state === "1" ? "" : e.remark,
         };
-        await this.setstatus("提交产品部门审核", model);
+        if (type === 1) {
+          model.status = e.state === "1" ? "2" : "5";
+        } else if (type === 2) {
+          model.status = "3";
+        } else {
+          model.status = e.state === "1" ? "4" : "6";
+        }
+
+        await this.setstatus(`提交${title}审核`, model);
       }
     },
     async setstatus(detail, model) {

+ 12 - 57
src/views/sellOut/stockApply/components/addEdit.vue

@@ -4,28 +4,13 @@
       :model="ruleForm"
       :rules="rulesThis"
       status-icon
+      :size="'mini'"
       ref="ruleForm"
       label-width="120px"
       class="demo-ruleForm"
     >
       <el-row>
-        <el-col :span="type === '1' ? 12 : 24">
-          <el-form-item label="商品分类" prop="goods_class">
-            search-sort
-            6666
-            <!-- <good-class
-              :value="ruleForm.goods_class"
-              @handleChange="goods_class_change"
-              :disabled="
-                !(
-                  id === 'add' ||
-                  (status === '0' && powers.some((item) => item == '005'))
-                )
-              "
-              :placeholder="'商品分类'"
-            /> -->
-          </el-form-item>
-        </el-col>
+      
         <el-col :span="type === '1' ? 12 : 24">
           <el-form-item label="商品名称" prop="goods_name">
             <el-input
@@ -38,7 +23,7 @@
               v-model="ruleForm.goods_name"
               readonly="true"
               :placeholder="'商品名称'"
-              @focus="hand"
+              @focus="showGoodsModel = true"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -129,7 +114,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <search-stock-good-modal
+    <search-good-modal
       :once="true"
       :cat_id="cat_id"
       :show-model="showGoodsModel"
@@ -149,13 +134,15 @@
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/stockApply";
 import { isnumber } from "@/utils/validate";
-import searchStockGoodModal from "@/components/search-stock-good-modal";
-import showPdfModel from "@/components/show-pdf-model";
+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: { searchStockGoodModal, showPdfModel },
+  components: { searchGoodModal
+  //, showPdfModel
+   },
   computed: {
     powers() {
       let tran =
@@ -206,7 +193,6 @@ export default {
       loading: false,
       ruleForm: {
         id: "",
-        goods_class: [],
         good_code: "",
         good_type_code: "",
         goods_name: "",
@@ -220,15 +206,7 @@ export default {
       },
       rulesThis: this.rules,
       rules: {
-        goods_class: [
-          {
-            type: "array",
-            required: true,
-            message: "请选择商品分类",
-            trigger: "change",
-          },
-        ],
-        //出入库规则
+     
         goods_name: [
           {
             required: true,
@@ -252,7 +230,7 @@ export default {
         ],
         file_url: [
           {
-            required: false,
+            required: true,
             message: "请选择附件",
             trigger: "change",
           },
@@ -274,15 +252,6 @@ export default {
       await this.resetForm();
       this.loading = false;
     },
-    goods_class_change(e) {
-      this.ruleForm.goods_class = e;
-      this.cat_id = e.length > 0 ? e[e.length - 1] : "";
-      this.$refs.ruleForm.validateField("goods_class");
-      this.ruleForm.good_type_code = "";
-      this.ruleForm.goods_name = "";
-      this.ruleForm.goods_num = "";
-      this.$refs.ruleForm.validateField("good_type_code");
-    },
     PDFModelShow() {
       this.PDF_name = this.ruleForm.file_url_name;
       this.PDF_url = this.ruleForm.file_url;
@@ -298,13 +267,6 @@ export default {
       this.ruleForm.good_code = good_code;
       this.$refs.ruleForm.validateField("goods_name");
     },
-    hand() {
-      if (this.ruleForm.goods_class.length === 0) {
-        this.$message.warning("请选择商品分类!");
-        return;
-      }
-      this.showGoodsModel = true;
-    },
    
     closeModel() {
       this.$emit("closeModel");
@@ -328,19 +290,12 @@ export default {
               file_name,
               // wsm_code, //仓库名
               status,
-             
-              can,
               // 缺供应商
             } = this.sitem;
 
-            this.cat_id = can.length > can ? e[e.length - 1] : "";
-            let goods_class = [];
-            can.forEach((v) => {
-              goods_class.push(v.id);
-            });
+           
             this.ruleForm = {
               id,
-              goods_class: goods_class,
               good_code,
               good_type_code,
               goods_name: good_name,

+ 5 - 5
src/views/serviceParam/supplier/components/baseForm.vue

@@ -319,7 +319,7 @@
           />
         </el-form-item>
       </el-col>
-      <el-col :span="8">
+      <el-col :span="8"  v-if="(ruleForm.supplier_img==='' && (type === 'add'|| type === 'edit'))">
         <el-form-item
           label="统一社会信用代码"
           prop="registercode"
@@ -334,7 +334,7 @@
         </el-form-item>
       </el-col>
 
-      <el-col :span="16" v-if="!(ruleForm.supplier_img && type === 'add')">
+      <el-col :span="16" v-if="(ruleForm.supplier_img==='' && (type === 'add'|| type === 'edit'))">
         <el-form-item label="详细地址" prop="addr">
           <el-input
             v-model="ruleForm.addr"
@@ -347,7 +347,7 @@
           />
         </el-form-item>
       </el-col>
-      <el-col :span="8" v-if="!(ruleForm.supplier_img && type === 'add')">
+      <el-col :span="8"  v-if="(ruleForm.supplier_img==='' && (type === 'add'|| type === 'edit'))">
         <el-form-item label="公司类型" prop="nature">
           <search-company-type
             :value="ruleForm.nature"
@@ -363,7 +363,7 @@
         </el-form-item>
       </el-col>
 
-      <el-col :span="16" v-if="!(ruleForm.supplier_img && type === 'add')">
+      <el-col :span="16"  v-if="(ruleForm.supplier_img==='' && (type === 'add'|| type === 'edit'))">
         <el-form-item label="运营范围" prop="scope">
           <el-input
             v-model="ruleForm.scope"
@@ -378,7 +378,7 @@
           />
         </el-form-item>
       </el-col>
-      <el-col :span="8" v-if="!(ruleForm.supplier_img && type === 'add')">
+      <el-col :span="8"  v-if="(ruleForm.supplier_img==='' && (type === 'add'|| type === 'edit'))">
         <el-form-item label="法人代表" prop="legaler">
           <el-input
             v-model="ruleForm.legaler"

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません