细节优化

src/enum/dict.js

@@ -26,7 +26,7 @@ export default {
   质保期单位:'date_unit',
   商机阶段:'business_stage_code',
   合同类型:'contract_type',
-  销售类型:'sale_type',
+  销售类型:'order_type',
   退货类型:'sale_return_type',
   客户联系人状态: 'contact_link_status',
   需求来源类型:'requirement_source_type',

src/views/contractManage/contractBook/components/addDialog.vue

@@ -442,6 +442,7 @@
     addInformation,
     submit
   } from '@/api/contractManage/contractBook';
+
   import { getcontactlink } from '@/api/saleManage/businessFollow';
   import headList from '@/views/saleManage/businessOpportunity/components/headList.vue';
   import supplierList from '@/views/purchasingManage/supplierManage/components/parentList.vue';
@@ -579,11 +580,7 @@
             { pattern: emailReg, message: '邮箱格式不正确', trigger: 'blur' }
           ],
           contractStartDate: [
-            {
-              required: true,
-              validator: this.validateStartDate,
-              trigger: 'blur'
-            }
+            { required: true, message: '请选择签订日期', trigger: 'change' }
           ],
           contractEndDate: [
             { validator: this.validateEndDate, trigger: 'blur' }
@@ -872,6 +869,7 @@
           this.$refs.inventoryTable.putTableValue(row);
         this.$refs.paymentListTable &&
           this.$refs.paymentListTable.putTableValue(row.receiptPaymentList);
+        this.changeParent();
         this.getEnterprise();
         this.getLinkInfo(
           contractVO.type == '2' ? contractVO.partbId : contractVO.partaId

src/views/contractManage/contractBook/components/detailDialog.vue

@@ -104,6 +104,14 @@
             >
               {{ form.partaName }}
             </el-form-item>
+            <el-form-item
+              label="甲方统一社会信用代码："
+              prop="partaName"
+              label-width="180px"
+              style="margin-bottom: 16px"
+            >
+              {{ form.partaUnifiedSocialCreditCode }}
+            </el-form-item>
             <el-form-item
               label="甲方联系人："
               prop="partaLinkName"
@@ -160,6 +168,15 @@
             >
               {{ form.partbName }}
             </el-form-item>
+            <el-form-item
+              label="乙方统一社会信用代码："
+              prop="partaName"
+              label-width="180px"
+
+              style="margin-bottom: 16px"
+            >
+              {{ form.partbUnifiedSocialCreditCode }}
+            </el-form-item>
             <el-form-item
               label="乙方联系人："
               prop="partbLinkName"

src/views/contractManage/contractBook/components/inventoryTable.vue

@@ -23,16 +23,27 @@
           </el-button>
           <div class="pricebox">
             <span class="amount">总计：{{ allPrice }}元</span>
-            <span v-if="isDiscountTotalPrice">优惠总金额：</span>
-            <el-input
+            <span v-if="isDiscountTotalPrice"></span>
+            <el-form-item
+              style="width: 300px"
               v-if="isDiscountTotalPrice"
-              v-model="discountTotalPrice"
-              style="width: 150px"
-              placeholder="请输入"
-              @input="discountInput"
-            >
-              <template slot="append">元</template></el-input
+              label="优惠总金额："
+              prop="discountTotalPrice"
+              :rules="{
+                required: true,
+                message: '请输入',
+                trigger: 'change'
+              }"
             >
+              <el-input
+                v-model="form.discountTotalPrice"
+                style="width: 150px"
+                placeholder="请输入"
+                @input="discountInput"
+              >
+                <template slot="append">元</template></el-input
+              >
+            </el-form-item>
           </div>
         </div>
       </template>
@@ -373,6 +384,11 @@
       <template v-slot:singleWeight="scope">
         <el-form-item
           style="margin-bottom: 20px"
+          :rules="{
+            required: false,
+            pattern: numberReg,
+            trigger: 'change'
+          }"
           :prop="'datasource.' + scope.$index + '.singleWeight'"
         >
           <el-input
@@ -454,11 +470,11 @@
         technicalDrawings: []
       };
       return {
-        discountTotalPrice: 0.0,
         allPrice: 0.0,
         numberReg,
         defaultForm,
         form: {
+          discountTotalPrice: '',
           datasource: []
         },
         rules: {},
@@ -745,7 +761,11 @@
         let comitDatasource = this.form.datasource;
         if (comitDatasource.length === 0) return [];
         comitDatasource.forEach((v) => {
-          v.totalPrice = (v.totalCount * v.singlePrice)?.toFixed(2) || 0;
+          v.totalPrice =
+            (v.totalCount &&
+              v.singlePrice &&
+              (v.totalCount * v.singlePrice)?.toFixed(2)) ||
+            null;
           v.guaranteePeriodUnitName = this.getDictValue(
             '质保期单位',
             v.guaranteePeriodUnitCode
@@ -758,7 +778,7 @@
         return comitDatasource;
       },
       getPrice() {
-        return [this.allPrice, this.discountTotalPrice];
+        return [this.allPrice, this.form.discountTotalPrice];
       },
       //计算总金额
       getTotalPrice(row) {
@@ -774,13 +794,13 @@
           });
           let allsum = sum.toFixed(2);
           this.allPrice = allsum;
-          this.discountTotalPrice = allsum;
+          this.form.discountTotalPrice = allsum;
           this.$store.commit('concact/setDiscountAmount', allsum);
           this.$store.commit('order/setAllcountAmount', allsum);
           return allsum;
         } else {
           this.allPrice = 0.0;
-          this.discountTotalPrice = 0.0;
+          this.form.discountTotalPrice = 0.0;
           return 0.0;
         }
       },
@@ -813,7 +833,7 @@
           this.form.datasource = productList;
           this.allPrice = data?.contractVO?.totalPrice;
           this.getTotalPrice();
