暂存

src/views/good-share/components/showBackGood.vue

@@ -94,10 +94,8 @@
             </template>
           </div>
           <div class="project-backGoodShow-title">
-            选择方案
-            <span v-if="plan_show" class="fr"
-              >方案总金额：{{ plan_show.sale_total }}元</span
-            >
+           {{status==='5'||status==='6'?'已选定方案':'选择方案'}} 
+          
             <el-button-group
               :size="'mini'"
               class="fr"
@@ -143,13 +141,9 @@
                 >选定方案,并提交
               </el-button>
             </el-button-group>
-            <!-- <el-button
-                type="primary"
-                class="fr"
-                @click="save_plan"
-                :size="'mini'"
-                >保存方案<i class="el-icon-upload el-icon--right"></i>
-              </el-button> -->
+              <span v-if="plan_show" class="fr"
+              >方案总金额：{{ plan_show.sale_total }}元</span
+            >
           </div>
           <div
             class="project-setPlan-backGood-table"
@@ -222,12 +216,12 @@
                 label="规格"
                 show-overflow-tooltip
               />
-              <el-table-column
+              <!-- <el-table-column
                 prop="delivery_day"
                 label="物流时间"
                 width="85"
                 show-overflow-tooltip
-              />
+              /> -->
             </el-table>
           </div>
         </div>
