暂存

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

@@ -1514,6 +1514,7 @@ export default {
       await this.get_golpricelast();
       this.ladder_tableData.forEach((si, sii) => {
         this.ladder_tableData[sii].nake_total = this.count_fee(si);
+        this.$set(this.ladder_tableData, sii, this.ladder_tableData[sii]);
       });
     },
     count_fee(e) {
@@ -1538,7 +1539,7 @@ export default {
         cert_fee * 100 +
         delivery_fee * 100 +
         other_fee * 100;
-      if (this.is_noble && is_gold_price==='1') {
+      if (this.is_noble && is_gold_price === "1") {
         let a = noble_price * 100;
         let b = noble_weight * 1000;
         let c = cost_fee * 100;

src/views/purchaseIn/purchaseDiffOrder/detail.vue

@@ -1,10 +1,11 @@
 <template>
   <div class="purchaseDiffOrderDetail pagePadding">
+    
     <div
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      <!-- <p>{{ status }}---{{ powers }}</p> -->
+   
       <!-- <div class="detail-page-title">
         <span>采购工差单编号：</span><span v-if="sitem">{{ sitem.id }}</span>
       </div> -->

src/views/purchaseIn/purchaseDiffOrder/index.vue

@@ -183,10 +183,8 @@ export default {
       s_input: "", //下拉搜索框内容
       // 状态
       statusOptions: [
-        { id: "1", label: "待业务部门审核完成" },
-        { id: "2", label: "通知采购部门" },
-        { id: "3", label: "通知财务部门" },
-        { id: "4", label: "工差单审核完成" },
+        { id: "1", label: "待业务部门审核" },
+        { id: "2", label: "工差单审核完成" },
       ],
       loading: true,
       showModel: false,

src/views/sellOut/sellOutOrder/components/want-deliver.vue

@@ -24,6 +24,7 @@
             :value="ruleForm.post_name"
             :placeholder="'物流公司'"
             :names="''"
+            :size="'mini'"
             :is-detail="false"
             @searchChange="handleCompany"
           />

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

@@ -66,7 +66,7 @@
           <el-select
             v-model="ruleForm.is_project"
             style="width: 100%"
-            :disabled="true"
+            :disabled="false"
             placeholder="咨询类型"
             @change="is_project_change"
           >

src/views/sellOut/zxDiffOrder/columns.js

@@ -1,8 +1,8 @@
-export default [
+const columns = [
 
   {
     prop: "orderCode",
-    label: "咨询订单编号",
+    label: "订单编号",
     fixed: "left",
     width: "152px",
   },
@@ -24,7 +24,7 @@ export default [
   {
     prop: "good_code",
     label: "商品编号",
-    "min-width": "160px",
+    "width": "160px",
   },
   {
     prop: "good_name",
@@ -34,7 +34,7 @@ export default [
   {
     prop: "class_cat",
     label: "商品分类",
-    "width": "150px",
+    "width": "160px",
   },
   // {
   //   prop: "is_act",
@@ -60,4 +60,35 @@ export default [
     width: "50px",
     _slot_: "operation",
   },
-]
+]
+const showColumns = [
+  {
+    prop: "orderCode",
+    label: "订单编号",
+    span: 6
+  },
+  {
+    prop: "status",
+    label: "工差单状态",
+    _slot_: "status",
+    span: 6
+  },
+
+
+  {
+    prop: "diff_weight",
+    label: "工差总重量",
+    span: 6
+  },
+  {
+    prop: "diff_price",
+    label: "工差总金额",
+    span: 6
+  },
+  {
+    prop: "gold_price",
+    label: "金价",
+    span: 6
+  },
+]
+export { columns, showColumns }

src/views/sellOut/zxDiffOrder/components/addForm.vue

@@ -3,16 +3,22 @@
     ref="ruleForm"
     :model="ruleForm"
     status-icon
+    :size="'mini'"
     :rules="rulesThis"
-    label-width="135px"
+    label-width="90px"
     class="demo-ruleForm"
   >
     <el-row>
-      <el-col :span="12">
-        <el-form-item label="客户是否接受工差" prop="is_act">
+      <el-col :span="7">
+        <el-form-item
+          label="客户是否接受工差"
+          prop="is_act"
+          label-width="135px"
+        >
           <el-select
             v-model="ruleForm.is_act"
             style="width: 100%"
+            :size="'mini'"
             :disabled="
               !(status === '1' && powers.some((item) => item == '043'))
             "
@@ -27,12 +33,15 @@
             </el-option>
           </el-select>
         </el-form-item>
-      </el-col>
-      <el-col :span="12" v-if="ruleForm.is_act === '1'">
-        <el-form-item label="客户意愿" prop="customer_remark">
+        <el-form-item
+          label="客户意愿"
+          prop="customer_remark"
+          v-show="ruleForm.is_act === '1'"
+        >
           <el-select
             v-model="ruleForm.customer_remark"
             style="width: 100%"
+            :size="'mini'"
             :disabled="
               !(status === '1' && powers.some((item) => item == '043'))
             "
@@ -48,11 +57,12 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="24">
+      <el-col :span="17">
         <el-form-item label="审核备注" prop="remark">
           <el-input
             type="textarea"
             :rows="2"
+            :size="'mini'"
             :disabled="
               !(status === '1' && powers.some((item) => item == '043'))
             "
@@ -61,15 +71,15 @@
             v-model="ruleForm.remark"
           />
         </el-form-item>
-      </el-col>
-      <el-col
-        :span="24"
-        class="tr"
-        v-if="status === '1' && powers.some((item) => item == '043')"
-      >
-        <el-button type="primary" :size="'mini'" @click="submitForm"
-          >保 存
-        </el-button>
+        <div
+          style="width: 100%; padding: 0 0 12px 0"
+          class="tr"
+          v-if="status === '1' && powers.some((item) => item == '043')"
+        >
+          <el-button type="primary" :size="'mini'" @click="submitForm"
+            >保 存
+          </el-button>
+        </div>
       </el-col>
     </el-row>
   </el-form>
@@ -169,7 +179,6 @@ export default {
     this.initForm();
   },
   methods: {
-    
     async supplierChange(e) {
       if (e && e.id) {
         this.ruleForm.supplierNo = [e.code];

src/views/sellOut/zxDiffOrder/components/showForm.vue

@@ -1,56 +0,0 @@
-<template>
-  <div class="modal-form-style">
-    <el-form
-      ref="sitem"
-      :model="sitem"
-      status-icon
-      :rules="rulesThis"
-      label-width="110px"
-      id="demo-sitem"
-    >
-      <el-row v-if="sitem !== null">
-        <template v-for="item in columns">
-          <el-col :key="item.prop" :span="item.col" v-if="sitem[item.prop]">
-            <el-form-item :label="item.label + ':'">
-              <div>{{ sitem[item.prop] }}{{ item.unit }}</div>
-            </el-form-item>
-          </el-col>
-        </template>
-      </el-row>
-    </el-form>
-  </div>
-</template>
-<script>
-import columns from "./columnsForm";
-export default {
-  name: "Account",
-  props: ["newTime", "sitem"],
-  data() {
-    return {
-      loading: false,
-      columns: columns,
-      sitem: null,
-    };
-  },
-  watch: {
-    newTime: function (val) {
-      if (val) {
-        this.initForm();
-      }
-    },
-  },
-  methods: {
-    
-
-    async initForm() {
-      this.loading = true;
-      this.loading = false;
-    },
-  },
-};
-</script>
-
-   <style lang="scss" scoped>
-.account {
-}
-</style>

src/views/sellOut/zxDiffOrder/detail.vue

@@ -1,50 +1,117 @@
 <template>
   <div class="zxDiffOrderDetail pagePadding">
+    <div>{{ status }}---{{ powers }}</div>
     <div
       style="width: 100%"
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
+      v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
     >
-      <div class="detail-page-title">
+      <!-- <div class="detail-page-title">
         <span>工差单详情：</span>
-      </div>
+      </div> -->
       <!-- <status-bar
         v-if="newTime !== ''"
         :newTime="newTime"
         :options="statusOptions"
         :status="status"
       /> -->
-       <el-tabs v-model="activeTabs">
+      <el-tabs v-model="activeTabs">
         <el-tab-pane label="业务详情" name="1">
-      <el-collapse v-model="activeNames" style="margin:-18px 0 0 0">
-        <el-collapse-item title="采购工差单信息" name="1">
-          <show-form
+          <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
+            <el-collapse-item title="工差单信息" name="1">
+              <show-data-table
+                style="margin: 0; padding: 0"
+                v-if="newTime !== ''"
+                :newTime="newTime"
+                :sitem="sitem"
+                :columns="showColumns"
+              >
+                <template slot="status">
+                  <el-tag
+                    :size="'mini'"
+                    v-text="
+                      (
+                        statusOptions.find(
+                          (item) => item.value == sitem.status
+                        ) || {}
+                      ).label || '--'
+                    "
+                  ></el-tag>
+                </template>
+                <!--<template slot="order_type">
+                  <el-tag
+                    :size="'mini'"
+                    v-text="
+                      (
+                        orderOptions.find(
+                          (item) => item.id == sitem.order_type
+                        ) || {}
+                      ).label || '--'
+                    "
+                  ></el-tag>
+                </template>
+                
+
+                <template slot="supplierName">
+                  <span>{{ sitem.supplierName }}</span>
+                  <el-popover placement="top" width="300" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>销售方公司编号：</span
+                        ><span>{{ sitem.supplierNo }}</span>
+                      </li>
+                    </ul>
+                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                  </el-popover>
+                </template>
+                <template slot="companyName">
+                  <span>{{ sitem.companyName }}</span>
+                  <el-popover placement="top" width="300" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>购买方公司编号：</span
+                        ><span>{{ sitem.companyNo }}</span>
+                      </li>
+                    </ul>
+                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                  </el-popover>
+                </template>
+                <template slot="is_active">
+                  <span v-if="sitem.order_type === '1'"
+                    ><span
+                      >{{
+                        sitem.is_activity === "1" ? "参与活动" : "不参与活动"
+                      }}/{{ sitem.good_type }}</span
+                    ></span
+                  >
+                  <span v-else>--</span>
+                </template>
+                <template slot="send_type">
+                  <el-tag :size="'mini'">{{
+                    sitem.send_type === "1"
+                      ? "直接发货"
+                      : sitem.send_type === "2"
+                      ? "延迟发货"
+                      : "--"
+                  }}</el-tag> -->
+                <!-- </template> -->
+              </show-data-table>
+              <!-- <show-form
             :newTime="newTime"
             v-if="newTime !== ''"
             :sitem="sitem"
             :id="queryId"
-          />
-        </el-collapse-item>
-        <el-collapse-item title="业务审核" name="2">
-          <add-form
-            :sitem="sitem"
-            :newTime="newTime"
-            v-if="newTime !== ''"
-            @refresh="initData()"
-          />
-        </el-collapse-item>
-        <el-collapse-item
-          title="通知业务部门"
-          name="3"
-          v-if="status === '2' && powers.some((item) => item == '044')"
-        >
-          <div class="tr" style="padding: 0 30px 20px 0">
-            <el-button type="primary" plain :size="'mini'" @click="setStatus"
-              >我已知晓</el-button
-            >
-          </div>
-        </el-collapse-item>
-      </el-collapse>
-         </el-tab-pane>
+          /> -->
+            </el-collapse-item>
+            <el-collapse-item title="业务审核" name="2">
+              <add-form
+                :sitem="sitem"
+                :newTime="newTime"
+                v-if="newTime !== ''"
+                @refresh="initData()"
+              />
+            </el-collapse-item>
+          </el-collapse>
+        </el-tab-pane>
         <el-tab-pane label="审批记录" name="2">
           <process-time-line
             v-if="newTime !== ''"
@@ -64,13 +131,12 @@
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/zxDiffOrder";
-import showForm from "./components/showForm";
 import addForm from "./components/addForm";
+import { showColumns } from "./columns";
 export default {
   name: "zxDiffOrderDetail",
   mixins: [mixinPage, resToken],
   components: {
-    showForm,
     addForm,
   },
   computed: {
@@ -89,11 +155,12 @@ export default {
   data() {
     return {
       showModel: false,
+      showColumns: showColumns,
+      activeTabs: "1",
       activeNames: ["-1", "0", "1", "2", "3", "4", "5", "10"],
       statusOptions: [
         { value: "1", label: "待业务部门审核" },
-        { value: "2", label: "待通知业务部门" },
-        { value: "3", label: "审批已完成" },
+        { value: "2", label: "审批已完成" },
       ],
       sitem: null,
       orderCode: "",

src/views/sellOut/zxDiffOrder/index.vue

@@ -27,7 +27,7 @@
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
               <el-col :span="24">
-               
+                <!--                
                 <el-col :span="4" style="width: 400px;">
                   <search-customer
                     :value="customerCode"
@@ -44,23 +44,8 @@
                     :placeholder="'购买方公司名称'"
                     @searchChange="customerChange"
                   />
-                </el-col>
-
-                <el-col :span="3" style="width: 66px; float: right">
-                  <el-button
-                    :size="searchSize"
-                    type="primary"
-                    style="float: right; margin-left: 5px"
-                    @click="searchList"
-                  >
-                    刷新
-                  </el-button>
-                </el-col>
-              </el-col>
-            </el-row>
-            <el-row style="padding:10px 0 0 0;">
-              <el-col :span="24">
-                 <el-col :span="4" style="width: 140px">
+                </el-col> -->
+                <!-- <el-col :span="4" style="width: 140px">
                   <el-select
                     :size="searchSize"
                     v-model="parmValue.status"
@@ -81,8 +66,8 @@
                       :value="item"
                     />
                   </el-select>
-                </el-col>
-                <el-col :span="6" style="width: 303px;padding:0 0 0 10px;">
+                </el-col> -->
+                <el-col :span="6" style="width: 293px;">
                   <period-date-picker
                     :start="parmValue.start"
                     :end="parmValue.end"
@@ -94,7 +79,7 @@
                 </el-col>
                 <el-col :span="4" style="width: 300px; padding: 0 0 0 10px">
                   <el-input
-                    placeholder="咨询订单编号"
+                    placeholder="订单编号"
                     v-model="parmValue.orderCode"
                     :size="searchSize"
                     @blur="
@@ -114,7 +99,16 @@
                     ></el-button>
                   </el-input>
                 </el-col>
-
+                <el-col :span="3" style="width: 66px; float: right">
+                  <el-button
+                    :size="searchSize"
+                    type="primary"
+                    style="float: right; margin-left: 5px"
+                    @click="searchList"
+                  >
+                    刷新
+                  </el-button>
+                </el-col>
                 <el-col :span="4" style="width: 66px; float: right">
                   <el-button
                     type="warning"
@@ -164,7 +158,7 @@ import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/zxDiffOrder";
 import { mapGetters } from "vuex";
-import columns from "./columns";
+import { columns } from "./columns";
 export default {
   name: "zxDiffOrder",
   mixins: [mixinPage, resToken],