-          this.discountTotalPrice = data?.contractVO?.discountTotalPrice;
+          this.form.discountTotalPrice = data?.contractVO?.discountTotalPrice;
           this.discountInput(data?.contractVO?.discountTotalPrice);
         }
       },

src/views/purchasingManage/inquiryManage/components/inquiryTable.vue

@@ -364,7 +364,15 @@
           ></el-input>
         </el-form-item>
       </template>
-
+      <template v-slot:headerSupplierProductCode="{ column }">
+        <span class="is-required">{{ column.label }}</span>
+      </template>
+      <template v-slot:headerSupplierProductName="{ column }">
+        <span class="is-required">{{ column.label }}</span>
+      </template>
+      <template v-slot:headerSinglePrice="{ column }">
+        <span class="is-required">{{ column.label }}</span>
+      </template>
       <!-- <template v-slot:files="scope">
         <el-form-item prop="files">
           <fileUpload
@@ -411,13 +419,16 @@
       width: 240,
       prop: 'supplierProductCode',
       label: '供应商产品编码',
-      slot: 'supplierProductCode'
+      slot: 'supplierProductCode',
+      headerSlot: 'headerSupplierProductCode',
     },
     {
       width: 200,
       prop: 'supplierProductName',
       label: '供应商产品名称',
-      slot: 'supplierProductName'
+      slot: 'supplierProductName',
+      headerSlot: 'headerSupplierProductName',
+
     },
     {
       width: 80,
@@ -426,10 +437,12 @@
       slot: 'totalCount'
     },
     {
-      width: 120,
+      width: 160,
       prop: 'singlePrice',
       label: '销售单价（元）',
-      slot: 'singlePrice'
+      slot: 'singlePrice',
+      headerSlot: 'headerSinglePrice',
+
     },
     {
       width: 150,

src/views/purchasingManage/inquiryManage/components/inventoryTable.vue

@@ -44,11 +44,7 @@
         <el-form-item
           style="margin-bottom: 20px"
           :prop="'datasource.' + scope.$index + '.productCode'"
-          :rules="{
-            required: true,
-            message: '请输入',
-            trigger: 'change'
-          }"
+       
         >
           <el-input v-model="scope.row.productCode" disabled></el-input>
         </el-form-item>
@@ -57,11 +53,7 @@
         <el-form-item
           style="margin-bottom: 20px"
           :prop="'datasource.' + scope.$index + '.productCategoryName'"
-          :rules="{
-            required: true,
-            message: '请输入',
-            trigger: 'change'
-          }"
+         
         >
           <el-input v-model="scope.row.productCategoryName" disabled></el-input>
         </el-form-item>

src/views/purchasingManage/purchaseNeedManage/components/detailDialog.vue

@@ -24,7 +24,7 @@
         </ul>
       </div>
     </div>
-    <div v-if="activeComp == 'main'">
+    <div v-show="activeComp == 'main'">
       <el-form ref="form" :model="form" label-width="120px">
         <headerTitle title="基本信息">
           <!-- <el-button

src/views/purchasingManage/purchaseNeedManage/components/inventoryTable.vue

@@ -51,11 +51,7 @@
         <el-form-item
           style="margin-bottom: 20px"
           :prop="'datasource.' + scope.$index + '.productCode'"
-          :rules="{
-            required: !!scope.row.productCode ? true : false,
-            message: '请输入',
-            trigger: 'change'
-          }"
+         
         >
           <el-input v-model="scope.row.productCode" disabled></el-input>
         </el-form-item>
@@ -64,11 +60,7 @@
         <el-form-item
           style="margin-bottom: 20px"
           :prop="'datasource.' + scope.$index + '.productCategoryName'"
-          :rules="{
-            required: !!scope.row.productCode ? true : false,
-            message: '请输入',
-            trigger: 'change'
-          }"
+          
         >
           <el-input v-model="scope.row.productCategoryName" disabled></el-input>
         </el-form-item>
@@ -227,7 +219,15 @@
           </el-date-picker>
         </el-form-item>
       </template>
-
+      <template v-slot:headerProductName="{ column }">
+        <span class="is-required">{{ column.label }}</span>
+      </template>
+      <template v-slot:headerTotalCount="{ column }">
+        <span class="is-required">{{ column.label }}</span>
+      </template>
+      <template v-slot:headerExpectReceiveDate="{ column }">
+        <span class="is-required">{{ column.label }}</span>
+      </template>
       <!-- 操作列 -->
       <template v-slot:action="scope">
         <el-popconfirm
@@ -252,7 +252,7 @@
   </el-form>
 </template>
 <script>
-  import { emailReg, phoneReg, numberReg } from 'ele-admin';
+  import {numberReg } from 'ele-admin';
   import productList from './product-list.vue';
   import dictMixins from '@/mixins/dictMixins';
   import fileUpload from '@/components/upload/fileUpload';
@@ -302,7 +302,8 @@
             width: 240,
             prop: 'productName',
             label: '名称',
-            slot: 'productName'
+            slot: 'productName',
+            headerSlot: 'headerProductName',
           },
           {
             width: 150,
@@ -314,7 +315,8 @@
             width: 80,
             prop: 'totalCount',
             label: '数量',
-            slot: 'totalCount'
+            slot: 'totalCount',
+            headerSlot: 'headerTotalCount',
           },
           {
             width: 100,
@@ -345,7 +347,9 @@
             width: 170,
             prop: 'expectReceiveDate',
             label: '到货日期',
-            slot: 'expectReceiveDate'
+            slot: 'expectReceiveDate',
+            headerSlot: 'headerExpectReceiveDate',
+
           },
           {
             width: 140,

src/views/purchasingManage/purchaseNeedManage/index.vue

@@ -82,13 +82,15 @@
                 </el-link>
               </template>
             </el-popconfirm>
-            <!-- <el-link
+            <el-link
               type="primary"
               icon="el-icon-plus"
+              v-if="[2].includes(row.status)"
+
               @click="openPurchasePlanManage(row)"
             >
               生成采购计划
-            </el-link> -->
+            </el-link>
           </template>
         </ele-pro-table>
       </div>
@@ -244,12 +246,12 @@
         this.$refs.addDialogRef.$refs.form &&
           this.$refs.addDialogRef.$refs.form.clearValidate();
       },