@@ -250,11 +244,9 @@ export default {
     //     this.initForm();
     //   }
     // },
-    // showModelThis(val) {
-    //   if (!val) {
-    //     this.$emit("cancel");
-    //   }
-    // },
+    newTime(val) {
+         this.initForm();
+    },
   },
   data() {
     return {

src/views/goodStore/active/components/baseForm.vue

@@ -53,7 +53,7 @@
                     type="datetime"
                     placeholder="开始时间"
                     :disabled="status !== ''"
-                    value-format="yyyy-MM-dd hh:mm:ss"
+                    value-format="yyyy-MM-dd HH:mm:ss"
                     :picker-options="pickerOptions1"
                     v-model="ruleForm.activity_start"
                     style="width: 100%"
@@ -65,7 +65,7 @@
                 <el-form-item prop="activity_end">
                   <el-date-picker
                     type="datetime"
-                    value-format="yyyy-MM-dd hh:mm:ss"
+                    value-format="yyyy-MM-dd HH:mm:ss"
                     placeholder="结束时间"
                     :disabled="status !== ''"
                     :picker-options="pickerOptions2"

src/views/goodStore/goodsOnline/components/online-exam-form.vue

@@ -31,7 +31,7 @@
           <el-date-picker
             v-model="ruleForm.online_time"
             type="datetime"
-            value-format="yyyy-MM-dd hh:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
             style="width: 100%"
             :picker-options="pickerOptions"
             placeholder="上线时间"

src/views/purchaseIn/workbench/components/baseForm.vue

@@ -14,16 +14,16 @@
         :span="24"
         style="padding: 12px 16px 12px 16px; text-align: right"
       >
-        <span
+        <!-- <span
           >成本合计：<span>{{ back_total }}</span></span
-        >
+        > -->
         <span
           class="fl"
           style="height: 28px; font-size: 16px; line-height: 28px"
           >{{ title }}</span
         >
         <el-button :size="'mini'" @click="$emit('cancel')">取 消 </el-button>
-        <el-button :size="'mini'" type="primary" @click="submitForm"
+        <el-button :size="'mini'" type="primary"  v-if="type !== 'view'" @click="submitForm"
           >保 存
         </el-button>
       </el-col>

src/views/sellOut/bargainList/ShowDataTableColumns.js

@@ -1,80 +0,0 @@
-export default [
-  {
-    prop: "returnCode",
-    label: "售后申请单号",
-  },
-  {
-    prop: "status",
-    label: "售后申请单状态",
-    _slot_: "status",
-  },
-  {
-    prop: "outCode",
-    label: "出库单编号"
-  },
-
-  // {
-  //   prop: "order_type",
-  //   label: "订单类别",
-  //   _slot_: "order_type",
-  // },
-
-  {
-    prop: "orderCode",
-    label: "销售订单编号",
-  },
-  {
-    prop: "apply_name",
-    label: "申请人"
-  },
-  {
-    prop: "class_cat",
-    label: "商品分类",
-  },
-
-  {
-    prop: "good_code",
-    label: "商品编码",
-  },
-
-  {
-    prop: "good_name",
-    label: "商品名称",
-  },
-
- 
-  {
-    prop: "total_num",
-    label: "总发货数量",
-  },
-
-  {
-    prop: "sale_price",
-    label: "销售单价",
-  },
-  // {
-  //   prop: "origin_price",
-  //   label: "采购单价",
-  // },
-
-  // {
-  //   prop: "sale_price",
-  //   label: "商品单价",
-  // },
-  {
-    prop: "total_price",
-    label: "出库单总价",
-  },
-
-  {
-    prop: "updatetime",
-    label: "更新时间",
-  },
-  {
-    prop: "addtime",
-    label: "创建时间",
-  },
-
-
-]
-

src/views/sellOut/bargainList/index.vue

@@ -208,11 +208,7 @@ export default {
         { id: "6", label: "财务主管驳回" },
         { id: "7", label: "已取消议价" },
       ],
-      post_ownOptions: [
-        { id: "1", label: "客户承担" },
-        { id: "2", label: "公司承担" },
-        { id: "3", label: "供应商承担" },
-      ],
+   
       sitem: null,
     
       loading: true,

src/views/sellOut/bargainList/options.js

@@ -1,32 +0,0 @@
-export default {
-    serviceOption: [//假数据
-        {
-          value: "选项1",
-          label: "待业务审核",
-        },
-        {
-          value: "选项2",
-          label: "待供应商反馈",
-        },
-        {
-          value: "选项3",
-          label: "待采购反馈",
-        },
-        {
-          value: "选项4",
-          label: "待采购审核",
-        },
-        {
-          value: "选项5",
-          label: "处理已结束",
-        },
-        {
-          value: "d",
-          label: "业务已驳回",
-        },
-        {
-          value: "d",
-          label: "采购已驳回",
-        },
-      ],
-}

src/views/sellOut/project/components/grossForm.vue

@@ -18,14 +18,28 @@
             :position="'right'"
             :precision="2"
             :size="'mini'"
-            :disabled="status !== '5' || status !== '6'"
+            :disabled="
+              (status === '5' || status === '6') &&
+              powers &&
+              powers.length > 0 &&
+              powers.some((item) => item == '060')
+            "
             :controls="false"
             :append="'%'"
             @reschange="rate_change"
           />
         </el-form-item>
       </el-col>
-      <el-col :span="12" style="text-align: right">
+      <el-col
+        :span="12"
+        style="text-align: right"
+        v-if="
+          (status !== '5' || status !== '6') &&
+          powers &&
+          powers.length > 0 &&
+          powers.some((item) => item == '060')
+        "
+      >
         <el-button type="primary" :size="'mini'" @click="submitForm"
           >保 存
         </el-button>
@@ -41,6 +55,19 @@ export default {
   name: "Account",
   props: ["showModel", "sitem", "id", "type"],
   mixins: [resToken],
+  computed: {
+    powers() {
+      let tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "projectDetail"
+        ) || {};
+      if (tran && tran.action && tran.action.length > 0) {
+        return tran.action;
+      } else {
+        return [];
+      }
+    },
+  },
   watch: {
     // showModel: function (val) {
     //   this.showModelThis = val;

src/views/sellOut/project/components/setPlan.vue

@@ -139,7 +139,7 @@
       </div>
       <div class="project-setPlan-title">
         方案制定
-        <span v-if="plan_show && table_type === 'list'"
+        <span v-if="total !== 0 && table_type === 'list'"
           >方案总金额：{{ plan_show.sale_total }}元</span
         >
         <el-button-group
@@ -152,7 +152,8 @@
             class="fr"
             type="primary"
             :size="'mini'"
-            v-if="index !== 0 && total !== 0"
+            :disabled="index === 0"
+            v-if="total !== 0"
             icon="el-icon-arrow-left"
             @click="index--, change_plan()"
           ></el-button>
@@ -167,7 +168,8 @@
           <el-button
             type="primary"
             class="fr"
-            v-if="index + 1 !== total && total !== 0"
+            :disabled="index + 1 === total"
+            v-if="total !== 0"
             @click="index++, change_plan()"
             :size="'mini'"
             ><i class="el-icon-arrow-right el-icon--right" :size="'mini'"></i
@@ -179,7 +181,7 @@
               powers &&
               powers.length > 0 &&
               powers.some((item) => item == '064') &&
-              status == '3'
+              (status == '3' || status == '4')
             "
             @click="add_plan"
             icon="el-icon-circle-plus-outline"
@@ -206,10 +208,7 @@
           </el-button>
         </el-button-group>
       </div>
-      <div
-        class="project-setPlan-backGood-table"
-        v-if="plan_show && plan_show.feedback && plan_show.feedback.length"
-      >
+      <div class="project-setPlan-backGood-table">
         <el-table
           :data="plan_show.feedback"
           :size="'mini'"
@@ -232,7 +231,7 @@
           />
 
           <el-table-column
-            prop="sale_price"
+            prop="new_sale_price"
             label="当前销售单价"
             width="110"
             show-overflow-tooltip
@@ -240,7 +239,7 @@
             <template slot-scope="scope">
               <digital-input
                 v-if="table_type === 'add'"
-                :values="scope.row.sale_price"
+                :values="scope.row.new_sale_price"
                 :placeholder="'售价'"
                 :min="0"
                 :max="100000000000"
@@ -414,7 +413,7 @@ export default {
       };
     },
     moq_num_change(e, index) {
-      this.plan_show.feedback[index].sale_price = e + "";
+      this.plan_show.feedback[index].new_sale_price = e + "";
       this.$set(
         this.plan_show.feedback[index],
         index,
@@ -447,13 +446,15 @@ export default {
       this.multipleSelection.forEach((a, i) => {
         let fi = list.findIndex((b) => a.id === b.id && b.pgNo === a.pgNo);
         if (fi !== -1) {
-          this.plan_show.feedback.push(list[fi]);
+          this.plan_show.feedback.push(JSON.parse(JSON.stringify(list[fi])));
         } else {
-          this.plan_show.feedback.push(this.multipleSelection[i]);
+          this.plan_show.feedback.push(
+            JSON.parse(JSON.stringify(this.multipleSelection[i]))
+          );
         }
       });
       this.plan_show.feedback.map((e) => {
-        e.sale_price = "0";
+        e.new_sale_price = "0";
         return e;
       });
     },
@@ -537,7 +538,7 @@ export default {
         list.forEach((e) => {
           let si = {
             feedid: e.id,
-            sale_price: e.sale_price,
+            sale_price: e.new_sale_price,
           };
           model.feedback.push(si);
         });
@@ -565,7 +566,7 @@ export default {
       if (code === 0) {
         this.allPlanList = JSON.parse(JSON.stringify(data));
         this.total = this.allPlanList.length;
-        if (type) {
+        if (type && this.allPlanList.length > 0) {
           await this.change_plan("1");
         }
       } else if (code >= 100 && code <= 104) {
@@ -591,6 +592,7 @@ export default {
         sale_total: sale_total,
         feedback: JSON.parse(JSON.stringify(feedback)),
       };
+      console.log(this.plan_show);
       for (let i = 0; i < this.plan_show.feedback.length; i++) {
         this.$set(this.plan_show.feedback[i], i, this.plan_show.feedback[i]);
       }

src/views/sellOut/project/detail.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="projectDetail">
+    <div>{{powers}}</div>
     <div
       class="projectDetail-main"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
@@ -253,6 +254,7 @@ export default {
       position: absolute;
       top: 10px;
       right: 16px;
+      z-index: 2;
     }
   }
   .projectDetail-title {

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

@@ -45,12 +45,12 @@
         <el-col :span="7">
           <el-form-item
             label="最晚入库时间"
-            prop="last_go_stock"
+            prop="lasttime"
             label-width="120px"
           >
             <el-date-picker
-              v-model="ruleForm.last_go_stock"
-              type="date"
+              v-model="ruleForm.lasttime"
+              type="datetime"
               style="width: 100%"
               value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="最晚入库时间"
@@ -199,7 +199,7 @@ export default {
         goods_num: "",
         file_url: "",
         file_url_name: "",
-        last_go_stock: "",
+        lasttime: "",
         remark: "",
         // supplier_code: [],
         // supplier_name: "",
@@ -221,7 +221,7 @@ export default {
             trigger: "blur",
           },
         ],
-        last_go_stock: [
+        lasttime: [
           {
             required: true,
             message: "请输入入库最晚时间！",
@@ -261,10 +261,10 @@ export default {
 
     // 执行点击商品名称的抛出事件
     addGoodsRes(e) {
-      let { good_code, type_code, good_name } = e[0];
+      let { spuCode, type_code, good_name } = e[0];
       this.ruleForm.goods_name = good_name;
       this.ruleForm.good_type_code = type_code;
-      this.ruleForm.good_code = good_code;
+      this.ruleForm.good_code = spuCode;
       this.$refs.ruleForm.validateField("goods_name");
     },
 
@@ -299,7 +299,7 @@ export default {
               good_type_code,
               goods_name: good_name,
               goods_num: good_num,
-              last_go_stock: lasttime,
+              lasttime: lasttime,
               file_url: file_url || "",
               file_url_name: file_name || "",
 
@@ -322,7 +322,7 @@ export default {
             file_url,
             file_name,
             // stock_code,
-            last_go_stock,
+            lasttime,
           } = this.ruleForm;
           let model = {
             id: id,
@@ -334,7 +334,7 @@ export default {
             // wsm_code:
             //   this.id == "add" ? stock_code.toString() : stock_code.toString(),
 
-            lastime: last_go_stock || "",
+            lastime: lasttime || "",
           };
           let res = {};
           if (this.id === "add") {

src/views/sellOut/zixunOrder/columns.js

@@ -488,7 +488,7 @@ const feedbackListCol = [
     fixed: "right",
     _noset_: true,
     _slot_: "operation",
-    width: 100,
+    width: 50,
   },
 ]
 

src/views/sellOut/zixunOrder/components/addEditForm.vue

@@ -53,7 +53,7 @@
           <el-date-picker
             v-model="ruleForm.endtime"
             type="datetime"
-            value-format="yyyy-MM-dd hh:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
             style="width: 100%"
             :picker-options="pickerOptions"
             placeholder="咨询截止时间"

src/views/sellOut/zixunOrder/components/editForm.vue

@@ -63,7 +63,7 @@
           <el-date-picker
             v-model="ruleForm.endtime"
             type="datetime"
-            value-format="yyyy-MM-dd hh:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
             style="width: 100%"
             :disabled="type === 'view'"
             :picker-options="pickerOptions"

src/views/sellOut/zixunOrder/components/feedbackList.vue

@@ -1,62 +1,59 @@
 <template>
   <div class="zixunOrder pagePadding">
-    <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+    <ex-table
+      v-loading="loading"
+      :table="table"
+      :data="tableData"
+      :columns="columns"
+      :page="pageInfo"
+      :size="size"
+      @page-curr-change="handlePageChange"
+      @page-size-change="handleSizeChange"
+      @screen-reset="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
+      @screen-submit="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
     >
-      <ex-table
-        v-loading="loading"
-        :table="table"
-        :data="tableData"
-        :columns="columns"
-        :page="pageInfo"
-        :size="size"
-        @page-curr-change="handlePageChange"
-        @page-size-change="handleSizeChange"
-        @screen-reset="
-          pageInfo.curr = 1;
-          parmValue.page = 1;
-          searchList();
-        "
-        @screen-submit="
-          pageInfo.curr = 1;
-          parmValue.page = 1;
-          searchList();
-        "
-      >
-        <template #good_img="{ scope }">
-          <div
-            v-if="scope.row.good_img"
-            style="width: 20px; height: 20px"
-            class="hover"
-            v-viewer
-          >
-            <img
-              :src="scope.row.good_img"
-              style="display: inline-block; width: 100%; height: 100%"
-              alt=""
-            />
-          </div>
-        </template>
-        <template #status="{ scope }">
-          <el-tag
-            :size="tablebtnSize"
-            :type="scope.row.status == '0' ? 'warning' : ''"
-            v-text="
-              (statusOptions.find((item) => item.id == scope.row.status) || {})
-                .label || '--'
-            "
-          ></el-tag>
-        </template>
-        <template #specinfo="{ scope }">
-          <span v-for="(si, sii) in scope.row.specinfo" :key="si.specid + sii">
-            <span v-if="sii !== 0"></span>{{ si.spec_name }}[{{
-              si.spec_value_name
-            }}]</span
-          >
-        </template>
+      <template #good_img="{ scope }">
+        <div
+          v-if="scope.row.good_img"
+          style="width: 20px; height: 20px"
+          class="hover"
+          v-viewer
+        >
+          <img
+            :src="scope.row.good_img"
+            style="display: inline-block; width: 100%; height: 100%"
+            alt=""
+          />
+        </div>
+      </template>
+      <template #status="{ scope }">
+        <el-tag
+          :size="tablebtnSize"
+          :type="scope.row.status == '0' ? 'warning' : ''"
+          v-text="
+            (statusOptions.find((item) => item.id == scope.row.status) || {})
+              .label || '--'
+          "
+        ></el-tag>
+      </template>
+      <template #specinfo="{ scope }">
+        <span v-for="(si, sii) in scope.row.specinfo" :key="si.specid + sii">
+          <span v-if="sii !== 0"></span>{{ si.spec_name }}[{{
+            si.spec_value_name
+          }}]</span
+        >
+      </template>
 
-        <template #operation="{ scope }">
-          <el-tooltip
+      <template #operation="{ scope }">
+        <!-- <el-tooltip
             v-if="powers.some((item) => item == '007')"
             effect="dark"
             content="详情"
@@ -71,36 +68,36 @@
                 })
               "
             ></i>
-          </el-tooltip>
-          <el-tooltip
-            v-if="powers.some((item) => item == '007')"
-            effect="dark"
-            content="发起议价流程"
-            placement="top"
-          >
-            <i
-              class="el-icon-s-flag tb-icon"
-              @click="wantBargaining(scope.row)"
-            ></i>
-          </el-tooltip>
-        </template>
-      </ex-table>
-      <add-edit-bargain
-        :showModel="wantBmodel"
-        :sitem="wantBsitem"
-        @cancel="wantBmodel = false"
-        @refresh="(wantBmodel = false), searchList()"
-      />
-    </div>
-    <div v-else>
-      <no-auth></no-auth>
-    </div>
+          </el-tooltip> -->
+        <el-tooltip
+          v-if="
+            powers &&
+            powers.length > 0 &&
+            powers.some((item) => item == '068') &&
+            !is_project
+          "
+          effect="dark"
+          content="发起议价流程"
+          placement="top"
+        >
+          <i
+            class="el-icon-s-flag tb-icon"
+            @click="wantBargaining(scope.row)"
+          ></i>
+        </el-tooltip>
+      </template>
+    </ex-table>
+    <add-edit-bargain
+      :showModel="wantBmodel"
+      :sitem="wantBsitem"
+      @cancel="wantBmodel = false"
+      @refresh="(wantBmodel = false), searchList()"
+    />
   </div>
 </template>
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import statusList from "@/assets/js/statusList";
 import asyncRequest from "@/apis/service/sellOut/zixunOrder";
 import { feedbackListCol } from "../columns";
 import { mapGetters } from "vuex";
@@ -109,7 +106,7 @@ import addEditBargain from "./addEditBargain";
 export default {
   name: "zixunOrder",
   mixins: [mixinPage, resToken],
-  props: ["id", "newTime"],
+  props: ["id", "newTime", "sitem"],
   components: {
     addEditBargain,
   },
@@ -118,7 +115,7 @@ export default {
     powers() {
       let tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "zixunOrder"
+          (item) => item.menu_route == "zixunOrderDetail"
         ) || {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;
@@ -133,6 +130,7 @@ export default {
       wantBsitem: "",
       select: "1",
       s_input: "",
+      is_project: false,
       customerCode: [], //客户公司code
       options: [
         { id: "0", label: "待发布竞标" },
@@ -158,7 +156,6 @@ export default {
         { id: "4", label: "已退货" },
         { id: "5", label: "待客户验收" },
       ],
-      statusList: statusList,
       loading: true,
       showModel: false,
       isDetail: false,
@@ -239,6 +236,9 @@ export default {
     };
   },
   mounted() {
+    console.log(this.sitem);
+    const { is_project } = this.sitem;
+    this.is_project = is_project;
     this.searchList();
   },
 

src/views/sellOut/zixunOrder/detail.vue

@@ -80,6 +80,7 @@
           <feedback-list
             v-if="newTime !== ''"
             :newTime="newTime"
+            :sitem="sitem"
             :id="queryId"
           />
         </el-tab-pane>

src/views/serviceParam/supplier/index.vue

@@ -56,6 +56,28 @@
                 />
               </el-select>
             </el-col>
+            <el-col :span="4" style="width: 200px; padding: 0 0 0 10px">
+              <el-select
+                v-model="parmValue.ocr_status"
+                filterable
+                clearable
+                :size="searchSize"
+                placeholder="营业执照识别状态"
+                style="width: 100%"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              >
+                <el-option
+                  v-for="item in ocr_status"
+                  :key="'ocr_status' + item.id"
+                  :label="item.label"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-col>
 
             <el-col
               :span="3"
@@ -294,6 +316,7 @@ export default {
         status: "",
         creater: "",
         name: "",
+        ocr_status:""
       },
       // 状态
       statusOptions: [
@@ -395,6 +418,7 @@ export default {
         creater: "",
         name: "",
         person: "",
+        ocr_status:""
       };
       this.searchList();
     },

src/views/system/parameter/index.vue

@@ -49,6 +49,7 @@
               style="width: 100%"
               :picker-options="pickerOptions"
               type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择日期时间"
               default-time="00:00:00"
             />