1

src/views/JXSK/production/qrDetails/index.vue

@@ -262,7 +262,7 @@ const { proxy } = getCurrentInstance();
 const printDialog = ref(false);
 const loading = ref(false);
 const loginForm = ref({
-  tenantId: "jxsttest",
+  tenantId: "jxst",
   username: "",
   password: "",
 });

src/views/JXSK/production/task/index.vue

@@ -642,7 +642,7 @@ const handlePrint = (row) => {
     let obj = {
       productSn: code + "-" + key,
       url:
-        "http://139.9.102.170:10020/jxst/pro/qrDetails?productSn=" +
+        "http://139.9.102.170:10021/jxst/pro/qrDetails?productSn=" +
         code +
         "-" +
         key,
@@ -660,7 +660,7 @@ const handlePrint = (row) => {
       const ele = qrList.value[i];
       proxy.$refs[ele.productSn][0].innerHTML = ""; //清除二维码方法一
       new QRCode(proxy.$refs[ele.productSn][0], {
-        text: ele.url, //页面地址 ,如果页面需要参数传递请注意哈希模式#
+        text: ele.url,
         width: 100,
         height: 100,
         colorDark: "#000000",

src/views/JXSK/salesMange/contract/index.vue

@@ -456,33 +456,35 @@ const config = computed(() => {
       },
       renderHTML(row) {
         return [
-          {
-            attrs: {
-              label: "结清",
-              type: "primary",
-              text: true,
-            },
-            el: "button",
-            click() {
-              ElMessageBox.confirm("是否确认结清?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-              }).then(() => {
-                proxy
-                  .post("/salesContract/settle", {
-                    id: row.id,
-                  })
-                  .then(() => {
-                    ElMessage({
-                      message: "操作成功",
-                      type: "success",
-                    });
-                    getList();
+          row.isSettled == "0"
+            ? {}
+            : {
+                attrs: {
+                  label: "结清",
+                  type: "primary",
+                  text: true,
+                },
+                el: "button",
+                click() {
+                  ElMessageBox.confirm("是否确认结清?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                  }).then(() => {
+                    proxy
+                      .post("/salesContract/settle", {
+                        id: row.id,
+                      })
+                      .then(() => {
+                        ElMessage({
+                          message: "操作成功",
+                          type: "success",
+                        });
+                        getList();
+                      });
                   });
-              });
-            },
-          },
+                },
+              },
           {
             attrs: {
               label: "查看",

src/views/purchaseSales/outAndInWarehouse/manualDelivery/index.vue

@@ -1,43 +1,21 @@
 <template>
   <div class="tenant">
     <div class="content">
-      <byTable
-        :source="sourceList.data"
-        :pagination="sourceList.pagination"
-        :config="config"
-        :loading="loading"
-        :selectConfig="selectConfig"
-        highlight-current-row
-        :action-list="[
+      <byTable :source="sourceList.data" :pagination="sourceList.pagination" :config="config" :loading="loading" :selectConfig="selectConfig"
+               highlight-current-row :action-list="[
           {
             text: '手动出库',
             action: () => openModal(),
           },
-        ]"
-        @get-list="getList"
-      >
+        ]" @get-list="getList">
       </byTable>
     </div>
 
-    <el-dialog
-      title="手动出库"
-      v-if="dialogVisible"
-      v-model="dialogVisible"
-      width="1000"
-      v-loading="loadingDialog"
-    >
-      <byForm
-        :formConfig="formConfig"
-        :formOption="formOption"
-        v-model="formData.data"
-        :rules="rules"
-        ref="submit"
-      >
+    <el-dialog title="手动出库" v-if="dialogVisible" v-model="dialogVisible" width="1000" v-loading="loadingDialog">
+      <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="submit">
         <template #workOrderId>
           <div style="width: 100%">
-            <el-button type="primary" @click="openOrder = true"
-              >选择工单</el-button
-            >
+            <el-button type="primary" @click="openOrder = true">选择工单</el-button>
             <div style="margin-top: 10px" v-if="selectOrder">
               已选择： {{ selectOrder }}
             </div>
@@ -46,69 +24,27 @@
         <template #details>
           <div style="width: 100%">
             <el-button type="primary" @click="clickAdd()">添加明细</el-button>
-            <el-table
-              :data="formData.data.list"
-              style="width: 100%; margin-top: 16px"
-            >
-              <el-table-column
-                prop="productCode"
-                label="产品编码"
-                width="140"
-              />
-              <el-table-column
-                prop="productName"
-                label="产品名称"
-                min-width="160"
-              />
-              <el-table-column
-                prop="productSpec"
-                label="规格型号"
-                width="160"
-              />
-              <el-table-column
-                prop="productUnit"
-                label="单位"
-                width="100"
-                :formatter="
+            <el-table :data="formData.data.list" style="width: 100%; margin-top: 16px">
+              <el-table-column prop="productCode" label="产品编码" width="140" />
+              <el-table-column prop="productName" label="产品名称" min-width="160" />
+              <el-table-column prop="productSpec" label="规格型号" width="160" />
+              <el-table-column prop="productUnit" label="单位" width="100" :formatter="
                   (row) => dictValueLabel(row.productUnit, productUnit)
-                "
-              />
-              <el-table-column
-                prop="productQuantity"
-                label="库存数量"
-                width="120"
-              />
+                " />
+              <el-table-column prop="productQuantity" label="库存数量" width="120" />
               <el-table-column label="出库数量" width="160">
                 <template #default="{ row, $index }">
                   <div style="width: 100%">
-                    <el-form-item
-                      :prop="'list.' + $index + '.quantity'"
-                      :rules="rules.quantity"
-                      :inline-message="true"
-                    >
-                      <el-input-number
-                        v-model="row.quantity"
-                        placeholder="请输入出库数量"
-                        style="width: 100%"
-                        :precision="0"
-                        :controls="false"
-                        :min="1"
-                        onmousewheel="return false;"
-                      />
+                    <el-form-item :prop="'list.' + $index + '.quantity'" :rules="rules.quantity" :inline-message="true">
+                      <el-input-number v-model="row.quantity" placeholder="请输入出库数量" style="width: 100%" :precision="0" :controls="false" :min="1"
+                                       onmousewheel="return false;" />
                     </el-form-item>
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column
-                align="center"
-                label="操作"
-                width="80"
-                fixed="right"
-              >
+              <el-table-column align="center" label="操作" width="80" fixed="right">
                 <template #default="{ row, $index }">
-                  <el-button type="primary" link @click="handleDelete($index)"
-                    >删除</el-button
-                  >
+                  <el-button type="primary" link @click="handleDelete($index)">删除</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -117,35 +53,17 @@
       </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitForm()" size="large"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="submitForm()" size="large">确 定</el-button>
       </template>
     </el-dialog>
 
-    <el-dialog
-      v-model="openProduct"
-      title="选择商品"
-      width="80%"
-      append-to-body
-    >
-      <InventoryInquiry
-        :selectStatus="true"
-        :warehouseId="formData.data.warehouseId"
-        @cancel="openProduct = false"
-        @select="pushGoods"
-        :key="formData.data.warehouseId"
-      >
+    <el-dialog v-model="openProduct" title="选择商品" width="80%" append-to-body>
+      <InventoryInquiry :selectStatus="true" :warehouseId="formData.data.warehouseId" @cancel="openProduct = false" @select="pushGoods"
+                        :key="formData.data.warehouseId">
       </InventoryInquiry>
     </el-dialog>
 
-    <el-dialog
-      v-model="openOrder"
-      title="工单选择"
-      width="80%"
-      append-to-body
-      destroy-on-close
-    >
+    <el-dialog v-model="openOrder" title="工单选择" width="80%" append-to-body destroy-on-close>
       <WorkOrder :isShowSelect="true" @handleSelectRow="handleSelectRow">
       </WorkOrder>
       <template #footer>

src/views/salesMange/salesMange/afterSales/index.vue

@@ -694,7 +694,7 @@ const submitFollow = () => {
         }
       }
 
-      if (!(Number(formData.data.amount) > 0)) {
+      if (!(Number(formData.followData.amount) > 0)) {
         return ElMessage({
           message: `售后金额需大于0`,
           type: "info",