-      // //生成采购计划
-      // openPurchasePlanManage(row) {
-      //   this.$refs.addPlanRef.open('add', row);
-      //   this.$refs.addPlanRef.$refs.form &&
-      //     this.$refs.addPlanRef.$refs.form.clearValidate();
-      // },
+      //生成采购计划
+      openPurchasePlanManage(row) {
+        this.$refs.addPlanRef.open('add', row);
+        this.$refs.addPlanRef.$refs.form &&
+          this.$refs.addPlanRef.$refs.form.clearValidate();
+      },
       //批量删除
       allDelBtn() {
         if (this.selection.length === 0) return;

src/views/purchasingManage/purchaseOrder/components/inventoryTable.vue

@@ -45,11 +45,6 @@
           <el-form-item
             style="margin-bottom: 20px"
             :prop="'datasource.' + scope.$index + '.productCode'"
-            :rules="{
-              required: true,
-              message: '请输入',
-              trigger: 'change'
-            }"
           >
             <el-input v-model="scope.row.productCode" disabled></el-input>
           </el-form-item>
@@ -58,11 +53,6 @@
           <el-form-item
             style="margin-bottom: 20px"
             :prop="'datasource.' + scope.$index + '.productCategoryName'"
-            :rules="{
-              required: true,
-              message: '请输入',
-              trigger: 'change'
-            }"
           >
             <el-input
               v-model="scope.row.productCategoryName"
@@ -282,7 +272,15 @@
             </el-date-picker>
           </el-form-item>
         </template>
-
+        <template v-slot:headerProductName="{ column }">
+          <span class="is-required">{{ column.label }}</span>
+        </template>
+        <template v-slot:headerTotalCount="{ column }">
+          <span class="is-required">{{ column.label }}</span>
+        </template>
+        <template v-slot:headerSinglePrice="{ column }">
+          <span class="is-required">{{ column.label }}</span>
+        </template>
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
           <el-popconfirm
@@ -357,7 +355,8 @@
             width: 200,
             prop: 'productName',
             label: '名称',
-            slot: 'productName'
+            slot: 'productName',
+            headerSlot: 'headerProductName'
           },
           {
             width: 120,
@@ -394,7 +393,9 @@
             width: 80,
             prop: 'totalCount',
             label: '数量',
-            slot: 'totalCount'
+            slot: 'totalCount',
+            headerSlot: 'headerTotalCount'
+
           },
           {
             width: 80,
@@ -406,7 +407,9 @@
             width: 160,
             prop: 'singlePrice',
             label: '单价',
-            slot: 'singlePrice'
+            slot: 'singlePrice',
+            headerSlot: 'headerSinglePrice'
+
           },
           {
             width: 120,

src/views/purchasingManage/purchaseOrder/invoice/components/inventoryTable.vue

@@ -20,7 +20,6 @@
             @click="handlAdd"
           >
             新增
-            
           </el-button>
         </div>
       </template>
@@ -96,6 +95,12 @@
           {{ scope.row.warehouseNum }}
         </el-form-item>
       </template>
+      <template v-slot:headerWarehouseId="{ column }">
+        <span class="is-required">{{ column.label }}</span>
+      </template>
+      <template v-slot:headerTotalCount="{ column }">
+        <span class="is-required">{{ column.label }}</span>
+      </template>
 
       <!-- 操作列 -->
       <template v-slot:action="scope">
@@ -207,13 +212,15 @@
             width: 200,
             prop: 'warehouseId',
             label: '仓库名称',
-            slot: 'warehouseId'
+            slot: 'warehouseId',
+            headerSlot: 'headerWarehouseId'
           },
           {
-            width: 80,
+            width: 120,
             prop: 'totalCount',
             label: '进货数量',
-            slot: 'totalCount'
+            slot: 'totalCount',
+            headerSlot: 'headerTotalCount'
           },
           {
             width: 120,
@@ -310,7 +317,9 @@
       async warehouseChange(index, row) {
         let warehouseIds =
           this.form.datasource
-            .filter((item, i) => row.productCode == item.productCode && index != i)
+            .filter(
+              (item, i) => row.productCode == item.productCode && index != i
+            )
             .map((item) => item.warehouseId) || [];
         const data = this.warehouseList.find(
           (item) => item.id == row.warehouseId
@@ -333,7 +342,7 @@
       },
       //选择产品回调
       changeParent(obj, idx) {
-        obj.orderTotalCount=obj.orderTotalCount||obj.totalCount
+        obj.orderTotalCount = obj.orderTotalCount || obj.totalCount;
         obj.id = '';
         this.$set(
           this.form.datasource,
@@ -346,7 +355,7 @@
           if (isNaN(value) || Number(value) <= 0) {
             this.$message.error('请输入大于0的数');
             callback(new Error('请输入大于0的数字'));
-          } else if (this.getTotalCount(row)> row.orderTotalCount) {
+          } else if (this.getTotalCount(row) > row.orderTotalCount) {
             this.$message.error('进货数量不能大于总数量');
             callback(new Error('进货数量不能大于总数量'));
           } else {
@@ -354,12 +363,14 @@
           }
         };
       },
-      getTotalCount(row){
-        let num=0;
-        this.form.datasource.filter(item=>item.productCode==row.productCode).forEach(item=>{
-          num+=Number(item.totalCount)
-        })
-        console.log(num)
+      getTotalCount(row) {
+        let num = 0;
+        this.form.datasource
+          .filter((item) => item.productCode == row.productCode)
+          .forEach((item) => {
+            num += Number(item.totalCount);
+          });
+        console.log(num);
         return num;
       },
       // 返回列表数据
@@ -382,8 +393,7 @@
       putTableValue(data) {
         if (data) {
           this.form.datasource = data;
-          console.log(data)
-
+          console.log(data);
         }
       },
 

src/views/purchasingManage/purchaseOrder/returnGoods/components/inventoryTable.vue

@@ -117,6 +117,9 @@
         </el-form-item>
       </template> -->
       <!-- 操作列 -->
+      <template v-slot:headerTotalCount="{ column }">
+        <span class="is-required">{{ column.label }}</span>
+      </template>
       <template v-slot:action="{ row }">
         <el-popconfirm
           class="ele-action"
@@ -224,7 +227,7 @@
             width: 200,
             prop: 'warehouseName',
             label: '仓库名称',
-            slot: 'warehouseName'
+            slot: 'warehouseName',
           },
           {
             width: 100,
@@ -242,7 +245,8 @@
             width: 120,
             prop: 'totalCount',
             label: '退货数量',
-            slot: 'totalCount'
+            slot: 'totalCount',
+            headerSlot:'headerTotalCount'
           },
           {
             width: 80,

src/views/purchasingManage/purchasePlanManage/components/addDialog.vue

@@ -441,9 +441,9 @@
         this.visible = true;
         if (type == 'add') {
           this.isUpdate = false;
-          // if (row.id) {
-          //   this.getDetailData(row.id);
-          // }
+          if (row.id) {
+            this.getDetailData(row.id);
+          }
         } else {
           this.isUpdate = true;
         }

src/views/purchasingManage/purchasePlanManage/components/detailDialog.vue

@@ -10,9 +10,24 @@
     width="60%"
     @close="cancel"
   >
-    <el-form ref="form" :model="form" label-width="120px">
-      <headerTitle title="基本信息">
-        <!-- <el-button
+    <div class="switch">
+      <div class="switch_left">
+        <ul>
+          <li
+            v-for="item in tabOptions"
+            :key="item.key"
+            :class="{ active: activeComp == item.key }"
+            @click="activeComp = item.key"
+          >
+            {{ item.name }}
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div v-show="activeComp == 'main'">
+      <el-form ref="form" :model="form" label-width="120px">
+        <headerTitle title="基本信息">
+          <!-- <el-button
                   size="small"
                   type="primary"
                   icon="el-icon-s-grid"
@@ -21,67 +36,54 @@
                 >
                  导出
                 </el-button> -->
-      </headerTitle>
-      <el-row>
-        <el-col :span="12" style="height: 46px;">
-          <el-form-item
-            label="采购需求："
-            prop="requirementCode"
-          
-          >
-            <el-link
-              type="primary"
-              :underline="false"
-              @click="openDetail(form)"
-            >
-              {{ form.requirementCode }}
-            </el-link>
-            <!-- {{ form.requirementCode }} -->
-          </el-form-item>
-        </el-col>
+        </headerTitle>
+        <el-row>
+          <el-col :span="12" style="height: 46px">
+            <el-form-item label="采购需求：" prop="requirementCode">
+              <el-link
+                type="primary"
+                :underline="false"
+                @click="openDetail(form)"
+              >
+                {{ form.requirementCode }}
+              </el-link>
+              <!-- {{ form.requirementCode }} -->
+            </el-form-item>
+          </el-col>
 
-        <el-col :span="12">
-          <el-form-item
-            label="负责人："
-            prop="responsibleName"
-          >
-            {{ detailData.responsibleName }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item
-            label="需求来源类型："
-            prop="contactTel"
-          >
-            {{ form.sourceName }}
-          </el-form-item>
-        </el-col>
+          <el-col :span="12">
+            <el-form-item label="负责人：" prop="responsibleName">
+              {{ detailData.responsibleName }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="需求来源类型：" prop="contactTel">
+              {{ form.sourceName }}
+            </el-form-item>
+          </el-col>
 
-        <el-col :span="12">
-          <el-form-item
-            label="需求部门："
-            prop="requireDeptName"
-          >
-            {{ detailData.requireDeptName }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="需求人：" prop="requireUserName">
-            {{ form.requireUserName }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item prop="remark" label="是否接受拆单：">
-            {{
-              form.acceptUnpack === 1
-                ? '接受'
-                : form.acceptUnpack === 1
-                ? '不接受'
-                : ''
-            }}
-          </el-form-item>
-        </el-col>
-        <!-- <el-col :span="12">
+          <el-col :span="12">
+            <el-form-item label="需求部门：" prop="requireDeptName">
+              {{ detailData.requireDeptName }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="需求人：" prop="requireUserName">
+              {{ form.requireUserName }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="remark" label="是否接受拆单：">
+              {{
+                form.acceptUnpack === 1
+                  ? '接受'
+                  : form.acceptUnpack === 1
+                  ? '不接受'
+                  : ''
+              }}
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="12">
           <el-form-item
             label="用途"
             prop="requireUserName"
@@ -90,75 +92,82 @@
             {{ form.requireUserName }}
           </el-form-item>
         </el-col> -->
-        <el-col :span="12">
-          <el-form-item label="完结日期：" prop="receiveDate">
-            {{ form.receiveDate }}
-          </el-form-item>
-        </el-col>
+          <el-col :span="12">
+            <el-form-item label="完结日期：" prop="receiveDate">
+              {{ form.receiveDate }}
+            </el-form-item>
+          </el-col>
 
-        <el-col :span="12">
-          <el-form-item prop="remark" label="备注：">
-            {{ form.remark }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item prop="askFile" label="附件：">
+          <el-col :span="12">
+            <el-form-item prop="remark" label="备注：">
+              {{ form.remark }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="askFile" label="附件：">
+              <el-link
+                v-if="form.files && form.files !== ''"
+                type="primary"
+                :underline="false"
+                @click="downloadFile(form.files)"
+              >
+                {{ form.files.name }}</el-link
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <headerTitle title="计划清单" style="margin-top: 15px"></headerTitle>
+      <ele-pro-table
+        ref="table"
+        :needPage="false"
+        :columns="columns"
+        :toolkit="[]"
+        :datasource="detailData.detailList"
+        row-key="id"
+      >
+        <template v-slot:files="{ row }">
+          <div v-if="row.files && row.files?.length">
             <el-link
-              v-if="form.files && form.files !== ''"
+              v-for="link in row.files"
+              :key="link.id"
               type="primary"
               :underline="false"
-              @click="downloadFile(form.files)"
+              @click="downloadFile(link)"
             >
-              {{ form.files.name }}</el-link
+              {{ link.name }}</el-link
             >
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-
+          </div>
+        </template>
+      </ele-pro-table>
+    </div>
 
-    <headerTitle title="计划清单" style="margin-top: 15px"></headerTitle>
-    <ele-pro-table
-      ref="table"
-      :needPage="false"
-      :columns="columns"
-      :toolkit="[]"
-      :datasource="detailData.detailList"
-      row-key="id"
-    >
-      <template v-slot:files="{ row }">
-        <div v-if="row.files && row.files?.length">
-          <el-link
-            v-for="link in row.files"
-            :key="link.id"
-            type="primary"
-            :underline="false"
-            @click="downloadFile(link)"
-          >
-            {{ link.name }}</el-link
-          >
-        </div>
-      </template>
-    </ele-pro-table>
+    <bpmDetail
+      v-if="activeComp === 'bpm' && form.processInstanceId"
+      :id="form.processInstanceId"
+    ></bpmDetail>
     <div slot="footer" class="footer">
       <el-button @click="cancel">返回</el-button>
     </div>
-    <detail-dialog ref="contactDetailDialogRef" :isModal="false"></detail-dialog>
+    <detail-dialog
+      ref="contactDetailDialogRef"
+      :isModal="false"
+    ></detail-dialog>
   </ele-modal>
 </template>
 
 <script>
-  import { getDetail } from '@/api/purchasingManage/purchaseNeedManage';
   import { getplanDetail } from '@/api/purchasingManage/purchasePlanManage';
   import { getFile } from '@/api/system/file';
   import dictMixins from '@/mixins/dictMixins';
   import { copyObj } from '@/utils/util';
   import detailDialog from '../../../purchasingManage/purchaseNeedManage/components/detailDialog.vue';
+  import bpmDetail from '@/views/bpm/processInstance/detail.vue';
 
   export default {
     mixins: [dictMixins],
     components: {
-      detailDialog
+      detailDialog,bpmDetail
     },
     props: {
       isModal: {
@@ -167,6 +176,11 @@
     },
     data() {
       return {
+        activeComp: 'main',
+        tabOptions: [
+          { key: 'main', name: '计划详情' },
+          { key: 'bpm', name: '流程详情' }
+        ],
         visible: false,
         detailId: '',
         title: '详情',
@@ -298,12 +312,11 @@
             this.form.files = null;
           }
         }
-  
       },
 
       //查看详情
       openDetail(row) {
-        console.log(row)
+        console.log(row);
         this.$refs.contactDetailDialogRef.open(row);
       }
     }

src/views/purchasingManage/purchasePlanManage/components/purchaseNeed-list.vue

@@ -91,7 +91,7 @@
           },
 
           {
-            prop: 'sourceCode',
+            prop: 'requirementCode',
             label: '需求编码',
             align: 'center',
             showOverflowTooltip: true,
@@ -150,7 +150,8 @@
         return getTableList({
           pageNum: page,
           size: limit,
-          ...where
+          ...where,
+          status:2
         }).then((res) => {
           this.current = res.list.find(
             (item) => item.requirementCode == this.radio

src/views/saleManage/businessOpportunity/components/addFollowDialog.vue

@@ -97,11 +97,9 @@
   import fileUpload from '@/components/upload/fileUpload';
 
   import {
-    getDetail,
+
     UpdateInformation,
     addInformation,
-    deleteInformation,
-    updateStatus,
     getcontactlink
   } from '@/api/saleManage/businessFollow';
   export default {

src/views/saleManage/businessOpportunity/components/addOpportunityDialog.vue

@@ -460,6 +460,7 @@
             partyList: this.$refs.personnelAddTable.getTableValue(),
             productList: this.$refs.inventoryTable.getTableValue()
           };
+      
           if (this.isUpdate) {
             UpdateInformation(commitData)
               .then((res) => {

src/views/saleManage/quotation/components/addDialog.vue

@@ -29,13 +29,12 @@
             label="有无商机"
             prop="opportunityType"
             style="margin-bottom: 22px"
-            @change="opportunityChange"
-
           >
             <el-select
               v-model="form.opportunityType"
               placeholder="请选择"
               style="width: 100%"
+              @change="opportunityTypeChange"
             >
               <el-option
                 v-for="item in opportunityTypeList"
@@ -464,6 +463,11 @@
     },
 
     methods: {
+      opportunityTypeChange() {
+        if (this.form.opportunityType === 0) {
+          this.form.opportunityId = '';
+        }
+      },
       //获取详情
       async getDetailData(id) {
         this.businessId = id;
@@ -476,6 +480,9 @@
             if (data.askFile !== '') {
               this.$set(this.form, 'askFile', [data?.askFile]);
             }
+            if(data.opportunityId){
+            this.form.opportunityType=1
+            }
             this.$refs.inventoryTable &&
               this.$refs.inventoryTable.putTableValue(data);
             this.getLinkInfo(data.contactId);
@@ -583,6 +590,7 @@
             this.form.opportunityId = row.id;
             await this.opportunityChange(row.id);
             let data = await contactDetail(row.contactId);
+            this.form.opportunityType=1
             this.changeParent(data.base);
           }
         } else {

src/views/saleManage/quotation/index.vue

@@ -119,7 +119,7 @@
   import popModal from '@/components/pop-modal';
   import { reviewStatus } from '@/enum/dict';
   import addContractBookDialog from '@/views/contractManage/contractBook/components/addDialog.vue';
-  import { contactTypeTree } from '@/api/saleManage/contact';
+  import { contactTypeTree,contactDetail } from '@/api/saleManage/contact';
 
   import {
     getTableList,
@@ -333,7 +333,7 @@
       async addGenerateContract(row) {
         //获取详情
         const data = await getDetail(row.id);
-        console.log(data);
+        const contact=await contactDetail(data.contactId);
         let obj = {
           contractVO: {
             categoryId: '',
@@ -379,7 +379,10 @@
             totalPrice: data.totalPrice,
             type: '1',
             typeName: '销售合同',
-            updateUsername: ''
+            updateUsername: '',
+            sourceCode:row.code,
+            contractName: contact.base.simpleName
+
           },
           receiptPaymentList: [],
           productList: data.quoteProductList

src/views/saleManage/saleOrder/components/addDialog.vue

@@ -33,6 +33,7 @@
               dictName="销售类型"
               clearable
               v-model="form.saleType"
+              :listFormatte="listFormatte"
             >
             </DictSelection>
           </el-form-item>
@@ -727,6 +728,9 @@
         };
         this.$refs.parentRef.open(item);
       },
+      listFormatte(data){
+        return data.filter(item=>item.dictCode!==0)
+      },
 
       //打开新增编辑弹框
       async open(type, row, contactCategoryId) {

src/views/saleManage/saleOrder/index.vue

@@ -295,7 +295,7 @@
           },
           {
             prop: 'payAmount',
-            label: '应付金额(元)',
+            label: '金额(元)',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 170

src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue

@@ -41,6 +41,42 @@
           </div>
         </el-form-item>
       </template>
+      <template v-slot:industryArtFiles="{ row, $index }">
+        <el-form-item
+          style="margin-bottom: 20px"
+          :prop="'datasource.' + $index + '.industryArtFiles'"
+        >
+          <div v-if="row.industryArtFiles && row.industryArtFiles?.length">
+            <el-link
+              v-for="link in row.industryArtFiles"
+              :key="link.id"
+              type="primary"
+              :underline="false"
+              @click="downloadFile(link)"
+            >
+              {{ link.name }}</el-link
+            >
+          </div>
+        </el-form-item>
+      </template>
+      <template v-slot:otherFiles="{ row, $index }">
+        <el-form-item
+          style="margin-bottom: 20px"
+          :prop="'datasource.' + $index + '.otherFiles'"
+        >
+          <div v-if="row.otherFiles && row.otherFiles?.length">
+            <el-link
+              v-for="link in row.otherFiles"
+              :key="link.id"
+              type="primary"
+              :underline="false"
+              @click="downloadFile(link)"
+            >
+              {{ link.name }}</el-link
+            >
+          </div>
+        </el-form-item>
+      </template>
       <template v-slot:customerReqFiles="{ row, $index }">
         <el-form-item
           style="margin-bottom: 20px"
@@ -279,15 +315,48 @@
             slot: 'totalPrice'
           },
           {
-            width: 80,
-            prop: 'deliveryDays',
-            label: '交期(天)',
-            slot: 'deliveryDays'
+            width: 120,
+            prop: 'singleWeight',
+            label: '单重',
+            slot: 'singleWeight'
+          },
+          {
+            width: 120,
+            prop: 'totalWeight',
+            label: '总重',
+            slot: 'totalWeight'
+          },
+          {
+            width: 120,
+            prop: 'weightUnit',
+            label: '重量单位',
+            slot: 'weightUnit'
+          },
+          // {
+          //   width: 80,
+          //   prop: 'deliveryDays',
+          //   label: '交期(天)',
+          //   slot: 'deliveryDays'
+          // },
+          // {
+          //   width: 160,
+          //   prop: 'deliveryDeadline',
+          //   label: '交期截止日期',
+          //   slot: 'deliveryDeadline',
+          //   show: this.isDeliveryDeadline
+          // },
+          {
+            width: 160,
+            prop: 'customerExpectDeliveryDeadline',
+            label: '客户期望交期',
+            slot: 'customerExpectDeliveryDeadline',
+            headerSlot: 'headerCustomerExpectDeliveryDeadline'
           },
           {
             width: 160,
-            prop: 'deliveryDeadline',
-            label: '交期截止日期'
+            prop: 'produceDeliveryDeadline',
+            label: '生产交付交期',
+            slot: 'produceDeliveryDeadline'
           },
           {
             width: 200,
@@ -300,12 +369,12 @@
             prop: 'guaranteePeriodDeadline',
             label: '质保截止日期'
           },
-          // {
-          //   width: 240,
-          //   prop: 'customerReqFiles',
-          //   label: '客户需求',
-          //   slot: 'customerReqFiles'
-          // },
+          {
+            width: 240,
+            prop: 'customerReqFiles',
+            label: '客户需求',
+            slot: 'customerReqFiles'
+          },
           {
             width: 130,
             prop: 'technicalAnswerName',
@@ -324,6 +393,18 @@
             label: '技术图纸',
             slot: 'technicalDrawings'
           },
+          {
+            width: 240,
+            prop: 'industryArtFiles',
+            label: '工艺附件',
+            slot: 'industryArtFiles'
+          },
+          {
+            width: 240,
+            prop: 'otherFiles',
+            label: '其他附件',
+            slot: 'otherFiles'
+          },
           {
             width: 220,
             prop: 'remark',
@@ -409,8 +490,10 @@
             this.$message.error('请输入大于0的数');
             callback(new Error('请输入大于0的数字'));
           } else if (Number(value) > row.warehouseNum) {
-            this.$message.error('输入的数字不能大于仓库物品数');
-            callback(new Error('输入的数字不能大于仓库物品数'));
+            // this.$message.error('输入的数字不能大于仓库物品数');
+            // callback(new Error('输入的数字不能大于仓库物品数'));
+            callback();
+
           } else if (Number(value) > row.orderTotalCount) {
             this.$message.error('输入的数字不能大于最大发货值');
             callback(new Error('输入的数字不能大于最大发货值'));

src/views/saleManage/saleOrder/returnGoods/components/addReturnGoodsDialog.vue

@@ -25,22 +25,41 @@
               placeholder="请输入"
             />
           </el-form-item>
-
           <el-form-item
-            label="退货备注"
-            prop="remark"
+            label="退货类型"
+            prop="sendNo"
             style="margin-bottom: 22px"
+          >
+            <el-select
+              style="width: 100%"
+              v-model="form.returnType"
+              placeholder="请选择"
+              @change="onchangeLink"
+            >
+              <el-option
+                v-for="item in returnList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="赔偿金额"
+            prop="aa"
+            style="margin-bottom: 22px"
+            v-show="['3','5'].includes(form.returnType)"
           >
             <el-input
               clearable
-              v-model="form.remark"
-              type="textarea"
+              v-model="aa"
               placeholder="请输入"
             />
           </el-form-item>
-          <el-form-item prop="repliedFiles" label="回执附件">
+          <el-form-item prop="returnFiles" label="退货附件">
             <fileUpload
-              v-model="form.repliedFiles"
+              v-model="form.returnFiles"
               module="main"
               :showLib="false"
               :limit="10"
@@ -57,9 +76,30 @@
             {{ form.contactName }}
           </el-form-item>
 
-          <el-form-item prop="returnFiles" label="退货附件">
+          <el-form-item
+            label="退货备注"
+            prop="remark"
+            style="margin-bottom: 22px"
+          >
+            <el-input
+              clearable
+              v-model="form.remark"
+              type="textarea"
+              placeholder="请输入"
+            />
+          </el-form-item>
+          <el-form-item
+            label="总金额"
+            prop="bb"
+            style="margin-bottom: 22px"
+            v-show="!['4'].includes(form.returnType)"
+
+          >
+          {{+aa+form.totalAmount}}元
+          </el-form-item>
+          <el-form-item prop="repliedFiles" label="回执附件">
             <fileUpload
-              v-model="form.returnFiles"
+              v-model="form.repliedFiles"
               module="main"
               :showLib="false"
               :limit="10"
@@ -68,12 +108,29 @@
         </el-col>
       </el-row>
 
-      <headerTitle title="产品清单" style="margin-top: 30px"></headerTitle>
+      <headerTitle
+        title="原货产品清单"
+        style="margin-top: 30px"
+        v-show="['1', '2', '3'].includes(form.returnType)"
+      ></headerTitle>
       <inventoryTable
+        v-show="['1', '2', '3'].includes(form.returnType)"
+        :returnType="form.returnType"
         ref="inventoryTableref"
         :sendId="form.sendId"
       ></inventoryTable>
-      <el-row style="margin-top: 20px">
+      <headerTitle
+        title="实物赔偿清单"
+        v-show="['2', '4'].includes(form.returnType)"
+        style="margin-top: 30px"
+      ></headerTitle>
+      <inventoryTable1
+      v-show="['2', '4'].includes(form.returnType)"
+
+        ref="inventoryTableref1"
+        :sendId="form.sendId"
+      ></inventoryTable1>
+      <!-- <el-row style="margin-top: 20px">
         <el-col :span="12">
           <el-form-item
             label="总金额"
@@ -92,7 +149,7 @@
             <el-input clearable v-model="form.payAmount" placeholder="请输入" />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
 
     <div slot="footer" class="footer">
@@ -108,7 +165,7 @@
 </template>
 
 <script>
-  import { emailReg, phoneReg, numberReg } from 'ele-admin';
+  import {  numberReg } from 'ele-admin';
   import { acceptUnpackoptions } from '@/enum/dict';
   import fileUpload from '@/components/upload/fileUpload';
   import dictMixins from '@/mixins/dictMixins';
@@ -125,6 +182,7 @@
   import inventoryTable from './inventoryTable.vue';
   import sendListDialog from './sendListDialog.vue';
   import { copyObj } from '@/utils/util';
+  import inventoryTable1 from '@/views/contractManage/contractBook/components/inventoryTable.vue';
 
   export default {
     mixins: [dictMixins],
@@ -132,7 +190,7 @@
       fileUpload,
       deptSelect,
       sendListDialog,
-      inventoryTable,
+      inventoryTable,inventoryTable1,
       parentList,
       personSelect
     },
@@ -145,10 +203,19 @@
         remark: '',
         sendId: '',
         sendNo: '',
-        totalAmount: ''
+        totalAmount: '',
+        returnType: ''
       };
 
       return {
+        aa:'',
+        returnList: [
+          { label: '原货退回', value: '1' },
+          { label: '部分原货+实物赔偿', value: '2' },
+          { label: '部分原货+现金赔偿', value: '3' },
+          { label: '全部实物赔偿', value: '4' },
+          { label: '全部现金赔偿', value: '5' }
+        ],
         detailData: {},
         payWayOptions: [],
         delDetailIds: [],
@@ -313,16 +380,13 @@
         loading: false,
         // 是否是修改
         isUpdate: false,
-        businessId: ''
+        businessId: '',
+        orderId:""
       };
     },
     computed: {
       totalAmount() {
         let allcountAmount = this.$store.state.returnGoods.allcountAmount;
-        if (!this.$store.state.isDefaultPayableAmount) {
-          this.form.payAmount = allcountAmount;
-        }
-
         return allcountAmount;
       }
     },
@@ -337,9 +401,13 @@
           this.form.productList.splice(index, 1);
         }
       },
-
+      onchangeLink() {
+        this.getSendSaleOrderDetail(this.form.sendId)
+        
+      },
       //选择订单回调
       changeOrder(obj) {
+        // this.orderId=obj.id
         // this.form = Object.assign({},this.form,{
         //   orderId: obj.orderId,
         //   sendNo: obj.docNo,
@@ -457,17 +525,20 @@
           if (!this.isUpdate) {
             delete this.form.id;
           }
-          let productList = this.$refs.inventoryTableref.getTableValue();
-          if (productList.length === 0) {
+          let data = this.$refs.inventoryTableref.getTableValue();
+          if (data.productList.length === 0) {
             return this.$message.error('至少选择一个退货产品');
           }
           this.form.repliedFiles = this.form.repliedFiles || [];
           this.form.replied = this.form.repliedFiles.length > 0 ? 1 : 0;
           let commitData = Object.assign({}, this.form, {
             totalAmount: Number(this.totalAmount),
-            productList
+            productList: data.productList
           });
+          commitData.payAmount = data.payAmount;
 
+          console.log(commitData, 'commitData');
+          return;
           if (this.isUpdate) {
             UpdateReturnInformation(commitData)
               .then((res) => {

src/views/saleManage/saleOrder/returnGoods/components/inventoryTable.vue

@@ -11,16 +11,30 @@
     >
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>
-        <div class="headbox" v-if="sendId">
+        <div class="headbox">
           <el-button
             size="small"
             type="primary"
             icon="el-icon-plus"
             class="ele-btn-icon"
             @click="handlAdd"
+            v-if="returnType!=1"
           >
             新增
           </el-button>
+          <div class="pricebox">
+            <span class="amount">合计{{ totalAmount }}元</span>
+            <span>优惠合计：</span>
+            <el-input
+              v-model="payAmount"
+              style="width: 150px"
+              placeholder="请输入"
+            >
+              <!-- @input="discountInput" -->
+
+              <template slot="append">元</template></el-input
+            >
+          </div>
         </div>
       </template>
       <template v-slot:technicalDrawings="{ row, $index }">
@@ -82,11 +96,13 @@
         </el-form-item>
       </template>
       <template v-slot:headerTotalCount="{ column }">
-          <span class="is-required">{{ column.label }}</span>
-        </template>
+        <span class="is-required">{{ column.label }}</span>
+      </template>
       <!-- 操作列 -->
-      <template v-slot:action="{ row }">
+            
+      <template v-slot:action="{ row }" >
         <el-popconfirm
+        v-if="returnType!=1"
           class="ele-action"
           title="确定要删除吗？"
           @confirm="remove(row)"
@@ -99,11 +115,11 @@
         </el-popconfirm>
       </template>
     </ele-pro-table>
+  
     <product-list
       ref="productListRef"
       :orderId="sendId"
       type="send"
-
       @changeParent="changeParent"
     ></product-list>
   </el-form>
@@ -118,8 +134,12 @@
   export default {
     mixins: [dictMixins],
     props: {
-      sendId: String
+      sendId: String,
+      returnType:{
+        default:''
+      }
     },
+   
     components: {
       productList
     },
@@ -134,8 +154,7 @@
         technicalDrawings: []
       };
       return {
-        discountTotalPrice: 0.0,
-        allPrice: 0.0,
+        payAmount: '',
         numberReg,
         defaultForm,
         form: {
@@ -217,7 +236,7 @@
             prop: 'totalCount',
             label: '退货数量',
             slot: 'totalCount',
-            headerSlot: 'headerTotalCount',
+            headerSlot: 'headerTotalCount'
           },
           {
             width: 80,
@@ -295,14 +314,19 @@
             resizable: false,
             slot: 'action',
             fixed: 'right',
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+           
           }
         ]
       };
     },
     computed: {
-      contractId() {
-        return this.$store.state.order.contractId;
+      totalAmount() {
+        let allcountAmount = this.$store.state.returnGoods.allcountAmount;
+        if (!this.$store.state.isDefaultPayableAmount) {
+          this.payAmount = allcountAmount;
+        }
+        return allcountAmount;
       }
     },
     methods: {
@@ -335,7 +359,7 @@
         console.log(obj, '9999');
         obj.sendTotalCount = obj.totalCount;
         obj.sendProductId = obj.id;
-        obj.id = ''
+        obj.id = '';
 
         if (obj.warehouseId) {
           obj['warehouseNum'] = await getWarehouseOutStock({
@@ -353,19 +377,18 @@
           } else if (Number(value) > row.sendTotalCount) {
             this.$message.error('输入的数字不能大于最大发货值');
             callback(new Error('输入的数字不能大于最大发货值'));
-          } else if (this.getTotalCount(row)> row.warehouseNum) {
-            this.$message.error('退货数量不能大于库存');
-            callback(new Error('退货数量不能大于库存'));
-          }else {
+          } else {
             callback();
           }
         };
       },
-      getTotalCount(row){
-        let num=0;
-        this.form.datasource.filter(item=>item.warehouseId==row.warehouseId).forEach(item=>{
-          num+=Number(item.totalCount)
-        })
+      getTotalCount(row) {
+        let num = 0;
+        this.form.datasource
+          .filter((item) => item.warehouseId == row.warehouseId)
+          .forEach((item) => {
+            num += Number(item.totalCount);
+          });
 
         return num;
       },
@@ -379,7 +402,7 @@
             ? v.technicalDrawings
             : [];
         });
-        return comitDatasource;
+        return {productList:comitDatasource,payAmount:this.payAmount};
       },
       getPrice() {
         return [this.allPrice];
@@ -388,14 +411,11 @@
       //修改回显
       putTableValue(data) {
         if (data && data?.length) {
-         
-
           data.forEach((v) => {
             v.returnReason = v.returnReason || '';
             v.returnType = v.returnType || '';
             v.sendTotalCount = v.sendTotalCount || v.totalCount;
-            v.sendProductId = v.sendProductId ||v.id;
-
+            v.sendProductId = v.sendProductId || v.id;
           });
 
           this.form.datasource = data;